diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-05-24 14:59:17 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-05-24 14:59:17 +0000 |
| commit | 692ae6fe82dd7e240b408d4ac6bb900a9e450ac0 (patch) | |
| tree | c99785bbaccc3c8595e5e85bafd04c13fccb569e /sys/arch/alpha/conf | |
| parent | 49384741ccb14f3d28d08ccd3395dfcabeee2828 (diff) | |
Reduce differences between the Makefile.* files for all architectures.
ok various people, tested by fewer people, tested by me on 15.
Diffstat (limited to 'sys/arch/alpha/conf')
| -rw-r--r-- | sys/arch/alpha/conf/Makefile.alpha | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/sys/arch/alpha/conf/Makefile.alpha b/sys/arch/alpha/conf/Makefile.alpha index 7a3c7c408d2..dd3f07d3fc2 100644 --- a/sys/arch/alpha/conf/Makefile.alpha +++ b/sys/arch/alpha/conf/Makefile.alpha @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.alpha,v 1.62 2010/05/23 15:30:54 deraadt Exp $ +# $OpenBSD: Makefile.alpha,v 1.63 2010/05/24 14:59:14 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -26,18 +26,21 @@ _archdir?= $S/arch/${_arch} INCLUDES= -nostdinc -I. -I$S -I$S/arch CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -CDIAGFLAGS?= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \ - -Wno-uninitialized -Wno-format -Wno-main \ +CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \ + -Wno-main -Wno-uninitialized -Wno-format \ -Wstack-larger-than-2047 -Wvariable-decl -CMACHFLAGS= -mno-fp-regs -fno-builtin-printf -fno-builtin-log \ - -fno-builtin-log2 -fno-builtin-malloc -Wa,-mev56 +CMACHFLAGS= -mno-fp-regs -Wa,-mev56 +CMACHFLAGS+= -fno-builtin-printf -fno-builtin-snprintf \ + -fno-builtin-vsnprintf -fno-builtin-log \ + -fno-builtin-log2 -fno-builtin-malloc .if ${IDENT:M-DNO_PROPOLICE} CMACHFLAGS+= -fno-stack-protector .endif + COPTS?= -O2 -CFLAGS= ${DEBUG} ${CDIAGFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} -AFLAGS= -traditional -D_LOCORE +CFLAGS= ${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} +AFLAGS= -D_LOCORE -x assembler-with-cpp -traditional-cpp ${CMACHFLAGS} LINKFLAGS= -T ${_machdir}/conf/ld.script -X -N -G 4 STRIPFLAGS= -g -x @@ -47,18 +50,14 @@ DB_STRUCTINFO= db_structinfo.h DB_STRUCTINFO= .endif -HOSTED_CC= ${CC} +HOSTCC?= ${CC} HOSTED_CPPFLAGS=${CPPFLAGS:S/^-nostdinc$//} HOSTED_CFLAGS= ${CFLAGS} - -# compile rules: rules are named ${TYPE}_${SUFFIX} where TYPE is NORMAL or -# HOSTED}, and SUFFIX is the file suffix, capitalized (e.g. C for a .c file). +HOSTED_C= ${HOSTCC} ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} -c $< NORMAL_C_NOP= ${CC} ${CFLAGS} ${CPPFLAGS} -c $< NORMAL_C= ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $< -NORMAL_S= ${CC} -xassembler-with-cpp ${AFLAGS} ${CPPFLAGS} -c $< - -HOSTED_C= ${HOSTED_CC} ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} -c $< +NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $< %OBJS @@ -116,11 +115,11 @@ vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c clean:: - rm -f eddep *bsd bsd.gdb tags *.[io] [a-z]*.s \ + rm -f eddep *bsd *bsd.gdb tags *.[io] [a-z]*.s \ [Ee]rrs linterrs makelinks assym.h ${DB_STRUCTINFO} lint: - @lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} -UKGDB \ + @lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \ ${CFILES} ioconf.c param.c | \ grep -v 'static function .* unused' |