diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-05-23 15:32:19 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-05-23 15:32:19 +0000 |
| commit | 90bd7121c25a4fc54cbab6882cb866d7bfd86cc3 (patch) | |
| tree | d5a267a53ff8c6125660aa9a606ca642e3d0237f /sys | |
| parent | b3ff2c5030ffc29a41158c41a92b6aeb56a37c83 (diff) | |
no need for -Dx86_64 or -Damd64, since __amd64__ is supplied by the
compiler. Also move towards passing $PARAM around in CPPFLAGS, instead
of compiling param.c in a special way, as discussed with miod
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amd64/conf/Makefile.amd64 | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64 index 3f08a155b8a..29eacc33e0b 100644 --- a/sys/arch/amd64/conf/Makefile.amd64 +++ b/sys/arch/amd64/conf/Makefile.amd64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.amd64,v 1.34 2010/04/28 15:31:32 deraadt Exp $ +# $OpenBSD: Makefile.amd64,v 1.35 2010/05/23 15:32:18 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -25,7 +25,7 @@ _machdir?= $S/arch/${_mach} _archdir?= $S/arch/${_arch} INCLUDES= -nostdinc -I. -I$S -I$S/arch -CPPFLAGS= ${INCLUDES} ${IDENT} -D_KERNEL -D${_mach} -Dx86_64 +CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL CDIAGFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \ -Wno-uninitialized -Wno-format -Wno-main -Wno-sign-compare \ -Wstack-larger-than-2047 @@ -61,7 +61,6 @@ HOSTED_CFLAGS= ${CFLAGS} NORMAL_C_NOP= ${CC} ${CFLAGS} ${CPPFLAGS} -c $< NORMAL_C= ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $< -NORMAL_C_C= ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $< NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $< NORMAL_S_C= ${CC} ${AFLAGS} ${CPPFLAGS} ${PARAM} -c $< @@ -111,7 +110,7 @@ param.c: $S/conf/param.c cp $S/conf/param.c . param.o: param.c Makefile - ${NORMAL_C_C} + ${NORMAL_C} mcount.o: $S/lib/libkern/mcount.c Makefile ${NORMAL_C_NOP} |