diff options
28 files changed, 219 insertions, 469 deletions
diff --git a/sys/arch/alpha/conf/Makefile.alpha b/sys/arch/alpha/conf/Makefile.alpha index 35905bdd7aa..4ffb9544b43 100644 --- a/sys/arch/alpha/conf/Makefile.alpha +++ b/sys/arch/alpha/conf/Makefile.alpha @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.alpha,v 1.64 2010/05/24 17:49:36 deraadt Exp $ +# $OpenBSD: Makefile.alpha,v 1.65 2010/05/24 23:19:20 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 CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \ -Wno-main -Wno-uninitialized -Wno-format \ - -Wstack-larger-than-2047 -Wvariable-decl + -Wstack-larger-than-2047 CMACHFLAGS= -mno-fp-regs -Wa,-mev56 CMACHFLAGS+= -fno-builtin-printf -fno-builtin-snprintf \ @@ -116,7 +116,7 @@ vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} 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 \ @@ -126,19 +126,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= ${_machdir}/${_mach}/locore.s \ - param.c ioconf.c ${CFILES} ${SFILES} +AFILES= ${_machdir}/${_mach}/locore.s +SRCS= ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} - ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.s + ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES} ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} .if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64 index f47d9f66cef..6b71a94a5e0 100644 --- a/sys/arch/amd64/conf/Makefile.amd64 +++ b/sys/arch/amd64/conf/Makefile.amd64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.amd64,v 1.37 2010/05/24 17:49:37 deraadt Exp $ +# $OpenBSD: Makefile.amd64,v 1.38 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 CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \ -Wno-main -Wno-uninitialized -Wno-format \ - -Wstack-larger-than-2047 -Wvariable-decl + -Wstack-larger-than-2047 CMACHFLAGS= -mcmodel=kernel -mno-red-zone -mno-sse2 -mno-sse -mno-3dnow \ -mno-mmx -msoft-float @@ -71,7 +71,7 @@ NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $< # ${SYSTEM_LD_HEAD} # ${SYSTEM_LD} swapxxx.o # ${SYSTEM_LD_TAIL} -SYSTEM_OBJ= locore.o vector.o copy.o spl.o param.o ioconf.o ${OBJS} +SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS} SYSTEM_DEP= Makefile ${SYSTEM_OBJ} SYSTEM_LD_HEAD= @rm -f $@ SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \ @@ -115,10 +115,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 \ @@ -128,18 +127,8 @@ 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 - -AFILES= ${_machdir}/${_mach}/locore.S ${_machdir}/${_mach}/vector.S \ - ${_machdir}/${_mach}/copy.S ${_machdir}/${_mach}/spl.S -SRCS= ${AFILES} \ - param.c ioconf.c ${CFILES} ${SFILES} +AFILES= ${_machdir}/${_mach}/locore.S +SRCS= ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES} @@ -161,15 +150,6 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk locore.o: ${_machdir}/${_mach}/locore.S assym.h ${NORMAL_S} -vector.o: ${_machdir}/${_mach}/vector.S assym.h - ${NORMAL_S} - -copy.o: ${_machdir}/${_mach}/copy.S assym.h - ${NORMAL_S} - -spl.o: ${_machdir}/${_mach}/spl.S assym.h - ${NORMAL_S} - # The install target can be redefined by putting a # install-kernel-${MACHINE_NAME} target into /etc/mk.conf MACHINE_NAME!= uname -n diff --git a/sys/arch/amd64/conf/files.amd64 b/sys/arch/amd64/conf/files.amd64 index 425c156a675..aab94de6b63 100644 --- a/sys/arch/amd64/conf/files.amd64 +++ b/sys/arch/amd64/conf/files.amd64 @@ -1,4 +1,4 @@ -# $OpenBSD: files.amd64,v 1.55 2009/12/28 14:22:09 dlg Exp $ +# $OpenBSD: files.amd64,v 1.56 2010/05/24 23:19:21 deraadt Exp $ maxpartitions 16 maxusers 2 16 128 @@ -24,6 +24,9 @@ file arch/amd64/amd64/softintr.c file arch/amd64/amd64/i8259.c file arch/amd64/amd64/cacheinfo.c file arch/amd64/amd64/mutex.S +file arch/amd64/amd64/vector.S +file arch/amd64/amd64/copy.S +file arch/amd64/amd64/spl.S file arch/amd64/amd64/lock_machdep.c multiprocessor file arch/amd64/amd64/intr.c diff --git a/sys/arch/armish/conf/Makefile.armish b/sys/arch/armish/conf/Makefile.armish index 5ee574bcb76..884fc845013 100644 --- a/sys/arch/armish/conf/Makefile.armish +++ b/sys/arch/armish/conf/Makefile.armish @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.armish,v 1.29 2010/05/24 19:58:50 deraadt Exp $ +# $OpenBSD: Makefile.armish,v 1.30 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 @@ -124,10 +124,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 \ @@ -137,19 +136,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} diff --git a/sys/arch/aviion/conf/Makefile.aviion b/sys/arch/aviion/conf/Makefile.aviion index 534307c0950..e64e288766e 100644 --- a/sys/arch/aviion/conf/Makefile.aviion +++ b/sys/arch/aviion/conf/Makefile.aviion @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.aviion,v 1.23 2010/05/24 19:58:51 deraadt Exp $ +# $OpenBSD: Makefile.aviion,v 1.24 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= -mno-check-zero-division -mmemcpy CMACHFLAGS+= -fno-builtin-printf -fno-builtin-snprintf \ @@ -122,7 +122,7 @@ vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} 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 \ @@ -132,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= \ - param.c ioconf.c ${CFILES} ${SFILES} - +AFILES= ${_machdir}/${_mach}/locore.S +SRCS= ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} + ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES} ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} .if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} diff --git a/sys/arch/beagle/conf/Makefile.beagle b/sys/arch/beagle/conf/Makefile.beagle index 2a71f5a0aab..f1c7fb6d036 100644 --- a/sys/arch/beagle/conf/Makefile.beagle +++ b/sys/arch/beagle/conf/Makefile.beagle @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.beagle,v 1.23 2010/05/24 17:49:37 deraadt Exp $ +# $OpenBSD: Makefile.beagle,v 1.24 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} 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} diff --git a/sys/arch/hp300/conf/Makefile.hp300 b/sys/arch/hp300/conf/Makefile.hp300 index 8686517bc82..44975884759 100644 --- a/sys/arch/hp300/conf/Makefile.hp300 +++ b/sys/arch/hp300/conf/Makefile.hp300 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.hp300,v 1.64 2010/05/24 19:58:51 deraadt Exp $ +# $OpenBSD: Makefile.hp300,v 1.65 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= -msoft-float CMACHFLAGS+= -fno-builtin-printf -fno-builtin-snprintf \ @@ -151,10 +151,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 \ @@ -164,19 +163,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= ${_machdir}/${_mach}/locore.s \ - param.c ioconf.c ${CFILES} ${SFILES} +AFILES= ${_machdir}/${_mach}/locore.s +SRCS= ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} - ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.s + ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES} ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} .if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} diff --git a/sys/arch/hppa/conf/Makefile.hppa b/sys/arch/hppa/conf/Makefile.hppa index 37bfe1b93d1..c1cac1b6de1 100644 --- a/sys/arch/hppa/conf/Makefile.hppa +++ b/sys/arch/hppa/conf/Makefile.hppa @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.hppa,v 1.53 2010/05/24 17:49:37 deraadt Exp $ +# $OpenBSD: Makefile.hppa,v 1.54 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 CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \ -Wno-main -Wno-uninitialized -Wno-format \ - -Wstack-larger-than-2047 -Wvariable-decl + -Wstack-larger-than-2047 CMACHFLAGS= -mfast-indirect-calls -mportable-runtime -mno-space-regs CMACHFLAGS+= -fno-builtin-printf -fno-builtin-snprintf \ @@ -137,7 +137,7 @@ vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} 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 \ @@ -147,19 +147,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= ${_machdir}/${_mach}/locore.S \ - param.c ioconf.c ${CFILES} ${SFILES} +AFILES= ${_machdir}/${_mach}/locore.S +SRCS= ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} - ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.S + ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES} ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} .if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} @@ -178,8 +170,6 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk locore.o: ${_machdir}/${_mach}/locore.S assym.h ${NORMAL_S} -fpemu.o: assym.h - # The install target can be redefined by putting a # install-kernel-${MACHINE_NAME} target into /etc/mk.conf MACHINE_NAME!= uname -n diff --git a/sys/arch/hppa64/conf/Makefile.hppa64 b/sys/arch/hppa64/conf/Makefile.hppa64 index 2b649a10e24..aa76436b158 100644 --- a/sys/arch/hppa64/conf/Makefile.hppa64 +++ b/sys/arch/hppa64/conf/Makefile.hppa64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.hppa64,v 1.27 2010/05/24 17:49:37 deraadt Exp $ +# $OpenBSD: Makefile.hppa64,v 1.28 2010/05/24 23:19:22 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 CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \ -Wno-main -Wno-uninitialized -Wno-format \ - -Wstack-larger-than-2047 -Wvariable-decl + -Wstack-larger-than-2047 CMACHFLAGS= -mpa-risc-2-0 -mno-space-regs -mdisable-fpregs CMACHFLAGS+= -fno-builtin-printf -fno-builtin-snprintf \ @@ -115,10 +115,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 \ @@ -128,19 +127,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= ${_machdir}/${_mach}/locore.S \ - param.c ioconf.c ${CFILES} ${SFILES} +AFILES= ${_machdir}/${_mach}/locore.S +SRCS= ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} - ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.S + ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES} ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} .if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} @@ -159,8 +150,6 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk locore.o: ${_machdir}/${_mach}/locore.S assym.h ${NORMAL_S} -fpemu.o: assym.h - # The install target can be redefined by putting a # install-kernel-${MACHINE_NAME} target into /etc/mk.conf MACHINE_NAME!= uname -n diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386 index f704ce64ae0..5b5b7a4adde 100644 --- a/sys/arch/i386/conf/Makefile.i386 +++ b/sys/arch/i386/conf/Makefile.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.i386,v 1.70 2010/05/24 17:49:37 deraadt Exp $ +# $OpenBSD: Makefile.i386,v 1.71 2010/05/24 23:19:22 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 CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \ -Wno-main -Wno-uninitialized -Wno-format \ - -Wstack-larger-than-2047 -Wvariable-decl + -Wstack-larger-than-2047 CMACHFLAGS= CMACHFLAGS+= -fno-builtin-printf -fno-builtin-snprintf \ @@ -42,7 +42,7 @@ COPTS?= -O2 CFLAGS= ${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} AFLAGS= -D_LOCORE -x assembler-with-cpp ${CMACHFLAGS} LINKFLAGS= -Ttext 0xD0200120 -e start -N --warn-common -STRIPFLAGS= -g -X -x +STRIPFLAGS= -g -x .if ${MACHINE} == "amd64" CFLAGS+= -m32 @@ -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= ${_machdir}/${_mach}/locore.s \ - param.c ioconf.c ${CFILES} ${SFILES} +AFILES= ${_machdir}/${_mach}/locore.s +SRCS= ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} - ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.s + ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES} ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} .if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} diff --git a/sys/arch/landisk/conf/Makefile.landisk b/sys/arch/landisk/conf/Makefile.landisk index 0b5b9da568d..49b4de1f97c 100644 --- a/sys/arch/landisk/conf/Makefile.landisk +++ b/sys/arch/landisk/conf/Makefile.landisk @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.landisk,v 1.30 2010/05/24 17:49:37 deraadt Exp $ +# $OpenBSD: Makefile.landisk,v 1.31 2010/05/24 23:19:22 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= -m4-nofpu CMACHFLAGS+= -fno-builtin-printf -fno-builtin-snprintf \ @@ -42,7 +42,7 @@ COPTS?= -O2 CFLAGS= ${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} AFLAGS= -D_LOCORE -x assembler-with-cpp -traditional-cpp ${CMACHFLAGS} LINKFLAGS= -N -Ttext 0x8c002000 -e start --warn-common -STRIPFLAGS= -g -X -x +STRIPFLAGS= -g -x .if ${IDENT:M-DDDB_STRUCT} DB_STRUCTINFO= db_structinfo.h @@ -116,7 +116,7 @@ vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} 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 \ @@ -126,19 +126,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= ${_machdir}/${_mach}/locore.S \ - param.c ioconf.c ${CFILES} ${SFILES} +AFILES= ${_machdir}/${_mach}/locore.S +SRCS= ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} - ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.S + ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES} ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} .if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} diff --git a/sys/arch/loongson/conf/Makefile.loongson b/sys/arch/loongson/conf/Makefile.loongson index 50deedaded2..99d95c90ef7 100644 --- a/sys/arch/loongson/conf/Makefile.loongson +++ b/sys/arch/loongson/conf/Makefile.loongson @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.loongson,v 1.20 2010/05/24 17:40:33 deraadt Exp $ +# $OpenBSD: Makefile.loongson,v 1.21 2010/05/24 23:19:22 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -35,7 +35,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= -mno-abicalls ${ABI} -msoft-float -Wa,-mfix-loongson2f-btb CMACHFLAGS+= -fno-builtin-printf -fno-builtin-snprintf \ @@ -49,7 +49,7 @@ COPTS?= -O2 CFLAGS= ${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} AFLAGS= -D_LOCORE -x assembler-with-cpp ${CMACHFLAGS} LINKFLAGS= -e start -T ${_machdir}/conf/ld.script -Ttext=${LINK_ADDRESS} -STRIPFLAGS= -g -X -x +STRIPFLAGS= -g -x .if ${IDENT:M-DDDB_STRUCT} DB_STRUCTINFO= db_structinfo.h @@ -97,22 +97,6 @@ LINKFLAGS+= -x %LOAD -clean:: - rm -f eddep *bsd *bsd.gdb tags *.[io] [a-z]*.s \ - [Ee]rrs linterrs makelinks assym.h ${DB_STRUCTINFO} - -lint: - @lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \ - ${CFILES} ioconf.c param.c | \ - grep -v 'static function .* unused' - -symbols.sort: ${_machdir}/${_mach}/symbols.raw - grep -v '^#' ${_machdir}/${_mach}/symbols.raw \ - | sed 's/^ //' | sort -u > symbols.sort - -locore.o: ${_machdir}/${_mach}/locore.S assym.h - ${NORMAL_S} - assym.h: $S/kern/genassym.sh Makefile \ ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ @@ -120,17 +104,6 @@ assym.h: $S/kern/genassym.sh Makefile \ sort -u > assym.h.tmp && \ mv -f assym.h.tmp assym.h -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 - -tags: - @echo "see $S/kern/Makefile for tags" - param.c: $S/conf/param.c rm -f param.c cp $S/conf/param.c . @@ -148,11 +121,27 @@ vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c -SRCS= ${_machdir}/${_mach}/locore.S \ - param.c ioconf.c ${CFILES} ${SFILES} +clean:: + rm -f eddep *bsd *bsd.gdb tags *.[io] [a-z]*.s \ + [Ee]rrs linterrs assym.h ${DB_STRUCTINFO} + +lint: + @lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \ + ${CFILES} ioconf.c param.c | \ + grep -v 'static function .* unused' + +symbols.sort: ${_machdir}/${_mach}/symbols.raw + grep -v '^#' ${_machdir}/${_mach}/symbols.raw \ + | sed 's/^ //' | sort -u > symbols.sort + +tags: + @echo "see $S/kern/Makefile for tags" + +AFILES= ${_machdir}/${_mach}/locore.S +SRCS= ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} - ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.S + ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES} ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} .if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} @@ -168,6 +157,9 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk objdump -g db_structinfo.o | awk -f $S/ddb/parse_structinfo.awk > $@ rm -f db_structinfo.o +locore.o: ${_machdir}/${_mach}/locore.S assym.h + ${NORMAL_S} + # The install target can be redefined by putting a # install-kernel-${MACHINE_NAME} target into /etc/mk.conf MACHINE_NAME!= uname -n diff --git a/sys/arch/luna88k/conf/Makefile.luna88k b/sys/arch/luna88k/conf/Makefile.luna88k index 3c96e4d3421..d0b1e04b7bd 100644 --- a/sys/arch/luna88k/conf/Makefile.luna88k +++ b/sys/arch/luna88k/conf/Makefile.luna88k @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.luna88k,v 1.30 2010/05/24 19:58:51 deraadt Exp $ +# $OpenBSD: Makefile.luna88k,v 1.31 2010/05/24 23:19:22 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= -mno-check-zero-division -mmemcpy CMACHFLAGS+= -fno-builtin-printf -fno-builtin-snprintf \ @@ -120,7 +120,7 @@ vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} 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 \ @@ -130,19 +130,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= \ - param.c ioconf.c ${CFILES} ${SFILES} - +AFILES= ${_machdir}/${_mach}/locore.S +SRCS= ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} + ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES} ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} .if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} diff --git a/sys/arch/mac68k/conf/Makefile.mac68k b/sys/arch/mac68k/conf/Makefile.mac68k index 28fc8c8a64c..f7e14fe53e0 100644 --- a/sys/arch/mac68k/conf/Makefile.mac68k +++ b/sys/arch/mac68k/conf/Makefile.mac68k @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.mac68k,v 1.61 2010/05/24 19:58:51 deraadt Exp $ +# $OpenBSD: Makefile.mac68k,v 1.62 2010/05/24 23:19:22 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= -msoft-float CMACHFLAGS+= -fno-builtin-printf -fno-builtin-snprintf \ @@ -116,10 +116,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 \ @@ -129,19 +128,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= ${_machdir}/${_mach}/locore.s \ - param.c ioconf.c ${CFILES} ${SFILES} +AFILES= ${_machdir}/${_mach}/locore.s +SRCS= ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} - ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.s + ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES} ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} .if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} diff --git a/sys/arch/macppc/conf/Makefile.macppc b/sys/arch/macppc/conf/Makefile.macppc index 2c1e6f2628b..691447fd24c 100644 --- a/sys/arch/macppc/conf/Makefile.macppc +++ b/sys/arch/macppc/conf/Makefile.macppc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.macppc,v 1.50 2010/05/24 17:49:37 deraadt Exp $ +# $OpenBSD: Makefile.macppc,v 1.51 2010/05/24 23:19:22 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= -msoft-float -Wa,-many CMACHFLAGS+= -fno-builtin-printf -fno-builtin-snprintf \ @@ -42,7 +42,7 @@ COPTS?= -O2 CFLAGS= ${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} AFLAGS= -D_LOCORE ${CMACHFLAGS} LINKFLAGS= -N -Ttext 100114 -e start --warn-common -STRIPFLAGS= -g -X -x +STRIPFLAGS= -g -x .if ${IDENT:M-DDDB_STRUCT} DB_STRUCTINFO= db_structinfo.h @@ -116,7 +116,7 @@ vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} 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 \ @@ -126,19 +126,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= ${_machdir}/${_mach}/locore.S \ - param.c ioconf.c ${CFILES} ${SFILES} +AFILES= ${_machdir}/${_mach}/locore.S +SRCS= ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} - ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.S + ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES} ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} .if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} diff --git a/sys/arch/moko/conf/Makefile.moko b/sys/arch/moko/conf/Makefile.moko index abc81be7ea7..0ddf8201a20 100644 --- a/sys/arch/moko/conf/Makefile.moko +++ b/sys/arch/moko/conf/Makefile.moko @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.moko,v 1.21 2010/05/24 17:49:37 deraadt Exp $ +# $OpenBSD: Makefile.moko,v 1.22 2010/05/24 23:19:22 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} diff --git a/sys/arch/mvme68k/conf/Makefile.mvme68k b/sys/arch/mvme68k/conf/Makefile.mvme68k index e78145d2bdb..df2b8814461 100644 --- a/sys/arch/mvme68k/conf/Makefile.mvme68k +++ b/sys/arch/mvme68k/conf/Makefile.mvme68k @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.mvme68k,v 1.52 2010/05/24 19:58:51 deraadt Exp $ +# $OpenBSD: Makefile.mvme68k,v 1.53 2010/05/24 23:19:22 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= -msoft-float CMACHFLAGS+= -fno-builtin-printf -fno-builtin-snprintf \ @@ -117,10 +117,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 \ @@ -130,19 +129,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= ${_machdir}/${_mach}/locore.s \ - param.c ioconf.c ${CFILES} ${SFILES} +AFILES= ${_machdir}/${_mach}/locore.s +SRCS= ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} - ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.s + ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES} ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} .if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} diff --git a/sys/arch/mvme88k/conf/Makefile.mvme88k b/sys/arch/mvme88k/conf/Makefile.mvme88k index 561d7bc954f..2130a1945a6 100644 --- a/sys/arch/mvme88k/conf/Makefile.mvme88k +++ b/sys/arch/mvme88k/conf/Makefile.mvme88k @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.mvme88k,v 1.60 2010/05/24 19:58:51 deraadt Exp $ +# $OpenBSD: Makefile.mvme88k,v 1.61 2010/05/24 23:19:22 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= -mno-check-zero-division -mmemcpy CMACHFLAGS+= -fno-builtin-printf -fno-builtin-snprintf \ @@ -59,11 +59,6 @@ NORMAL_C_NOP= ${CC} ${CFLAGS} ${CPPFLAGS} -c $< NORMAL_C= ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $< NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $< -PROFILE_C= ${CC} -S -c ${CFLAGS} ${CPPFLAGS} $<; \ - sed -e s/_mcount/mcount/ -e s/subrmcount/subr_mcount/ <$*.s | \ - ${AS} -o $@; \ - rm -f $*.s - %OBJS %CFILES @@ -122,7 +117,7 @@ vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} 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 \ @@ -132,19 +127,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= \ - param.c ioconf.c ${CFILES} ${SFILES} - +AFILES= ${_machdir}/${_mach}/locore.S +SRCS= ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} + ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES} ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} .if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} diff --git a/sys/arch/mvmeppc/conf/Makefile.mvmeppc b/sys/arch/mvmeppc/conf/Makefile.mvmeppc index 9e10b3302da..e0167bffa22 100644 --- a/sys/arch/mvmeppc/conf/Makefile.mvmeppc +++ b/sys/arch/mvmeppc/conf/Makefile.mvmeppc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.mvmeppc,v 1.47 2010/05/24 17:49:37 deraadt Exp $ +# $OpenBSD: Makefile.mvmeppc,v 1.48 2010/05/24 23:19:22 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= -msoft-float -Wa,-m7400 CMACHFLAGS+= -fno-builtin-printf -fno-builtin-snprintf \ @@ -42,7 +42,7 @@ COPTS?= -O2 CFLAGS= ${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} AFLAGS= -D_LOCORE ${CMACHFLAGS} LINKFLAGS= -N -Ttext 100114 -e start --warn-common -STRIPFLAGS= -g -X -x +STRIPFLAGS= -g -x .if ${IDENT:M-DDDB_STRUCT} DB_STRUCTINFO= db_structinfo.h @@ -116,7 +116,7 @@ vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} 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 \ @@ -126,19 +126,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= ${_machdir}/${_mach}/locore.S \ - param.c ioconf.c ${CFILES} ${SFILES} +AFILES= ${_machdir}/${_mach}/locore.S +SRCS= ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} - ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.S + ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES} ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} .if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} diff --git a/sys/arch/palm/conf/Makefile.palm b/sys/arch/palm/conf/Makefile.palm index 51b15b0dfb2..d48253aefb2 100644 --- a/sys/arch/palm/conf/Makefile.palm +++ b/sys/arch/palm/conf/Makefile.palm @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.palm,v 1.18 2010/05/24 17:49:37 deraadt Exp $ +# $OpenBSD: Makefile.palm,v 1.19 2010/05/24 23:19:22 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} diff --git a/sys/arch/sgi/conf/Makefile.sgi b/sys/arch/sgi/conf/Makefile.sgi index e9f73116bf1..cf819d3250a 100644 --- a/sys/arch/sgi/conf/Makefile.sgi +++ b/sys/arch/sgi/conf/Makefile.sgi @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.sgi,v 1.42 2010/05/24 17:49:37 deraadt Exp $ +# $OpenBSD: Makefile.sgi,v 1.43 2010/05/24 23:19:22 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -35,7 +35,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= -mno-abicalls ${ABI} -msoft-float CMACHFLAGS+= -fno-builtin-printf -fno-builtin-snprintf \ @@ -49,7 +49,7 @@ COPTS?= -O2 CFLAGS= ${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} AFLAGS= -D_LOCORE -x assembler-with-cpp ${CMACHFLAGS} LINKFLAGS= -e start -T ${_machdir}/conf/ld.script -Ttext=${LINK_ADDRESS} -STRIPFLAGS= -g -X -x +STRIPFLAGS= -g -x .if ${IDENT:M-DDDB_STRUCT} DB_STRUCTINFO= db_structinfo.h @@ -97,22 +97,6 @@ LINKFLAGS+= -x %LOAD -clean:: - rm -f eddep *bsd *bsd.gdb tags *.[io] [a-z]*.s \ - [Ee]rrs linterrs makelinks assym.h ${DB_STRUCTINFO} - -lint: - @lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \ - ${CFILES} ioconf.c param.c | \ - grep -v 'static function .* unused' - -symbols.sort: ${_machdir}/${_mach}/symbols.raw - grep -v '^#' ${_machdir}/${_mach}/symbols.raw \ - | sed 's/^ //' | sort -u > symbols.sort - -locore.o: ${_machdir}/${_mach}/locore.S assym.h - ${NORMAL_S} - assym.h: $S/kern/genassym.sh Makefile \ ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ @@ -120,17 +104,6 @@ assym.h: $S/kern/genassym.sh Makefile \ sort -u > assym.h.tmp && \ mv -f assym.h.tmp assym.h -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 - -tags: - @echo "see $S/kern/Makefile for tags" - param.c: $S/conf/param.c rm -f param.c cp $S/conf/param.c . @@ -148,11 +121,27 @@ vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c -SRCS= ${_machdir}/${_mach}/locore.S \ - param.c ioconf.c ${CFILES} ${SFILES} +clean:: + rm -f eddep *bsd *bsd.gdb tags *.[io] [a-z]*.s \ + [Ee]rrs linterrs assym.h ${DB_STRUCTINFO} + +lint: + @lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \ + ${CFILES} ioconf.c param.c | \ + grep -v 'static function .* unused' + +symbols.sort: ${_machdir}/${_mach}/symbols.raw + grep -v '^#' ${_machdir}/${_mach}/symbols.raw \ + | sed 's/^ //' | sort -u > symbols.sort + +tags: + @echo "see $S/kern/Makefile for tags" + +AFILES= ${_machdir}/${_mach}/locore.S +SRCS= ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} - ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.S + ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES} ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} .if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} @@ -168,6 +157,9 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk objdump -g db_structinfo.o | awk -f $S/ddb/parse_structinfo.awk > $@ rm -f db_structinfo.o +locore.o: ${_machdir}/${_mach}/locore.S assym.h + ${NORMAL_S} + # The install target can be redefined by putting a # install-kernel-${MACHINE_NAME} target into /etc/mk.conf MACHINE_NAME!= uname -n diff --git a/sys/arch/socppc/conf/Makefile.socppc b/sys/arch/socppc/conf/Makefile.socppc index 76ddb1ec224..39757d11bc9 100644 --- a/sys/arch/socppc/conf/Makefile.socppc +++ b/sys/arch/socppc/conf/Makefile.socppc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.socppc,v 1.21 2010/05/24 17:49:37 deraadt Exp $ +# $OpenBSD: Makefile.socppc,v 1.22 2010/05/24 23:19:22 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= -msoft-float -Wa,-many CMACHFLAGS+= -fno-builtin-printf -fno-builtin-snprintf \ @@ -42,7 +42,7 @@ COPTS?= -O2 CFLAGS= ${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} AFLAGS= -D_LOCORE ${CMACHFLAGS} LINKFLAGS= -N -Ttext 200000 -e start --warn-common -STRIPFLAGS= -g -X -x +STRIPFLAGS= -g -x .if ${IDENT:M-DDDB_STRUCT} DB_STRUCTINFO= db_structinfo.h @@ -116,7 +116,7 @@ vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} 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 \ @@ -126,19 +126,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= ${_machdir}/${_mach}/locore.S \ - param.c ioconf.c ${CFILES} ${SFILES} +AFILES= ${_machdir}/${_mach}/locore.S +SRCS= ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} - ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.S + ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES} ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} .if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} diff --git a/sys/arch/solbourne/conf/Makefile.solbourne b/sys/arch/solbourne/conf/Makefile.solbourne index 20fdc45c45f..fabf57ef2a9 100644 --- a/sys/arch/solbourne/conf/Makefile.solbourne +++ b/sys/arch/solbourne/conf/Makefile.solbourne @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.solbourne,v 1.23 2010/05/24 14:59:16 deraadt Exp $ +# $OpenBSD: Makefile.solbourne,v 1.24 2010/05/24 23:19:22 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= -mno-fpu CMACHFLAGS+= -fno-builtin-printf -fno-builtin-snprintf \ @@ -42,7 +42,7 @@ COPTS?= -O2 CFLAGS= ${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} AFLAGS= -D_LOCORE -x assembler-with-cpp -traditional-cpp ${CMACHFLAGS} LINKFLAGS= -N -e start -T ${_machdir}/conf/ld.script -Ttext FD084000 -STRIPFLAGS= -g -X -x +STRIPFLAGS= -g -x .if ${IDENT:M-DDDB_STRUCT} DB_STRUCTINFO= db_structinfo.h @@ -114,10 +114,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 \ @@ -127,19 +126,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= ${_machdir}/${_mach}/locore.s \ - param.c ioconf.c ${CFILES} ${SFILES} +AFILES= ${_machdir}/${_mach}/locore.s +SRCS= ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} - ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.s + ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES} ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} .if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} diff --git a/sys/arch/sparc/conf/Makefile.sparc b/sys/arch/sparc/conf/Makefile.sparc index 51a733bb915..6e6bca16803 100644 --- a/sys/arch/sparc/conf/Makefile.sparc +++ b/sys/arch/sparc/conf/Makefile.sparc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.sparc,v 1.60 2010/05/24 14:59:16 deraadt Exp $ +# $OpenBSD: Makefile.sparc,v 1.61 2010/05/24 23:19:22 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 CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \ -Wno-main -Wno-uninitialized -Wno-format \ - -Wstack-larger-than-2047 # -Wvariable-decl + -Wstack-larger-than-2047 CMACHFLAGS= -mno-fpu .if ${IDENT:M-DSUN*} == ${IDENT:M-DSUN4M} @@ -45,7 +45,7 @@ COPTS?= -O2 CFLAGS= ${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} AFLAGS= -D_LOCORE -x assembler-with-cpp -traditional-cpp ${CMACHFLAGS} LINKFLAGS= -N -e start -Ttext F8004000 -STRIPFLAGS= -g -X -x +STRIPFLAGS= -g -x .if ${IDENT:M-DDDB_STRUCT} DB_STRUCTINFO= db_structinfo.h @@ -117,10 +117,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 \ @@ -130,19 +129,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= ${_machdir}/${_mach}/locore.s \ - param.c ioconf.c ${CFILES} ${SFILES} +AFILES= ${_machdir}/${_mach}/locore.s +SRCS= ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} - ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.s + ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES} ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} .if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} diff --git a/sys/arch/sparc64/conf/Makefile.sparc64 b/sys/arch/sparc64/conf/Makefile.sparc64 index 2447653c1a2..dc8ae8d267a 100644 --- a/sys/arch/sparc64/conf/Makefile.sparc64 +++ b/sys/arch/sparc64/conf/Makefile.sparc64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.sparc64,v 1.47 2010/05/24 14:59:16 deraadt Exp $ +# $OpenBSD: Makefile.sparc64,v 1.48 2010/05/24 23:19:22 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 CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \ -Wno-main -Wno-uninitialized -Wno-format \ - -Wstack-larger-than-2047 -Wvariable-decl + -Wstack-larger-than-2047 CMACHFLAGS= -Wa,-Av9b, -mno-fpu CMACHFLAGS+= -fno-builtin-printf -fno-builtin-snprintf \ @@ -42,7 +42,7 @@ COPTS?= -O2 CFLAGS= ${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} AFLAGS= -D_LOCORE -x assembler-with-cpp ${CMACHFLAGS} LINKFLAGS= -n -Ttext 01000000 -Tdata 01800000 -e start -N -STRIPFLAGS= -g -X -x +STRIPFLAGS= -g -x .if ${IDENT:M-DDDB_STRUCT} DB_STRUCTINFO= db_structinfo.h @@ -114,10 +114,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 \ @@ -127,19 +126,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= ${_machdir}/${_mach}/locore.s \ - param.c ioconf.c ${CFILES} ${SFILES} +AFILES= ${_machdir}/${_mach}/locore.s +SRCS= ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} - ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.s + ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES} ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} .if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} diff --git a/sys/arch/vax/conf/Makefile.vax b/sys/arch/vax/conf/Makefile.vax index b4b524d9528..0f4a1c341a0 100644 --- a/sys/arch/vax/conf/Makefile.vax +++ b/sys/arch/vax/conf/Makefile.vax @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.vax,v 1.50 2010/05/24 19:58:51 deraadt Exp $ +# $OpenBSD: Makefile.vax,v 1.51 2010/05/24 23:19:22 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 CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \ -Wno-main -Wno-uninitialized -Wno-format \ - -Wstack-larger-than-2047 -Wvariable-decl + -Wstack-larger-than-2047 CMACHFLAGS= CMACHFLAGS+= -fno-builtin-printf -fno-builtin-snprintf \ @@ -116,30 +116,21 @@ vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} 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 \ - ${CFILES} ioconf.c param.c ${_machdir}/${_mach}/Locore.c | \ + ${CFILES} ioconf.c param.c | \ grep -v 'static function .* unused' 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= ${_machdir}/${_mach}/intvec.s ${_machdir}/${_mach}/subr.s \ - param.c ioconf.c ${CFILES} ${SFILES} - +AFILES= ${_machdir}/${_mach}/intvec.s ${_machdir}/${_mach}/subr.s +SRCS= ${AFILES} param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} - ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/intvec.s ${_machdir}/${_mach}/subr.s + ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES} ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} .if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} @@ -155,7 +146,6 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk objdump -g db_structinfo.o | awk -f $S/ddb/parse_structinfo.awk > $@ rm -f db_structinfo.o - intvec.o: ${_machdir}/${_mach}/intvec.s assym.h ${NORMAL_S} diff --git a/sys/arch/zaurus/conf/Makefile.zaurus b/sys/arch/zaurus/conf/Makefile.zaurus index ee3f841bf64..7e044d84875 100644 --- a/sys/arch/zaurus/conf/Makefile.zaurus +++ b/sys/arch/zaurus/conf/Makefile.zaurus @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.zaurus,v 1.31 2010/05/24 17:49:37 deraadt Exp $ +# $OpenBSD: Makefile.zaurus,v 1.32 2010/05/24 23:19:22 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} |