diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-05-24 23:19:23 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-05-24 23:19:23 +0000 |
| commit | 322a44485237bb2fc1a12a264e4d7cf57a78d441 (patch) | |
| tree | 8452494180a3f1d23730d8944ce58038fd9c92cf /sys/arch/gumstix | |
| parent | 0ccec1ff031912117defc6f4448f98e639d5a613 (diff) | |
give up on -Wvariable-decl
delete the archaic links: target which is easily misused
handle special .[sS] files in a portable way
Diffstat (limited to 'sys/arch/gumstix')
| -rw-r--r-- | sys/arch/gumstix/conf/Makefile.gumstix | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/sys/arch/gumstix/conf/Makefile.gumstix b/sys/arch/gumstix/conf/Makefile.gumstix index 7573ea80709..fe40a545c73 100644 --- a/sys/arch/gumstix/conf/Makefile.gumstix +++ b/sys/arch/gumstix/conf/Makefile.gumstix @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.gumstix,v 1.21 2010/05/24 17:49:37 deraadt Exp $ +# $OpenBSD: Makefile.gumstix,v 1.22 2010/05/24 23:19:21 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -28,7 +28,7 @@ INCLUDES= -nostdinc -I. -I$S -I$S/arch CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D__${_mach}__ CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \ -Wno-main -Wno-uninitialized -Wno-format \ - -Wstack-larger-than-2047 -Wvariable-decl + -Wstack-larger-than-2047 CMACHFLAGS= -ffreestanding -msoft-float # -march=armv4 -mtune=strongarm CMACHFLAGS+= -fno-builtin-printf -fno-builtin-snprintf \ @@ -43,7 +43,7 @@ CFLAGS= ${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} AFLAGS= -D_LOCORE -x assembler-with-cpp ${CMACHFLAGS} LINKFLAGS= -T ldscript LINKFLAGS+= --warn-common -STRIPFLAGS= -g -X -x +STRIPFLAGS= -g -x .if ${IDENT:M-DDDB_STRUCT} DB_STRUCTINFO= db_structinfo.h @@ -120,10 +120,9 @@ vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c - clean:: rm -f eddep *bsd *bsd.gdb tags *.[io] [a-z]*.s \ - [Ee]rrs linterrs makelinks assym.h ${DB_STRUCTINFO} + [Ee]rrs linterrs assym.h ${DB_STRUCTINFO} lint: @lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \ @@ -133,19 +132,11 @@ lint: tags: @echo "see $S/kern/Makefile for tags" -links: - egrep '#if' ${CFILES} | sed -f $S/conf/defines | \ - sed -e 's/:.*//' -e 's/\.c/.o/' | sort -u > dontlink - echo ${CFILES} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \ - sort -u | comm -23 - dontlink | \ - sed 's,.*/\(.*.o\),rm -f \1; ln -s ../GENERIC/\1 \1,' > makelinks - sh makelinks && rm -f dontlink makelinks - -SRCS= ${_archdir}/${_arch}/locore.S \ - param.c ioconf.c ${CFILES} ${SFILES} +AFILES= ${_machdir}/${_mach}/${_mach}_start.S ${_archdir}/${_arch}/locore.S +SRCS= ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} - ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_archdir}/${_arch}/locore.S + ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES} ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} .if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} |