From 314a1d33625babdcfab9e14312bf6bdd6468edb7 Mon Sep 17 00:00:00 2001 From: peter Date: Wed, 24 Oct 2001 20:29:14 +0000 Subject: De-orbit DEFS.h - the other arches do not use it, and it got replaced with . Reviewed by: bde --- lib/libc/amd64/SYS.h | 2 +- lib/libc/amd64/gen/_setjmp.S | 2 +- lib/libc/amd64/gen/setjmp.S | 1 - lib/libc/amd64/gen/sigsetjmp.S | 1 - lib/libc/amd64/net/htonl.S | 2 +- lib/libc/amd64/net/htons.S | 2 +- lib/libc/amd64/net/ntohl.S | 2 +- lib/libc/amd64/net/ntohs.S | 2 +- lib/libc/amd64/sys/vfork.S | 1 - lib/libc/i386/DEFS.h | 41 ----------------------------------------- lib/libc/i386/SYS.h | 2 +- lib/libc/i386/gen/_setjmp.S | 2 +- lib/libc/i386/gen/alloca.S | 2 +- lib/libc/i386/gen/fabs.S | 2 +- lib/libc/i386/gen/modf.S | 2 +- lib/libc/i386/gen/setjmp.S | 1 - lib/libc/i386/gen/sigsetjmp.S | 1 - lib/libc/i386/net/htonl.S | 2 +- lib/libc/i386/net/htons.S | 2 +- lib/libc/i386/net/ntohl.S | 2 +- lib/libc/i386/net/ntohs.S | 2 +- lib/libc/i386/stdlib/abs.S | 2 +- lib/libc/i386/stdlib/div.S | 2 +- lib/libc/i386/stdlib/labs.S | 2 +- lib/libc/i386/stdlib/ldiv.S | 2 +- lib/libc/i386/string/bcmp.S | 2 +- lib/libc/i386/string/bzero.S | 2 +- lib/libc/i386/string/ffs.S | 2 +- lib/libc/i386/string/index.S | 2 +- lib/libc/i386/string/memchr.S | 2 +- lib/libc/i386/string/memcmp.S | 2 +- lib/libc/i386/string/memset.S | 2 +- lib/libc/i386/string/rindex.S | 2 +- lib/libc/i386/string/strcat.S | 2 +- lib/libc/i386/string/strchr.S | 2 +- lib/libc/i386/string/strcmp.S | 2 +- lib/libc/i386/string/strcpy.S | 2 +- lib/libc/i386/string/strlen.S | 2 +- lib/libc/i386/string/strncmp.S | 2 +- lib/libc/i386/string/strrchr.S | 2 +- lib/libc/i386/string/swab.S | 2 +- lib/libc/i386/sys/Ovfork.S | 1 - 42 files changed, 35 insertions(+), 82 deletions(-) delete mode 100644 lib/libc/i386/DEFS.h (limited to 'lib') diff --git a/lib/libc/amd64/SYS.h b/lib/libc/amd64/SYS.h index ba56bce..6ef3136 100644 --- a/lib/libc/amd64/SYS.h +++ b/lib/libc/amd64/SYS.h @@ -39,7 +39,7 @@ */ #include -#include "DEFS.h" +#include #define SYSCALL(x) 2: PIC_PROLOGUE; jmp PIC_PLT(HIDENAME(cerror)); \ ENTRY(__CONCAT(__sys_,x)); \ diff --git a/lib/libc/amd64/gen/_setjmp.S b/lib/libc/amd64/gen/_setjmp.S index 2dde8d6..03a594c 100644 --- a/lib/libc/amd64/gen/_setjmp.S +++ b/lib/libc/amd64/gen/_setjmp.S @@ -49,7 +49,7 @@ * The previous signal state is NOT restored. */ -#include "DEFS.h" +#include ENTRY(_setjmp) movl 4(%esp),%eax diff --git a/lib/libc/amd64/gen/setjmp.S b/lib/libc/amd64/gen/setjmp.S index aec3d26..ed85036 100644 --- a/lib/libc/amd64/gen/setjmp.S +++ b/lib/libc/amd64/gen/setjmp.S @@ -49,7 +49,6 @@ * The previous signal state is restored. */ -#include "DEFS.h" #include "SYS.h" ENTRY(setjmp) diff --git a/lib/libc/amd64/gen/sigsetjmp.S b/lib/libc/amd64/gen/sigsetjmp.S index 2c71cb0..6fd1305 100644 --- a/lib/libc/amd64/gen/sigsetjmp.S +++ b/lib/libc/amd64/gen/sigsetjmp.S @@ -39,7 +39,6 @@ .asciz "$FreeBSD$" #endif /* LIBC_RCS and not lint */ -#include "DEFS.h" #include "SYS.h" /*- diff --git a/lib/libc/amd64/net/htonl.S b/lib/libc/amd64/net/htonl.S index 551a262..af3354f 100644 --- a/lib/libc/amd64/net/htonl.S +++ b/lib/libc/amd64/net/htonl.S @@ -41,7 +41,7 @@ /* netorder = htonl(hostorder) */ -#include "DEFS.h" +#include ENTRY(htonl) movl 4(%esp),%eax diff --git a/lib/libc/amd64/net/htons.S b/lib/libc/amd64/net/htons.S index 8f21d42..c78b108 100644 --- a/lib/libc/amd64/net/htons.S +++ b/lib/libc/amd64/net/htons.S @@ -41,7 +41,7 @@ /* netorder = htons(hostorder) */ -#include "DEFS.h" +#include ENTRY(htons) movzwl 4(%esp),%eax diff --git a/lib/libc/amd64/net/ntohl.S b/lib/libc/amd64/net/ntohl.S index 13328a9..3a2c202 100644 --- a/lib/libc/amd64/net/ntohl.S +++ b/lib/libc/amd64/net/ntohl.S @@ -41,7 +41,7 @@ /* hostorder = ntohl(netorder) */ -#include "DEFS.h" +#include ENTRY(ntohl) movl 4(%esp),%eax diff --git a/lib/libc/amd64/net/ntohs.S b/lib/libc/amd64/net/ntohs.S index 70a42d7..110faf7 100644 --- a/lib/libc/amd64/net/ntohs.S +++ b/lib/libc/amd64/net/ntohs.S @@ -41,7 +41,7 @@ /* hostorder = ntohs(netorder) */ -#include "DEFS.h" +#include ENTRY(ntohs) movzwl 4(%esp),%eax diff --git a/lib/libc/amd64/sys/vfork.S b/lib/libc/amd64/sys/vfork.S index ed2f152..c69ef0f 100644 --- a/lib/libc/amd64/sys/vfork.S +++ b/lib/libc/amd64/sys/vfork.S @@ -39,7 +39,6 @@ .asciz "$FreeBSD$" #endif /* SYSLIBC_RCS and not lint */ -#include "DEFS.h" #include "SYS.h" /* diff --git a/lib/libc/i386/DEFS.h b/lib/libc/i386/DEFS.h deleted file mode 100644 index edf08ea..0000000 --- a/lib/libc/i386/DEFS.h +++ /dev/null @@ -1,41 +0,0 @@ -/*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * William Jolitz. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * from: @(#)DEFS.h 5.1 (Berkeley) 4/23/90 - * - * $FreeBSD$ - */ - -#include diff --git a/lib/libc/i386/SYS.h b/lib/libc/i386/SYS.h index ba56bce..6ef3136 100644 --- a/lib/libc/i386/SYS.h +++ b/lib/libc/i386/SYS.h @@ -39,7 +39,7 @@ */ #include -#include "DEFS.h" +#include #define SYSCALL(x) 2: PIC_PROLOGUE; jmp PIC_PLT(HIDENAME(cerror)); \ ENTRY(__CONCAT(__sys_,x)); \ diff --git a/lib/libc/i386/gen/_setjmp.S b/lib/libc/i386/gen/_setjmp.S index 2dde8d6..03a594c 100644 --- a/lib/libc/i386/gen/_setjmp.S +++ b/lib/libc/i386/gen/_setjmp.S @@ -49,7 +49,7 @@ * The previous signal state is NOT restored. */ -#include "DEFS.h" +#include ENTRY(_setjmp) movl 4(%esp),%eax diff --git a/lib/libc/i386/gen/alloca.S b/lib/libc/i386/gen/alloca.S index 2913c1c..279f159 100644 --- a/lib/libc/i386/gen/alloca.S +++ b/lib/libc/i386/gen/alloca.S @@ -41,7 +41,7 @@ /* like alloc, but automatic automatic free in return */ -#include "DEFS.h" +#include ENTRY(alloca) popl %edx /* pop return addr */ diff --git a/lib/libc/i386/gen/fabs.S b/lib/libc/i386/gen/fabs.S index 28800cb..85fff00 100644 --- a/lib/libc/i386/gen/fabs.S +++ b/lib/libc/i386/gen/fabs.S @@ -39,7 +39,7 @@ .asciz "$FreeBSD$" #endif /* LIBC_RCS and not lint */ -#include "DEFS.h" +#include ENTRY(fabs) fldl 4(%esp) diff --git a/lib/libc/i386/gen/modf.S b/lib/libc/i386/gen/modf.S index 8b48783..41bdc45 100644 --- a/lib/libc/i386/gen/modf.S +++ b/lib/libc/i386/gen/modf.S @@ -49,7 +49,7 @@ /* With CHOP mode on, frndint behaves as TRUNC does. Useful. */ -#include "DEFS.h" +#include ENTRY(modf) pushl %ebp diff --git a/lib/libc/i386/gen/setjmp.S b/lib/libc/i386/gen/setjmp.S index aec3d26..ed85036 100644 --- a/lib/libc/i386/gen/setjmp.S +++ b/lib/libc/i386/gen/setjmp.S @@ -49,7 +49,6 @@ * The previous signal state is restored. */ -#include "DEFS.h" #include "SYS.h" ENTRY(setjmp) diff --git a/lib/libc/i386/gen/sigsetjmp.S b/lib/libc/i386/gen/sigsetjmp.S index 2c71cb0..6fd1305 100644 --- a/lib/libc/i386/gen/sigsetjmp.S +++ b/lib/libc/i386/gen/sigsetjmp.S @@ -39,7 +39,6 @@ .asciz "$FreeBSD$" #endif /* LIBC_RCS and not lint */ -#include "DEFS.h" #include "SYS.h" /*- diff --git a/lib/libc/i386/net/htonl.S b/lib/libc/i386/net/htonl.S index 551a262..af3354f 100644 --- a/lib/libc/i386/net/htonl.S +++ b/lib/libc/i386/net/htonl.S @@ -41,7 +41,7 @@ /* netorder = htonl(hostorder) */ -#include "DEFS.h" +#include ENTRY(htonl) movl 4(%esp),%eax diff --git a/lib/libc/i386/net/htons.S b/lib/libc/i386/net/htons.S index 8f21d42..c78b108 100644 --- a/lib/libc/i386/net/htons.S +++ b/lib/libc/i386/net/htons.S @@ -41,7 +41,7 @@ /* netorder = htons(hostorder) */ -#include "DEFS.h" +#include ENTRY(htons) movzwl 4(%esp),%eax diff --git a/lib/libc/i386/net/ntohl.S b/lib/libc/i386/net/ntohl.S index 13328a9..3a2c202 100644 --- a/lib/libc/i386/net/ntohl.S +++ b/lib/libc/i386/net/ntohl.S @@ -41,7 +41,7 @@ /* hostorder = ntohl(netorder) */ -#include "DEFS.h" +#include ENTRY(ntohl) movl 4(%esp),%eax diff --git a/lib/libc/i386/net/ntohs.S b/lib/libc/i386/net/ntohs.S index 70a42d7..110faf7 100644 --- a/lib/libc/i386/net/ntohs.S +++ b/lib/libc/i386/net/ntohs.S @@ -41,7 +41,7 @@ /* hostorder = ntohs(netorder) */ -#include "DEFS.h" +#include ENTRY(ntohs) movzwl 4(%esp),%eax diff --git a/lib/libc/i386/stdlib/abs.S b/lib/libc/i386/stdlib/abs.S index 2cdb64c..fb21819 100644 --- a/lib/libc/i386/stdlib/abs.S +++ b/lib/libc/i386/stdlib/abs.S @@ -39,7 +39,7 @@ .asciz "$FreeBSD$" #endif /* LIBC_RCS and not lint */ -#include "DEFS.h" +#include ENTRY(abs) movl 4(%esp),%eax diff --git a/lib/libc/i386/stdlib/div.S b/lib/libc/i386/stdlib/div.S index 8958ec0..efe973b 100644 --- a/lib/libc/i386/stdlib/div.S +++ b/lib/libc/i386/stdlib/div.S @@ -33,7 +33,7 @@ .asciz "$FreeBSD$" #endif /* LIBC_RCS and not lint */ -#include "DEFS.h" +#include ENTRY(div) movl 4(%esp),%eax diff --git a/lib/libc/i386/stdlib/labs.S b/lib/libc/i386/stdlib/labs.S index dfbad4d..ffcb22a 100644 --- a/lib/libc/i386/stdlib/labs.S +++ b/lib/libc/i386/stdlib/labs.S @@ -39,7 +39,7 @@ .asciz "$FreeBSD$" #endif /* LIBC_RCS and not lint */ -#include "DEFS.h" +#include ENTRY(labs) movl 4(%esp),%eax diff --git a/lib/libc/i386/stdlib/ldiv.S b/lib/libc/i386/stdlib/ldiv.S index ffbb547..70b1b3e 100644 --- a/lib/libc/i386/stdlib/ldiv.S +++ b/lib/libc/i386/stdlib/ldiv.S @@ -33,7 +33,7 @@ .asciz "$FreeBSD$" #endif /* LIBC_RCS and not lint */ -#include "DEFS.h" +#include ENTRY(ldiv) movl 4(%esp),%eax diff --git a/lib/libc/i386/string/bcmp.S b/lib/libc/i386/string/bcmp.S index 44af489..1334ff1 100644 --- a/lib/libc/i386/string/bcmp.S +++ b/lib/libc/i386/string/bcmp.S @@ -33,7 +33,7 @@ .asciz "$FreeBSD$" #endif /* LIBC_RCS and not lint */ -#include "DEFS.h" +#include /* * bcmp (void *b1, void *b2, size_t len) diff --git a/lib/libc/i386/string/bzero.S b/lib/libc/i386/string/bzero.S index 17bbbc8..823ed1a 100644 --- a/lib/libc/i386/string/bzero.S +++ b/lib/libc/i386/string/bzero.S @@ -33,7 +33,7 @@ .asciz "$FreeBSD$" #endif /* LIBC_RCS and not lint */ -#include "DEFS.h" +#include /* * bzero (void *b, size_t len) diff --git a/lib/libc/i386/string/ffs.S b/lib/libc/i386/string/ffs.S index f73539e..e2e6cba 100644 --- a/lib/libc/i386/string/ffs.S +++ b/lib/libc/i386/string/ffs.S @@ -33,7 +33,7 @@ .asciz "$FreeBSD$" #endif /* LIBC_RCS and not lint */ -#include "DEFS.h" +#include /* * ffs(value) diff --git a/lib/libc/i386/string/index.S b/lib/libc/i386/string/index.S index b279a7f..c36e55a 100644 --- a/lib/libc/i386/string/index.S +++ b/lib/libc/i386/string/index.S @@ -33,7 +33,7 @@ .asciz "$FreeBSD$" #endif /* LIBC_RCS and not lint */ -#include "DEFS.h" +#include /* * index(s, c) diff --git a/lib/libc/i386/string/memchr.S b/lib/libc/i386/string/memchr.S index 9c7ce14..bbd03d1e 100644 --- a/lib/libc/i386/string/memchr.S +++ b/lib/libc/i386/string/memchr.S @@ -33,7 +33,7 @@ .asciz "$FreeBSD$" #endif /* LIBC_RCS and not lint */ -#include "DEFS.h" +#include /* * memchr (b, c, len) diff --git a/lib/libc/i386/string/memcmp.S b/lib/libc/i386/string/memcmp.S index 9598750..3a7d0f8 100644 --- a/lib/libc/i386/string/memcmp.S +++ b/lib/libc/i386/string/memcmp.S @@ -33,7 +33,7 @@ .asciz "$FreeBSD$" #endif /* LIBC_RCS and not lint */ -#include "DEFS.h" +#include /* * memcmp (void *b1, void *b2, size_t len) diff --git a/lib/libc/i386/string/memset.S b/lib/libc/i386/string/memset.S index fd6cfbe..2dcba43 100644 --- a/lib/libc/i386/string/memset.S +++ b/lib/libc/i386/string/memset.S @@ -33,7 +33,7 @@ .asciz "$FreeBSD$" #endif /* LIBC_RCS and not lint */ -#include "DEFS.h" +#include /* * memset(void *b, int c, size_t len) diff --git a/lib/libc/i386/string/rindex.S b/lib/libc/i386/string/rindex.S index ef65de1..c364ee2 100644 --- a/lib/libc/i386/string/rindex.S +++ b/lib/libc/i386/string/rindex.S @@ -33,7 +33,7 @@ .asciz "$FreeBSD$" #endif /* LIBC_RCS and not lint */ -#include "DEFS.h" +#include /* * rindex(s, c) diff --git a/lib/libc/i386/string/strcat.S b/lib/libc/i386/string/strcat.S index 093fe4c..d05a308 100644 --- a/lib/libc/i386/string/strcat.S +++ b/lib/libc/i386/string/strcat.S @@ -33,7 +33,7 @@ .asciz "$FreeBSD$" #endif /* LIBC_RCS and not lint */ -#include "DEFS.h" +#include /* * strcat(s, append) diff --git a/lib/libc/i386/string/strchr.S b/lib/libc/i386/string/strchr.S index ab899c9..682866b 100644 --- a/lib/libc/i386/string/strchr.S +++ b/lib/libc/i386/string/strchr.S @@ -33,7 +33,7 @@ .asciz "$FreeBSD$" #endif /* LIBC_RCS and not lint */ -#include "DEFS.h" +#include /* * strchr(s, c) diff --git a/lib/libc/i386/string/strcmp.S b/lib/libc/i386/string/strcmp.S index 31d2dc2..7631e41 100644 --- a/lib/libc/i386/string/strcmp.S +++ b/lib/libc/i386/string/strcmp.S @@ -33,7 +33,7 @@ .asciz "$FreeBSD$" #endif /* LIBC_RCS and not lint */ -#include "DEFS.h" +#include /* * strcmp(s1, s2) diff --git a/lib/libc/i386/string/strcpy.S b/lib/libc/i386/string/strcpy.S index c71de9b..c1dd092 100644 --- a/lib/libc/i386/string/strcpy.S +++ b/lib/libc/i386/string/strcpy.S @@ -33,7 +33,7 @@ .asciz "$FreeBSD$" #endif /* LIBC_RCS and not lint */ -#include "DEFS.h" +#include /* * strcpy (dst, src) diff --git a/lib/libc/i386/string/strlen.S b/lib/libc/i386/string/strlen.S index 5081db5..44fbdad 100644 --- a/lib/libc/i386/string/strlen.S +++ b/lib/libc/i386/string/strlen.S @@ -33,7 +33,7 @@ .asciz "$FreeBSD$" #endif /* LIBC_RCS and not lint */ -#include "DEFS.h" +#include /* * strlen (s) diff --git a/lib/libc/i386/string/strncmp.S b/lib/libc/i386/string/strncmp.S index 76dd272..da075b9 100644 --- a/lib/libc/i386/string/strncmp.S +++ b/lib/libc/i386/string/strncmp.S @@ -33,7 +33,7 @@ .asciz "$FreeBSD$" #endif /* LIBC_RCS and not lint */ -#include "DEFS.h" +#include /* * strncmp(s1, s2, n) diff --git a/lib/libc/i386/string/strrchr.S b/lib/libc/i386/string/strrchr.S index 39576e9..bef84d0 100644 --- a/lib/libc/i386/string/strrchr.S +++ b/lib/libc/i386/string/strrchr.S @@ -33,7 +33,7 @@ .asciz "$FreeBSD$" #endif /* LIBC_RCS and not lint */ -#include "DEFS.h" +#include /* * strrchr(s, c) diff --git a/lib/libc/i386/string/swab.S b/lib/libc/i386/string/swab.S index dee53fe..ce2aff1 100644 --- a/lib/libc/i386/string/swab.S +++ b/lib/libc/i386/string/swab.S @@ -33,7 +33,7 @@ .asciz "$FreeBSD$" #endif -#include "DEFS.h" +#include /* * void diff --git a/lib/libc/i386/sys/Ovfork.S b/lib/libc/i386/sys/Ovfork.S index ed2f152..c69ef0f 100644 --- a/lib/libc/i386/sys/Ovfork.S +++ b/lib/libc/i386/sys/Ovfork.S @@ -39,7 +39,6 @@ .asciz "$FreeBSD$" #endif /* SYSLIBC_RCS and not lint */ -#include "DEFS.h" #include "SYS.h" /* -- cgit v1.1