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/hppa64 | |
| 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/hppa64')
| -rw-r--r-- | sys/arch/hppa64/conf/Makefile.hppa64 | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/sys/arch/hppa64/conf/Makefile.hppa64 b/sys/arch/hppa64/conf/Makefile.hppa64 index f85e725b363..ad1ef3d5cc9 100644 --- a/sys/arch/hppa64/conf/Makefile.hppa64 +++ b/sys/arch/hppa64/conf/Makefile.hppa64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.hppa64,v 1.25 2010/05/23 16:43:54 deraadt Exp $ +# $OpenBSD: Makefile.hppa64,v 1.26 2010/05/24 14:59:15 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -26,15 +26,19 @@ _archdir?= $S/arch/${_arch} INCLUDES= -nostdinc -I. -I$S -I$S/arch CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -CWARNFLAGS= -Werror -Wall -Wstrict-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= -fno-stack-protector -fno-builtin-log -fno-builtin-log2 \ - -fno-builtin-printf -fno-builtin-snprintf \ - -fno-builtin-vsnprintf -fno-builtin-malloc -COPTS?= -Os -mpa-risc-2-0 -mno-space-regs -mdisable-fpregs -CFLAGS= ${DEBUG} ${COPTS} ${CWARNFLAGS} ${CMACHFLAGS} ${PIPE} -AFLAGS= -x assembler-with-cpp -traditional-cpp -D_LOCORE + +CMACHFLAGS= -mpa-risc-2-0 -mno-space-regs -mdisable-fpregs +CMACHFLAGS+= -fno-builtin-printf -fno-builtin-snprintf \ + -fno-builtin-vsnprintf -fno-builtin-log \ + -fno-builtin-log2 -fno-builtin-malloc +CMACHFLAGS+= -fno-stack-protector + +COPTS?= -Os +CFLAGS= ${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} +AFLAGS= -D_LOCORE -x assembler-with-cpp -traditional-cpp ${CMACHFLAGS} LINKFLAGS= -X -T ${_machdir}/conf/ld.script -Ttext 80000 --warn-common STRIPFLAGS= -g -x @@ -51,15 +55,12 @@ DB_STRUCTINFO= HOSTCC?= ${CC} HOSTED_CPPFLAGS=${CPPFLAGS:S/^-nostdinc$//} HOSTED_CFLAGS= ${CFLAGS} +HOSTED_C= ${HOSTCC} ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} -c $< -# 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). - +NORMAL_C_NOP= ${CC} ${CFLAGS} ${CPPFLAGS} -c $< NORMAL_C= ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $< NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $< -HOSTED_C= ${HOSTCC} ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} -c $< - %OBJS %CFILES @@ -116,11 +117,11 @@ vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} 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' |