diff options
author | peter <peter@FreeBSD.org> | 1999-06-28 09:21:41 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 1999-06-28 09:21:41 +0000 |
commit | 88bef0081c6d253e6eb4cc14ed7f1924f54941fb (patch) | |
tree | 75204f70a9d3cb69661c17f16276d172d5606d2a | |
parent | 7f6f7066414da4b0658c649e32feda41a051cfc1 (diff) | |
download | FreeBSD-src-88bef0081c6d253e6eb4cc14ed7f1924f54941fb.zip FreeBSD-src-88bef0081c6d253e6eb4cc14ed7f1924f54941fb.tar.gz |
Use the same -UKERNEL strategy as the alpha to avoid the inlines etc.
-rw-r--r-- | sys/amd64/amd64/genassym.c | 5 | ||||
-rw-r--r-- | sys/conf/Makefile.i386 | 4 | ||||
-rw-r--r-- | sys/conf/Makefile.powerpc | 4 | ||||
-rw-r--r-- | sys/i386/conf/Makefile.i386 | 4 | ||||
-rw-r--r-- | sys/i386/i386/genassym.c | 5 |
5 files changed, 14 insertions, 8 deletions
diff --git a/sys/amd64/amd64/genassym.c b/sys/amd64/amd64/genassym.c index 337fa18..abb81ec 100644 --- a/sys/amd64/amd64/genassym.c +++ b/sys/amd64/amd64/genassym.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 - * $Id: genassym.c,v 1.69 1999/05/12 21:38:40 luoqi Exp $ + * $Id: genassym.c,v 1.70 1999/06/01 18:19:38 jlemon Exp $ */ #include "opt_user_ldt.h" @@ -44,6 +44,7 @@ #include <sys/param.h> #include <sys/buf.h> #include <sys/proc.h> +#include <sys/errno.h> #include <sys/mount.h> #include <sys/socket.h> #include <sys/resourcevar.h> @@ -55,7 +56,9 @@ #include <vm/vm_param.h> #include <vm/pmap.h> #include <vm/vm_map.h> +#define KERNEL /* Avoid userland compatability headers */ #include <sys/user.h> +#undef KERNEL #include <net/if.h> #include <netinet/in.h> #include <nfs/nfsv2.h> diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386 index 8299663..6a7a29e 100644 --- a/sys/conf/Makefile.i386 +++ b/sys/conf/Makefile.i386 @@ -1,7 +1,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.i386,v 1.154 1999/06/28 07:10:55 phk Exp $ +# $Id: Makefile.i386,v 1.155 1999/06/28 07:19:51 phk Exp $ # # Makefile for FreeBSD # @@ -46,7 +46,7 @@ CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS} # Use the default object format for genassym, etc. -GEN_CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} +GEN_CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} -UKERNEL # Select the correct set of tools. Can't set OBJFORMAT here because it # doesn't get exported into the environment, and if it were exported diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc index 8299663..6a7a29e 100644 --- a/sys/conf/Makefile.powerpc +++ b/sys/conf/Makefile.powerpc @@ -1,7 +1,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.i386,v 1.154 1999/06/28 07:10:55 phk Exp $ +# $Id: Makefile.i386,v 1.155 1999/06/28 07:19:51 phk Exp $ # # Makefile for FreeBSD # @@ -46,7 +46,7 @@ CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS} # Use the default object format for genassym, etc. -GEN_CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} +GEN_CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} -UKERNEL # Select the correct set of tools. Can't set OBJFORMAT here because it # doesn't get exported into the environment, and if it were exported diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386 index 8299663..6a7a29e 100644 --- a/sys/i386/conf/Makefile.i386 +++ b/sys/i386/conf/Makefile.i386 @@ -1,7 +1,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.i386,v 1.154 1999/06/28 07:10:55 phk Exp $ +# $Id: Makefile.i386,v 1.155 1999/06/28 07:19:51 phk Exp $ # # Makefile for FreeBSD # @@ -46,7 +46,7 @@ CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS} # Use the default object format for genassym, etc. -GEN_CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} +GEN_CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} -UKERNEL # Select the correct set of tools. Can't set OBJFORMAT here because it # doesn't get exported into the environment, and if it were exported diff --git a/sys/i386/i386/genassym.c b/sys/i386/i386/genassym.c index 337fa18..abb81ec 100644 --- a/sys/i386/i386/genassym.c +++ b/sys/i386/i386/genassym.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 - * $Id: genassym.c,v 1.69 1999/05/12 21:38:40 luoqi Exp $ + * $Id: genassym.c,v 1.70 1999/06/01 18:19:38 jlemon Exp $ */ #include "opt_user_ldt.h" @@ -44,6 +44,7 @@ #include <sys/param.h> #include <sys/buf.h> #include <sys/proc.h> +#include <sys/errno.h> #include <sys/mount.h> #include <sys/socket.h> #include <sys/resourcevar.h> @@ -55,7 +56,9 @@ #include <vm/vm_param.h> #include <vm/pmap.h> #include <vm/vm_map.h> +#define KERNEL /* Avoid userland compatability headers */ #include <sys/user.h> +#undef KERNEL #include <net/if.h> #include <netinet/in.h> #include <nfs/nfsv2.h> |