De-orbit DEFS.h - the other arches do not use it, and it got replaced

with <machine/asm.h>. Reviewed by: bde
2001-10-24 20:29:14 +00:00 · 2001-10-24 20:29:14 +00:00 · e6d808aee3
commit e6d808aee3
parent 88f5f7ac50
42 changed files with 35 additions and 82 deletions
--- a/lib/libc/amd64/SYS.h
+++ b/lib/libc/amd64/SYS.h
@ -39,7 +39,7 @@
 */

 #include <sys/syscall.h>
-#include "DEFS.h"
+#include <machine/asm.h>

 #define	SYSCALL(x)	2: PIC_PROLOGUE; jmp PIC_PLT(HIDENAME(cerror));	\
 			ENTRY(__CONCAT(__sys_,x));			\
--- 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 <machine/asm.h>

 ENTRY(_setjmp)
 	movl	4(%esp),%eax
--- 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)
--- 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"

 /*-
--- 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 <machine/asm.h>

 ENTRY(htonl)
 	movl	4(%esp),%eax
--- 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 <machine/asm.h>

 ENTRY(htons)
 	movzwl	4(%esp),%eax
--- 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 <machine/asm.h>

 ENTRY(ntohl)
 	movl	4(%esp),%eax
--- 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 <machine/asm.h>

 ENTRY(ntohs)
 	movzwl	4(%esp),%eax
--- 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"

 /*
--- a/lib/libc/i386/DEFS.h
+++ b/lib/libc/i386/DEFS.h
@ -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 <machine/asm.h>
--- a/lib/libc/i386/SYS.h
+++ b/lib/libc/i386/SYS.h
@ -39,7 +39,7 @@
 */

 #include <sys/syscall.h>
-#include "DEFS.h"
+#include <machine/asm.h>

 #define	SYSCALL(x)	2: PIC_PROLOGUE; jmp PIC_PLT(HIDENAME(cerror));	\
 			ENTRY(__CONCAT(__sys_,x));			\
--- 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 <machine/asm.h>

 ENTRY(_setjmp)
 	movl	4(%esp),%eax
--- 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 <machine/asm.h>

 ENTRY(alloca)
 	popl	%edx		/*  pop return addr */
--- 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 <machine/asm.h>

 ENTRY(fabs)
 	fldl	4(%esp)
--- 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 <machine/asm.h>

 ENTRY(modf)
 	pushl %ebp
--- 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)
--- 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"

 /*-
--- 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 <machine/asm.h>

 ENTRY(htonl)
 	movl	4(%esp),%eax
--- 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 <machine/asm.h>

 ENTRY(htons)
 	movzwl	4(%esp),%eax
--- 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 <machine/asm.h>

 ENTRY(ntohl)
 	movl	4(%esp),%eax
--- 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 <machine/asm.h>

 ENTRY(ntohs)
 	movzwl	4(%esp),%eax
--- 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 <machine/asm.h>

 ENTRY(abs)
 	movl	4(%esp),%eax
--- 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 <machine/asm.h>

 ENTRY(div)
        movl    4(%esp),%eax
--- 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 <machine/asm.h>

 ENTRY(labs)
 	movl	4(%esp),%eax
--- 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 <machine/asm.h>

 ENTRY(ldiv)
        movl    4(%esp),%eax
--- 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 <machine/asm.h>

 /*
 * bcmp (void *b1, void *b2, size_t len)
--- 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 <machine/asm.h>

 /*
 * bzero (void *b, size_t len)
--- 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 <machine/asm.h>

 /*
 * ffs(value)
--- 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 <machine/asm.h>

 /*
 * index(s, c)
--- 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 <machine/asm.h>

 /*
 * memchr (b, c, len)
--- 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 <machine/asm.h>

 /*
 * memcmp (void *b1, void *b2, size_t len)
--- 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 <machine/asm.h>

 /*
 * memset(void *b, int c, size_t len)
--- 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 <machine/asm.h>

 /*
 * rindex(s, c)
--- 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 <machine/asm.h>

 /*
 * strcat(s, append)
--- 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 <machine/asm.h>

 /*
 * strchr(s, c)
--- 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 <machine/asm.h>

 /*
 * strcmp(s1, s2)
--- 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 <machine/asm.h>

 /*
 * strcpy (dst, src)
--- 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 <machine/asm.h>

 /*
 * strlen (s)
--- 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 <machine/asm.h>

 /*
 * strncmp(s1, s2, n)
--- 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 <machine/asm.h>

 /*
 * strrchr(s, c)
--- 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 <machine/asm.h>

 /*
 * void
--- 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"

 /*