diff options
Diffstat (limited to 'sys/arch')
-rw-r--r-- | sys/arch/alpha/conf/Makefile.alpha | 29 | ||||
-rw-r--r-- | sys/arch/amd64/conf/Makefile.amd64 | 29 | ||||
-rw-r--r-- | sys/arch/arm64/conf/Makefile.arm64 | 30 | ||||
-rw-r--r-- | sys/arch/armv7/conf/Makefile.armv7 | 30 | ||||
-rw-r--r-- | sys/arch/hppa/conf/Makefile.hppa | 29 | ||||
-rw-r--r-- | sys/arch/i386/conf/Makefile.i386 | 29 | ||||
-rw-r--r-- | sys/arch/landisk/conf/Makefile.landisk | 29 | ||||
-rw-r--r-- | sys/arch/loongson/conf/Makefile.loongson | 29 | ||||
-rw-r--r-- | sys/arch/luna88k/conf/Makefile.luna88k | 29 | ||||
-rw-r--r-- | sys/arch/macppc/conf/Makefile.macppc | 29 | ||||
-rw-r--r-- | sys/arch/octeon/conf/Makefile.octeon | 29 | ||||
-rw-r--r-- | sys/arch/sgi/conf/Makefile.sgi | 29 | ||||
-rw-r--r-- | sys/arch/socppc/conf/Makefile.socppc | 29 | ||||
-rw-r--r-- | sys/arch/sparc64/conf/Makefile.sparc64 | 29 |
14 files changed, 28 insertions, 380 deletions
diff --git a/sys/arch/alpha/conf/Makefile.alpha b/sys/arch/alpha/conf/Makefile.alpha index 6b2f0c1d366..0079f644938 100644 --- a/sys/arch/alpha/conf/Makefile.alpha +++ b/sys/arch/alpha/conf/Makefile.alpha @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.alpha,v 1.107 2017/08/12 20:26:11 mpi Exp $ +# $OpenBSD: Makefile.alpha,v 1.108 2017/09/12 08:23:42 mpi Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -45,12 +45,6 @@ CFLAGS= ${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} AFLAGS= -D_LOCORE -x assembler-with-cpp ${CWARNFLAGS} ${CMACHFLAGS} LINKFLAGS= -T ld.script -X -N -G 4 --warn-common -nopie -.if ${IDENT:M-DDDB_STRUCT} -DB_STRUCTINFO= db_structinfo.h -.else -DB_STRUCTINFO= -.endif - HOSTCC?= ${CC} HOSTED_CPPFLAGS=${CPPFLAGS:S/^-nostdinc$//} HOSTED_CFLAGS= ${CFLAGS} @@ -134,7 +128,7 @@ vers.o: ${SYSTEM_DEP:Ngap.o} ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c clean: - rm -f *bsd *bsd.gdb *.[dio] [a-z]*.s assym.* ${DB_STRUCTINFO} \ + rm -f *bsd *bsd.gdb *.[dio] [a-z]*.s assym.* \ gap.link ld.script lorder makegap.sh param.c cleandir: clean @@ -142,11 +136,6 @@ cleandir: clean depend obj: -db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.pl - ${CC} ${CFLAGS} ${CPPFLAGS} -MT $@ -gstabs -c $S/ddb/db_structinfo.c - objdump -g db_structinfo.o | perl $S/ddb/parse_structinfo.pl > $@ - rm -f db_structinfo.o - locore0.o: ${_machdir}/${_mach}/locore0.S assym.h locore.o: ${_machdir}/${_mach}/locore.s assym.h @@ -157,18 +146,4 @@ newinstall: install: update-link newinstall -# pull in the dependency information -.if !empty(DB_STRUCTINFO) && !exists(${DB_STRUCTINFO}) - ${SYSTEM_OBJ}: ${DB_STRUCTINFO} -.endif -.ifnmake clean -. for o in ${SYSTEM_OBJ:Ngap.o} assym.h ${DB_STRUCTINFO} -. if exists(${o:R}.d) -. include "${o:R}.d" -. elif exists($o) - .PHONY: $o -. endif -. endfor -.endif - %RULES diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64 index 22f4aa5db98..d6cd443759f 100644 --- a/sys/arch/amd64/conf/Makefile.amd64 +++ b/sys/arch/amd64/conf/Makefile.amd64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.amd64,v 1.92 2017/08/12 20:26:11 mpi Exp $ +# $OpenBSD: Makefile.amd64,v 1.93 2017/09/12 08:23:42 mpi Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -51,12 +51,6 @@ CFLAGS= ${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} AFLAGS= -D_LOCORE -x assembler-with-cpp ${CWARNFLAGS} ${CMACHFLAGS} LINKFLAGS= -T ld.script -X --warn-common -nopie -.if ${IDENT:M-DDDB_STRUCT} -DB_STRUCTINFO= db_structinfo.h -.else -DB_STRUCTINFO= -.endif - HOSTCC?= ${CC} HOSTED_CPPFLAGS=${CPPFLAGS:S/^-nostdinc$//} HOSTED_CFLAGS= ${CFLAGS} @@ -140,7 +134,7 @@ vers.o: ${SYSTEM_DEP:Ngap.o} ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c clean: - rm -f *bsd *bsd.gdb *.[dio] [a-z]*.s assym.* ${DB_STRUCTINFO} \ + rm -f *bsd *bsd.gdb *.[dio] [a-z]*.s assym.* \ gap.link ld.script lorder makegap.sh param.c cleandir: clean @@ -148,11 +142,6 @@ cleandir: clean depend obj: -db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.pl - ${CC} ${CFLAGS} ${CPPFLAGS} -MT $@ -gstabs -c $S/ddb/db_structinfo.c - objdump -g db_structinfo.o | perl $S/ddb/parse_structinfo.pl > $@ - rm -f db_structinfo.o - locore0.o: ${_machdir}/${_mach}/locore0.S assym.h locore.o mutex.o vector.o copy.o spl.o: assym.h mptramp.o acpi_wakecode.o vmm_support.o: assym.h @@ -164,18 +153,4 @@ newinstall: install: update-link newinstall -# pull in the dependency information -.if !empty(DB_STRUCTINFO) && !exists(${DB_STRUCTINFO}) - ${SYSTEM_OBJ}: ${DB_STRUCTINFO} -.endif -.ifnmake clean -. for o in ${SYSTEM_OBJ:Ngap.o} assym.h ${DB_STRUCTINFO} -. if exists(${o:R}.d) -. include "${o:R}.d" -. elif exists($o) - .PHONY: $o -. endif -. endfor -.endif - %RULES diff --git a/sys/arch/arm64/conf/Makefile.arm64 b/sys/arch/arm64/conf/Makefile.arm64 index 878f736f093..3e5e9d19739 100644 --- a/sys/arch/arm64/conf/Makefile.arm64 +++ b/sys/arch/arm64/conf/Makefile.arm64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.arm64,v 1.21 2017/08/12 20:26:11 mpi Exp $ +# $OpenBSD: Makefile.arm64,v 1.22 2017/09/12 08:23:42 mpi Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -46,12 +46,6 @@ CFLAGS= ${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} AFLAGS= -D_LOCORE -x assembler-with-cpp ${CWARNFLAGS} ${CMACHFLAGS} LINKFLAGS= -T ld.script -X --warn-common -nopie -.if ${IDENT:M-DDDB_STRUCT} -DB_STRUCTINFO= db_structinfo.h -.else -DB_STRUCTINFO= -.endif - HOSTCC?= ${CC} HOSTED_CPPFLAGS=${CPPFLAGS:S/^-nostdinc$//} HOSTED_CFLAGS= ${CFLAGS} @@ -140,7 +134,7 @@ vers.o: ${SYSTEM_DEP:Ngap.o} ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c clean: - rm -f *bsd *bsd.gdb *.[dio] [a-z]*.s assym.* ${DB_STRUCTINFO} \ + rm -f *bsd *bsd.gdb *.[dio] [a-z]*.s assym.* \ gap.link ld.script lorder makegap.sh param.c cleandir: clean @@ -148,11 +142,6 @@ cleandir: clean depend obj: -db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.pl - ${CC} ${CFLAGS} ${CPPFLAGS} -MT $@ -gstabs -c $S/ddb/db_structinfo.c - objdump -g db_structinfo.o | perl $S/ddb/parse_structinfo.pl > $@ - rm -f db_structinfo.o - locore0.o: ${_archdir}/${_arch}/locore0.S assym.h in_cksum_arm.o fiq_subr.o bcopyinout.o copystr.o sigcode.o copy.o: assym.h vectors.o cpuswitch.o exception.o bcopy_page.o irq_dispatch.o support.o: assym.h @@ -165,21 +154,6 @@ newinstall: install: update-link newinstall -# pull in the dependency information -.if !empty(DB_STRUCTINFO) && !exists(${DB_STRUCTINFO}) - ${SYSTEM_OBJ}: ${DB_STRUCTINFO} -.endif -.ifnmake clean -. for o in ${SYSTEM_OBJ:Ngap.o} assym.h ${DB_STRUCTINFO} -. if exists(${o:R}.d) -. include "${o:R}.d" -. elif exists($o) - .PHONY: $o -. endif -. endfor -.endif - - ## for qemu this is where ram is located RAM_ADDR?=0x40000000 #KERNEL_LOAD_ADDR!=echo "x = hex(${KERNEL_BASE_PHYS} + ${RAM_ADDR}); print x" | python diff --git a/sys/arch/armv7/conf/Makefile.armv7 b/sys/arch/armv7/conf/Makefile.armv7 index 1d63b7e3842..ed0a33aee09 100644 --- a/sys/arch/armv7/conf/Makefile.armv7 +++ b/sys/arch/armv7/conf/Makefile.armv7 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.armv7,v 1.34 2017/08/12 20:26:11 mpi Exp $ +# $OpenBSD: Makefile.armv7,v 1.35 2017/09/12 08:23:42 mpi Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -43,12 +43,6 @@ CFLAGS= ${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} AFLAGS= -D_LOCORE -x assembler-with-cpp ${CWARNFLAGS} ${CMACHFLAGS} LINKFLAGS= -T ld.script --warn-common -nopie -.if ${IDENT:M-DDDB_STRUCT} -DB_STRUCTINFO= db_structinfo.h -.else -DB_STRUCTINFO= -.endif - HOSTCC?= ${CC} HOSTED_CPPFLAGS=${CPPFLAGS:S/^-nostdinc$//} HOSTED_CFLAGS= ${CFLAGS} @@ -139,7 +133,7 @@ vers.o: ${SYSTEM_DEP:Ngap.o} ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c clean: - rm -f *bsd *bsd.gdb *.[dio] [a-z]*.s assym.* ${DB_STRUCTINFO} \ + rm -f *bsd *bsd.gdb *.[dio] [a-z]*.s assym.* \ gap.link ld.script lorder makegap.sh param.c cleandir: clean @@ -147,11 +141,6 @@ cleandir: clean depend obj: -db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.pl - ${CC} ${CFLAGS} ${CPPFLAGS} -MT $@ -gstabs -c $S/ddb/db_structinfo.c - objdump -g db_structinfo.o | perl $S/ddb/parse_structinfo.pl > $@ - rm -f db_structinfo.o - locore0.o: ${_machdir}/${_mach}/locore0.S assym.h in_cksum_arm.o fiq_subr.o bcopyinout.o copystr.o sigcode.o: assym.h vectors.o cpuswitch7.o exception.o bcopy_page.o irq_dispatch.o: assym.h @@ -164,21 +153,6 @@ newinstall: install: update-link newinstall -# pull in the dependency information -.if !empty(DB_STRUCTINFO) && !exists(${DB_STRUCTINFO}) - ${SYSTEM_OBJ}: ${DB_STRUCTINFO} -.endif -.ifnmake clean -. for o in ${SYSTEM_OBJ:Ngap.o} assym.h ${DB_STRUCTINFO} -. if exists(${o:R}.d) -. include "${o:R}.d" -. elif exists($o) - .PHONY: $o -. endif -. endfor -.endif - - # until we get native booting working, put this in the tree. KERNADDR_OMAP=0x80300000 KERNADDR_IMX=0x10300000 diff --git a/sys/arch/hppa/conf/Makefile.hppa b/sys/arch/hppa/conf/Makefile.hppa index 162930c9b4c..320ecc868f0 100644 --- a/sys/arch/hppa/conf/Makefile.hppa +++ b/sys/arch/hppa/conf/Makefile.hppa @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.hppa,v 1.101 2017/08/12 20:26:11 mpi Exp $ +# $OpenBSD: Makefile.hppa,v 1.102 2017/09/12 08:23:42 mpi Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -53,12 +53,6 @@ CFLAGS+= -mpa-risc-2-0 CFLAGS+= -mpa-risc-1-1 .endif -.if ${IDENT:M-DDDB_STRUCT} -DB_STRUCTINFO= db_structinfo.h -.else -DB_STRUCTINFO= -.endif - HOSTCC?= ${CC} HOSTED_CPPFLAGS=${CPPFLAGS:S/^-nostdinc$//} HOSTED_CFLAGS= ${CFLAGS} @@ -142,7 +136,7 @@ vers.o: ${SYSTEM_DEP:Ngap.o} ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c clean: - rm -f *bsd *bsd.gdb *.[dio] [a-z]*.s assym.* ${DB_STRUCTINFO} \ + rm -f *bsd *bsd.gdb *.[dio] [a-z]*.s assym.* \ gap.link ld.script lorder makegap.sh param.c cleandir: clean @@ -150,11 +144,6 @@ cleandir: clean depend obj: -db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.pl - ${CC} ${CFLAGS} ${CPPFLAGS} -MT $@ -gstabs -c $S/ddb/db_structinfo.c - objdump -g db_structinfo.o | perl $S/ddb/parse_structinfo.pl > $@ - rm -f db_structinfo.o - locore0.o: ${_machdir}/${_mach}/locore0.S assym.h locore.o: ${_machdir}/${_mach}/locore.S assym.h fpemu.o spcopy.o: assym.h @@ -166,18 +155,4 @@ newinstall: install: update-link newinstall -# pull in the dependency information -.if !empty(DB_STRUCTINFO) && !exists(${DB_STRUCTINFO}) - ${SYSTEM_OBJ}: ${DB_STRUCTINFO} -.endif -.ifnmake clean -. for o in ${SYSTEM_OBJ:Ngap.o} assym.h ${DB_STRUCTINFO} -. if exists(${o:R}.d) -. include "${o:R}.d" -. elif exists($o) - .PHONY: $o -. endif -. endfor -.endif - %RULES diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386 index 1449daacff3..adc890e3a9c 100644 --- a/sys/arch/i386/conf/Makefile.i386 +++ b/sys/arch/i386/conf/Makefile.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.i386,v 1.117 2017/08/12 20:26:11 mpi Exp $ +# $OpenBSD: Makefile.i386,v 1.118 2017/09/12 08:23:42 mpi Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -53,12 +53,6 @@ AFLAGS+= -m32 LINKFLAGS+= -melf_i386_obsd .endif -.if ${IDENT:M-DDDB_STRUCT} -DB_STRUCTINFO= db_structinfo.h -.else -DB_STRUCTINFO= -.endif - HOSTCC?= ${CC} HOSTED_CPPFLAGS=${CPPFLAGS:S/^-nostdinc$//} HOSTED_CFLAGS= ${CFLAGS} @@ -142,7 +136,7 @@ vers.o: ${SYSTEM_DEP:Ngap.o} ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c clean: - rm -f *bsd *bsd.gdb *.[dio] [a-z]*.s assym.* ${DB_STRUCTINFO} \ + rm -f *bsd *bsd.gdb *.[dio] [a-z]*.s assym.* \ gap.link ld.script lorder makegap.sh param.c cleandir: clean @@ -150,11 +144,6 @@ cleandir: clean depend obj: -db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.pl - ${CC} ${CFLAGS} ${CPPFLAGS} -MT $@ -gstabs -c $S/ddb/db_structinfo.c - objdump -g db_structinfo.o | perl $S/ddb/parse_structinfo.pl > $@ - rm -f db_structinfo.o - locore0.o: ${_machdir}/${_mach}/locore0.S assym.h locore.o mutex.o in_cksum.o mptramp.o: assym.h kvm86call.o acpi_wakecode.o vmm_support.o: assym.h @@ -166,18 +155,4 @@ newinstall: install: update-link newinstall -# pull in the dependency information -.if !empty(DB_STRUCTINFO) && !exists(${DB_STRUCTINFO}) - ${SYSTEM_OBJ}: ${DB_STRUCTINFO} -.endif -.ifnmake clean -. for o in ${SYSTEM_OBJ:Ngap.o} assym.h ${DB_STRUCTINFO} -. if exists(${o:R}.d) -. include "${o:R}.d" -. elif exists($o) - .PHONY: $o -. endif -. endfor -.endif - %RULES diff --git a/sys/arch/landisk/conf/Makefile.landisk b/sys/arch/landisk/conf/Makefile.landisk index 158eac92884..e15940181dc 100644 --- a/sys/arch/landisk/conf/Makefile.landisk +++ b/sys/arch/landisk/conf/Makefile.landisk @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.landisk,v 1.73 2017/08/12 20:26:11 mpi Exp $ +# $OpenBSD: Makefile.landisk,v 1.74 2017/09/12 08:23:42 mpi Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -45,12 +45,6 @@ CFLAGS= ${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} AFLAGS= -D_LOCORE -x assembler-with-cpp ${CWARNFLAGS} ${CMACHFLAGS} LINKFLAGS= -N -Ttext 0x8c002000 -e start --warn-common -nopie -.if ${IDENT:M-DDDB_STRUCT} -DB_STRUCTINFO= db_structinfo.h -.else -DB_STRUCTINFO= -.endif - HOSTCC?= ${CC} HOSTED_CPPFLAGS=${CPPFLAGS:S/^-nostdinc$//} HOSTED_CFLAGS= ${CFLAGS} @@ -134,7 +128,7 @@ vers.o: ${SYSTEM_DEP:Ngap.o} ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c clean: - rm -f *bsd *bsd.gdb *.[dio] [a-z]*.s assym.* ${DB_STRUCTINFO} \ + rm -f *bsd *bsd.gdb *.[dio] [a-z]*.s assym.* \ gap.link ld.script lorder makegap.sh param.c cleandir: clean @@ -142,11 +136,6 @@ cleandir: clean depend obj: -db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.pl - ${CC} ${CFLAGS} ${CPPFLAGS} -MT $@ -gstabs -c $S/ddb/db_structinfo.c - objdump -g db_structinfo.o | perl $S/ddb/parse_structinfo.pl > $@ - rm -f db_structinfo.o - locore.o: ${_machdir}/${_mach}/locore.S assym.h locore0.o: ${_machdir}/${_mach}/locore0.S assym.h locore_subr.o vectors.o in_cksum.o: assym.h @@ -158,18 +147,4 @@ newinstall: install: update-link newinstall -# pull in the dependency information -.if !empty(DB_STRUCTINFO) && !exists(${DB_STRUCTINFO}) - ${SYSTEM_OBJ}: ${DB_STRUCTINFO} -.endif -.ifnmake clean -. for o in ${SYSTEM_OBJ:Ngap.o} assym.h ${DB_STRUCTINFO} -. if exists(${o:R}.d) -. include "${o:R}.d" -. elif exists($o) - .PHONY: $o -. endif -. endfor -.endif - %RULES diff --git a/sys/arch/loongson/conf/Makefile.loongson b/sys/arch/loongson/conf/Makefile.loongson index 5816e3d68bc..9baef0290b5 100644 --- a/sys/arch/loongson/conf/Makefile.loongson +++ b/sys/arch/loongson/conf/Makefile.loongson @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.loongson,v 1.66 2017/08/12 20:26:11 mpi Exp $ +# $OpenBSD: Makefile.loongson,v 1.67 2017/09/12 08:23:42 mpi Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -50,12 +50,6 @@ CFLAGS= ${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} AFLAGS= -D_LOCORE -x assembler-with-cpp ${CWARNFLAGS} ${CMACHFLAGS} LINKFLAGS= -e start -T ld.script -Ttext=${LINK_ADDRESS} -warn-common -nopie -.if ${IDENT:M-DDDB_STRUCT} -DB_STRUCTINFO= db_structinfo.h -.else -DB_STRUCTINFO= -.endif - HOSTCC?= ${CC} HOSTED_CPPFLAGS=${CPPFLAGS:S/^-nostdinc$//} HOSTED_CFLAGS= ${CFLAGS} @@ -143,7 +137,7 @@ vers.o: ${SYSTEM_DEP:Ngap.o} ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c clean: - rm -f *bsd *bsd.gdb *.[dio] [a-z]*.s assym.* ${DB_STRUCTINFO} \ + rm -f *bsd *bsd.gdb *.[dio] [a-z]*.s assym.* \ gap.link ld.script lorder makegap.sh param.c cleandir: clean @@ -155,11 +149,6 @@ symbols.sort: ${_machdir}/${_mach}/symbols.raw depend obj: -db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.pl - ${CC} ${CFLAGS} ${CPPFLAGS} -MT $@ -gstabs -c $S/ddb/db_structinfo.c - objdump -g db_structinfo.o | perl $S/ddb/parse_structinfo.pl > $@ - rm -f db_structinfo.o - locore0.o: ${_machdir}/${_mach}/locore0.S assym.h context.o cp0access.o exception.o locore.o: assym.h lcore_access.o lcore_ddb.o lcore_float.o tlbhandler.o: assym.h @@ -172,18 +161,4 @@ newinstall: install: update-link newinstall -# pull in the dependency information -.if !empty(DB_STRUCTINFO) && !exists(${DB_STRUCTINFO}) - ${SYSTEM_OBJ}: ${DB_STRUCTINFO} -.endif -.ifnmake clean -. for o in ${SYSTEM_OBJ:Ngap.o} assym.h ${DB_STRUCTINFO} -. if exists(${o:R}.d) -. include "${o:R}.d" -. elif exists($o) - .PHONY: $o -. endif -. endfor -.endif - %RULES diff --git a/sys/arch/luna88k/conf/Makefile.luna88k b/sys/arch/luna88k/conf/Makefile.luna88k index 605191bd72c..16c3c362ad2 100644 --- a/sys/arch/luna88k/conf/Makefile.luna88k +++ b/sys/arch/luna88k/conf/Makefile.luna88k @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.luna88k,v 1.76 2017/08/12 20:26:11 mpi Exp $ +# $OpenBSD: Makefile.luna88k,v 1.77 2017/09/12 08:23:42 mpi Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -45,12 +45,6 @@ CFLAGS= ${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} AFLAGS= -D_LOCORE -x assembler-with-cpp ${CWARNFLAGS} ${CMACHFLAGS} LINKFLAGS= -T ld.script -Ttext 0x80000 -e __start -X -N --warn-common -nopie -.if ${IDENT:M-DDDB_STRUCT} -DB_STRUCTINFO= db_structinfo.h -.else -DB_STRUCTINFO= -.endif - HOSTCC?= ${CC} HOSTED_CPPFLAGS=${CPPFLAGS:S/^-nostdinc$//} HOSTED_CFLAGS= ${CFLAGS} @@ -138,7 +132,7 @@ vers.o: ${SYSTEM_DEP:Ngap.o} ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c clean: - rm -f *bsd *bsd.gdb *.[dio] [a-z]*.s assym.* ${DB_STRUCTINFO} \ + rm -f *bsd *bsd.gdb *.[dio] [a-z]*.s assym.* \ gap.link ld.script lorder makegap.sh param.c cleandir: clean @@ -146,11 +140,6 @@ cleandir: clean depend obj: -db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.pl - ${CC} ${CFLAGS} ${CPPFLAGS} -MT $@ -gstabs -c $S/ddb/db_structinfo.c - objdump -g db_structinfo.o | perl $S/ddb/parse_structinfo.pl > $@ - rm -f db_structinfo.o - locore0.o: ${_machdir}/${_mach}/locore0.S assym.h locore.o eh.o mutex.o process.o subr.o: assym.h @@ -161,18 +150,4 @@ newinstall: install: update-link newinstall -# pull in the dependency information -.if !empty(DB_STRUCTINFO) && !exists(${DB_STRUCTINFO}) - ${SYSTEM_OBJ}: ${DB_STRUCTINFO} -.endif -.ifnmake clean -. for o in ${SYSTEM_OBJ:Ngap.o} assym.h ${DB_STRUCTINFO} -. if exists(${o:R}.d) -. include "${o:R}.d" -. elif exists($o) - .PHONY: $o -. endif -. endfor -.endif - %RULES diff --git a/sys/arch/macppc/conf/Makefile.macppc b/sys/arch/macppc/conf/Makefile.macppc index 32a9da4046c..8ba6a41e8f6 100644 --- a/sys/arch/macppc/conf/Makefile.macppc +++ b/sys/arch/macppc/conf/Makefile.macppc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.macppc,v 1.90 2017/08/12 20:26:11 mpi Exp $ +# $OpenBSD: Makefile.macppc,v 1.91 2017/09/12 08:23:42 mpi Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -45,12 +45,6 @@ CFLAGS= ${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} AFLAGS= -D_LOCORE ${CMACHFLAGS} LINKFLAGS= -N -Ttext 100114 -e start --warn-common -nopie -.if ${IDENT:M-DDDB_STRUCT} -DB_STRUCTINFO= db_structinfo.h -.else -DB_STRUCTINFO= -.endif - HOSTCC?= ${CC} HOSTED_CPPFLAGS=${CPPFLAGS:S/^-nostdinc$//} HOSTED_CFLAGS= ${CFLAGS} @@ -134,7 +128,7 @@ vers.o: ${SYSTEM_DEP:Ngap.o} ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c clean: - rm -f *bsd *bsd.gdb *.[dio] [a-z]*.s assym.* ${DB_STRUCTINFO} \ + rm -f *bsd *bsd.gdb *.[dio] [a-z]*.s assym.* \ gap.link ld.script lorder makegap.sh param.c cleandir: clean @@ -142,11 +136,6 @@ cleandir: clean depend obj: -db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.pl - ${CC} ${CFLAGS} ${CPPFLAGS} -MT $@ -gstabs -c $S/ddb/db_structinfo.c - objdump -g db_structinfo.o | perl $S/ddb/parse_structinfo.pl > $@ - rm -f db_structinfo.o - locore0.o: ${_machdir}/${_mach}/locore0.S assym.h locore.o: ${_machdir}/${_mach}/locore.S assym.h mutex.o: assym.h @@ -158,18 +147,4 @@ newinstall: install: update-link newinstall -# pull in the dependency information -.if !empty(DB_STRUCTINFO) && !exists(${DB_STRUCTINFO}) - ${SYSTEM_OBJ}: ${DB_STRUCTINFO} -.endif -.ifnmake clean -. for o in ${SYSTEM_OBJ:Ngap.o} assym.h ${DB_STRUCTINFO} -. if exists(${o:R}.d) -. include "${o:R}.d" -. elif exists($o) - .PHONY: $o -. endif -. endfor -.endif - %RULES diff --git a/sys/arch/octeon/conf/Makefile.octeon b/sys/arch/octeon/conf/Makefile.octeon index 3af77c5a673..875e7111aee 100644 --- a/sys/arch/octeon/conf/Makefile.octeon +++ b/sys/arch/octeon/conf/Makefile.octeon @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.octeon,v 1.45 2017/08/19 12:52:32 visa Exp $ +# $OpenBSD: Makefile.octeon,v 1.46 2017/09/12 08:23:42 mpi Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -50,12 +50,6 @@ CFLAGS= ${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} AFLAGS= -D_LOCORE -x assembler-with-cpp ${CWARNFLAGS} ${CMACHFLAGS} LINKFLAGS= -e start -T ld.script -Ttext=${LINK_ADDRESS} --warn-common -nopie -.if ${IDENT:M-DDDB_STRUCT} -DB_STRUCTINFO= db_structinfo.h -.else -DB_STRUCTINFO= -.endif - HOSTCC?= ${CC} HOSTED_CPPFLAGS=${CPPFLAGS:S/^-nostdinc$//} HOSTED_CFLAGS= ${CFLAGS} @@ -143,7 +137,7 @@ vers.o: ${SYSTEM_DEP:Ngap.o} ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c clean: - rm -f *bsd *bsd.gdb *.[dio] [a-z]*.s assym.* ${DB_STRUCTINFO} \ + rm -f *bsd *bsd.gdb *.[dio] [a-z]*.s assym.* \ gap.link ld.script lorder makegap.sh param.c cleandir: clean @@ -155,11 +149,6 @@ symbols.sort: ${_machdir}/${_mach}/symbols.raw depend obj: -db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.pl - ${CC} ${CFLAGS} ${CPPFLAGS} -MT $@ -gstabs -c $S/ddb/db_structinfo.c - objdump -g db_structinfo.o | perl $S/ddb/parse_structinfo.pl > $@ - rm -f db_structinfo.o - locore0.o: ${_machdir}/${_mach}/locore0.S assym.h context.o cp0access.o exception.o locore.o: assym.h lcore_access.o lcore_ddb.o lcore_float.o tlbhandler.o: assym.h @@ -172,18 +161,4 @@ newinstall: install: update-link newinstall -# pull in the dependency information -.if !empty(DB_STRUCTINFO) && !exists(${DB_STRUCTINFO}) - ${SYSTEM_OBJ}: ${DB_STRUCTINFO} -.endif -.ifnmake clean -. for o in ${SYSTEM_OBJ:Ngap.o} assym.h ${DB_STRUCTINFO} -. if exists(${o:R}.d) -. include "${o:R}.d" -. elif exists($o) - .PHONY: $o -. endif -. endfor -.endif - %RULES diff --git a/sys/arch/sgi/conf/Makefile.sgi b/sys/arch/sgi/conf/Makefile.sgi index b510a543a55..fb462dc609d 100644 --- a/sys/arch/sgi/conf/Makefile.sgi +++ b/sys/arch/sgi/conf/Makefile.sgi @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.sgi,v 1.90 2017/08/12 20:26:11 mpi Exp $ +# $OpenBSD: Makefile.sgi,v 1.91 2017/09/12 08:23:42 mpi Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -50,12 +50,6 @@ CFLAGS= ${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} AFLAGS= -D_LOCORE -x assembler-with-cpp ${CWARNFLAGS} ${CMACHFLAGS} LINKFLAGS= -e start -T ld.script -Ttext=${LINK_ADDRESS} --warn-common -nopie -.if ${IDENT:M-DDDB_STRUCT} -DB_STRUCTINFO= db_structinfo.h -.else -DB_STRUCTINFO= -.endif - HOSTCC?= ${CC} HOSTED_CPPFLAGS=${CPPFLAGS:S/^-nostdinc$//} HOSTED_CFLAGS= ${CFLAGS} @@ -143,7 +137,7 @@ vers.o: ${SYSTEM_DEP:Ngap.o} ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c clean: - rm -f *bsd *bsd.gdb *.[dio] [a-z]*.s assym.* ${DB_STRUCTINFO} \ + rm -f *bsd *bsd.gdb *.[dio] [a-z]*.s assym.* \ gap.link ld.script lorder makegap.sh param.c cleandir: clean @@ -155,11 +149,6 @@ symbols.sort: ${_machdir}/${_mach}/symbols.raw depend obj: -db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.pl - ${CC} ${CFLAGS} ${CPPFLAGS} -MT $@ -gstabs -c $S/ddb/db_structinfo.c - objdump -g db_structinfo.o | perl $S/ddb/parse_structinfo.pl > $@ - rm -f db_structinfo.o - locore0.o: ${_machdir}/${_mach}/locore0.S assym.h context.o cp0access.o exception.o exception_tfp.o: assym.h lcore_access.o lcore_ddb.o lcore_float.o locore.o: assym.h @@ -173,18 +162,4 @@ newinstall: install: update-link newinstall -# pull in the dependency information -.if !empty(DB_STRUCTINFO) && !exists(${DB_STRUCTINFO}) - ${SYSTEM_OBJ}: ${DB_STRUCTINFO} -.endif -.ifnmake clean -. for o in ${SYSTEM_OBJ:Ngap.o} assym.h ${DB_STRUCTINFO} -. if exists(${o:R}.d) -. include "${o:R}.d" -. elif exists($o) - .PHONY: $o -. endif -. endfor -.endif - %RULES diff --git a/sys/arch/socppc/conf/Makefile.socppc b/sys/arch/socppc/conf/Makefile.socppc index cb1bfa93f7d..9e71a2a91c3 100644 --- a/sys/arch/socppc/conf/Makefile.socppc +++ b/sys/arch/socppc/conf/Makefile.socppc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.socppc,v 1.56 2017/08/12 20:26:11 mpi Exp $ +# $OpenBSD: Makefile.socppc,v 1.57 2017/09/12 08:23:42 mpi Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -41,12 +41,6 @@ CFLAGS= ${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} AFLAGS= -D_LOCORE ${CMACHFLAGS} LINKFLAGS= -N -Ttext 200000 -e start --warn-common -nopie -.if ${IDENT:M-DDDB_STRUCT} -DB_STRUCTINFO= db_structinfo.h -.else -DB_STRUCTINFO= -.endif - HOSTCC?= ${CC} HOSTED_CPPFLAGS=${CPPFLAGS:S/^-nostdinc$//} HOSTED_CFLAGS= ${CFLAGS} @@ -118,18 +112,13 @@ vers.o: ${SYSTEM_DEP:Ngap.o} ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c clean: - rm -f *bsd *bsd.gdb *.[dio] [a-z]*.s assym.* ${DB_STRUCTINFO} param.c + rm -f *bsd *bsd.gdb *.[dio] [a-z]*.s assym.* param.c cleandir: clean rm -f Makefile *.h ioconf.c options machine ${_mach} vers.c depend obj: -db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.pl - ${CC} ${CFLAGS} ${CPPFLAGS} -MT $@ -gstabs -c $S/ddb/db_structinfo.c - objdump -g db_structinfo.o | perl $S/ddb/parse_structinfo.pl > $@ - rm -f db_structinfo.o - locore.o: ${_machdir}/${_mach}/locore.S assym.h mutex.o: assym.h @@ -144,18 +133,4 @@ install-kernel-${MACHINE_NAME}: mv /nbsd /bsd .endif -# pull in the dependency information -.if !empty(DB_STRUCTINFO) && !exists(${DB_STRUCTINFO}) - ${SYSTEM_OBJ}: ${DB_STRUCTINFO} -.endif -.ifnmake clean -. for o in ${SYSTEM_OBJ:Ngap.o} assym.h ${DB_STRUCTINFO} -. if exists(${o:R}.d) -. include "${o:R}.d" -. elif exists($o) - .PHONY: $o -. endif -. endfor -.endif - %RULES diff --git a/sys/arch/sparc64/conf/Makefile.sparc64 b/sys/arch/sparc64/conf/Makefile.sparc64 index fddcc78003a..f889bbc42b3 100644 --- a/sys/arch/sparc64/conf/Makefile.sparc64 +++ b/sys/arch/sparc64/conf/Makefile.sparc64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.sparc64,v 1.93 2017/08/12 20:26:11 mpi Exp $ +# $OpenBSD: Makefile.sparc64,v 1.94 2017/09/12 08:23:42 mpi Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -43,12 +43,6 @@ CFLAGS= ${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} AFLAGS= -D_LOCORE -x assembler-with-cpp ${CWARNFLAGS} ${CMACHFLAGS} LINKFLAGS= -n -T ld.script --warn-common -nopie -.if ${IDENT:M-DDDB_STRUCT} -DB_STRUCTINFO= db_structinfo.h -.else -DB_STRUCTINFO= -.endif - HOSTCC?= ${CC} HOSTED_CPPFLAGS=${CPPFLAGS:S/^-nostdinc$//} HOSTED_CFLAGS= ${CFLAGS} @@ -132,7 +126,7 @@ vers.o: ${SYSTEM_DEP:Ngap.o} ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c clean: - rm -f *bsd *bsd.gdb *.[dio] [a-z]*.s assym.* ${DB_STRUCTINFO} \ + rm -f *bsd *bsd.gdb *.[dio] [a-z]*.s assym.* \ gap.link ld.script lorder makegap.sh param.c cleandir: clean @@ -140,11 +134,6 @@ cleandir: clean depend obj: -db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.pl - ${CC} ${CFLAGS} ${CPPFLAGS} -MT $@ -gstabs -c $S/ddb/db_structinfo.c - objdump -g db_structinfo.o | perl $S/ddb/parse_structinfo.pl > $@ - rm -f db_structinfo.o - locore.o: ${_machdir}/${_mach}/locore.s assym.h hvcall.o in_cksum.o mutex.o: assym.h @@ -155,18 +144,4 @@ newinstall: install: update-link newinstall -# pull in the dependency information -.if !empty(DB_STRUCTINFO) && !exists(${DB_STRUCTINFO}) - ${SYSTEM_OBJ}: ${DB_STRUCTINFO} -.endif -.ifnmake clean -. for o in ${SYSTEM_OBJ:Ngap.o} assym.h ${DB_STRUCTINFO} -. if exists(${o:R}.d) -. include "${o:R}.d" -. elif exists($o) - .PHONY: $o -. endif -. endfor -.endif - %RULES |