diff options
27 files changed, 130 insertions, 118 deletions
diff --git a/sys/arch/alpha/conf/Makefile.alpha b/sys/arch/alpha/conf/Makefile.alpha index 3fcce27eeb2..680b4db2ab6 100644 --- a/sys/arch/alpha/conf/Makefile.alpha +++ b/sys/arch/alpha/conf/Makefile.alpha @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.alpha,v 1.53 2010/04/27 04:31:45 deraadt Exp $ +# $OpenBSD: Makefile.alpha,v 1.54 2010/04/27 05:05:20 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -148,11 +148,11 @@ links: sed 's,../.*/\(.*.o\),rm -f \1; ln -s ../GENERIC/\1 \1,' > makelinks sh makelinks && rm -f dontlink -SRCS= ${_machdir}/alpha/locore.s param.c ioconf.c ${CFILES} ${SFILES} +SRCS= ${_machdir}/${_mach}/locore.s param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend -.depend: ${SRCS} assym.h param.c ${_machdir}/alpha/cpuconf.c ${DB_STRUCTINFO} - ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/alpha/locore.s - ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${_machdir}/alpha/cpuconf.c \ +.depend: ${SRCS} assym.h param.c ${_machdir}/${_mach}/cpuconf.c ${DB_STRUCTINFO} + ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.s + ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/cpuconf.c \ param.c ioconf.c ${CFILES} ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ @@ -166,7 +166,7 @@ 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}/alpha/locore.s assym.h +locore.o: ${_machdir}/${_mach}/locore.s assym.h ${NORMAL_S} # The install target can be redefined by putting a diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64 index ddefa3e93a7..0e2b7a49ebd 100644 --- a/sys/arch/amd64/conf/Makefile.amd64 +++ b/sys/arch/amd64/conf/Makefile.amd64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.amd64,v 1.28 2010/04/27 04:31:45 deraadt Exp $ +# $OpenBSD: Makefile.amd64,v 1.29 2010/04/27 05:05:21 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -157,11 +157,11 @@ links: sed 's,.*/\(.*.o\),rm -f \1; ln -s ../GENERIC/\1 \1,' > makelinks sh makelinks && rm -f dontlink makelinks -AFILES= ${_machdir}/amd64/locore.S ${_machdir}/amd64/vector.S ${_machdir}/amd64/copy.S \ - ${_machdir}/amd64/spl.S +AFILES= ${_machdir}/${_mach}/locore.S ${_machdir}/${_mach}/vector.S ${_machdir}/${_mach}/copy.S \ + ${_machdir}/${_mach}/spl.S SRCS= param.c ioconf.c ${AFILES} ${CFILES} ${SFILES} depend:: .depend -.depend: ${SRCS} assym.h param.c ${APMINC} ${DB_STRUCTINFO} +.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES} ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} @@ -176,16 +176,16 @@ 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}/amd64/locore.S assym.h +locore.o: ${_machdir}/${_mach}/locore.S assym.h ${NORMAL_S} -vector.o: ${_machdir}/amd64/vector.S assym.h +vector.o: ${_machdir}/${_mach}/vector.S assym.h ${NORMAL_S} -copy.o: ${_machdir}/amd64/copy.S assym.h +copy.o: ${_machdir}/${_mach}/copy.S assym.h ${NORMAL_S} -spl.o: ${_machdir}/amd64/spl.S assym.h +spl.o: ${_machdir}/${_mach}/spl.S assym.h ${NORMAL_S} # The install target can be redefined by putting a diff --git a/sys/arch/armish/conf/Makefile.armish b/sys/arch/armish/conf/Makefile.armish index c7248765c17..50cfdce2cae 100644 --- a/sys/arch/armish/conf/Makefile.armish +++ b/sys/arch/armish/conf/Makefile.armish @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.armish,v 1.18 2010/04/27 04:31:45 deraadt Exp $ +# $OpenBSD: Makefile.armish,v 1.19 2010/04/27 05:05:21 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -171,7 +171,7 @@ links: SRCS= ${_archdir}/arm/locore.S \ param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend -.depend: ${SRCS} assym.h param.c ${APMINC} ${DB_STRUCTINFO} +.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_archdir}/arm/locore.S ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} .if ${SFILES} != "" diff --git a/sys/arch/aviion/conf/Makefile.aviion b/sys/arch/aviion/conf/Makefile.aviion index bbc388b62d1..3515e77e623 100644 --- a/sys/arch/aviion/conf/Makefile.aviion +++ b/sys/arch/aviion/conf/Makefile.aviion @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.aviion,v 1.16 2010/04/27 04:31:46 deraadt Exp $ +# $OpenBSD: Makefile.aviion,v 1.17 2010/04/27 05:05:21 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -175,7 +175,7 @@ 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}/aviion/locore.S assym.h +locore.o: ${_machdir}/${_mach}/locore.S assym.h ${NORMAL_S} # The install target can be redefined by putting a diff --git a/sys/arch/beagle/conf/Makefile.beagle b/sys/arch/beagle/conf/Makefile.beagle index 371089140ae..dfd7da8cf2e 100644 --- a/sys/arch/beagle/conf/Makefile.beagle +++ b/sys/arch/beagle/conf/Makefile.beagle @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.beagle,v 1.13 2010/04/27 04:31:46 deraadt Exp $ +# $OpenBSD: Makefile.beagle,v 1.14 2010/04/27 05:05:21 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -168,7 +168,7 @@ links: SRCS= ${_archdir}/arm/locore.S \ param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend -.depend: ${SRCS} assym.h param.c ${APMINC} ${DB_STRUCTINFO} +.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_archdir}/arm/locore.S ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} .if ${SFILES} != "" diff --git a/sys/arch/gumstix/conf/Makefile.gumstix b/sys/arch/gumstix/conf/Makefile.gumstix index f8423f39651..f3f248ee96b 100644 --- a/sys/arch/gumstix/conf/Makefile.gumstix +++ b/sys/arch/gumstix/conf/Makefile.gumstix @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.gumstix,v 1.11 2010/04/27 04:31:46 deraadt Exp $ +# $OpenBSD: Makefile.gumstix,v 1.12 2010/04/27 05:05:21 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -169,7 +169,7 @@ links: SRCS= ${_archdir}/arm/locore.S \ param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend -.depend: ${SRCS} assym.h param.c ${APMINC} ${DB_STRUCTINFO} +.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_archdir}/arm/locore.S ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} .if ${SFILES} != "" @@ -186,13 +186,12 @@ 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 -${_mach}_start.o: ${_machdir}/gumstix/${_mach}_start.S assym.h +${_mach}_start.o: ${_machdir}/${_mach}/${_mach}_start.S assym.h ${NORMAL_S} locore.o: ${_archdir}/arm/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/hp300/conf/Makefile.hp300 b/sys/arch/hp300/conf/Makefile.hp300 index 7e648f0bf65..70f4c75c627 100644 --- a/sys/arch/hp300/conf/Makefile.hp300 +++ b/sys/arch/hp300/conf/Makefile.hp300 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.hp300,v 1.53 2010/04/27 04:31:46 deraadt Exp $ +# $OpenBSD: Makefile.hp300,v 1.54 2010/04/27 05:05:21 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -185,11 +185,11 @@ links: sed 's,../.*/\(.*.o\),rm -f \1; ln -s ../GENERIC/\1 \1,' > makelinks sh makelinks && rm -f dontlink -SRCS= ${_machdir}/hp300/locore.s \ +SRCS= ${_machdir}/${_mach}/locore.s \ param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} - ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/hp300/locore.s + ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.s ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} -if test -n "${SFILES}"; then \ ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}; \ @@ -205,7 +205,7 @@ 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}/hp300/locore.s assym.h +locore.o: ${_machdir}/${_mach}/locore.s assym.h ${NORMAL_S} # The install target can be redefined by putting a diff --git a/sys/arch/hppa/conf/Makefile.hppa b/sys/arch/hppa/conf/Makefile.hppa index 9edf212ce71..e97cea24774 100644 --- a/sys/arch/hppa/conf/Makefile.hppa +++ b/sys/arch/hppa/conf/Makefile.hppa @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.hppa,v 1.43 2010/04/27 04:31:46 deraadt Exp $ +# $OpenBSD: Makefile.hppa,v 1.44 2010/04/27 05:05:21 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -82,9 +82,6 @@ HOSTCC?= ${CC} HOSTED_CPPFLAGS=${CPPFLAGS:S/^-nostdinc$//} HOSTED_CFLAGS= ${CFLAGS} -# this line must be there because libkern needs assym.h generated early -depend:: .NOTMAIN .depend - # compile rules: rules are named ${TYPE}_${SUFFIX} where TYPE is NORMAL or # HOSTED}, and SUFFIX is the file suffix, capitalized (e.g. C for a .c file). @@ -169,10 +166,11 @@ links: sed 's,../.*/\(.*.o\),rm -f \1; ln -s ../GENERIC/\1 \1,' > makelinks sh makelinks && rm -f dontlink -SRCS= ${_machdir}/hppa/locore.S \ +SRCS= ${_machdir}/${_mach}/locore.S \ param.c ioconf.c ${CFILES} ${SFILES} +depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} - ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/hppa/locore.S + ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.S ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} -if test -n "${SFILES}"; then \ ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}; \ @@ -188,7 +186,7 @@ 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}/hppa/locore.S assym.h +locore.o: ${_machdir}/${_mach}/locore.S assym.h ${NORMAL_S} fpemu.o: assym.h diff --git a/sys/arch/hppa64/conf/Makefile.hppa64 b/sys/arch/hppa64/conf/Makefile.hppa64 index 01bc9847a89..59b60dcb87c 100644 --- a/sys/arch/hppa64/conf/Makefile.hppa64 +++ b/sys/arch/hppa64/conf/Makefile.hppa64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.hppa64,v 1.17 2010/04/27 04:31:46 deraadt Exp $ +# $OpenBSD: Makefile.hppa64,v 1.18 2010/04/27 05:05:21 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -63,9 +63,6 @@ HOSTCC?= ${CC} HOSTED_CPPFLAGS=${CPPFLAGS:S/^-nostdinc$//} HOSTED_CFLAGS= ${CFLAGS} -# this line must be there because libkern needs assym.h generated early -depend:: .NOTMAIN .depend - # compile rules: rules are named ${TYPE}_${SUFFIX} where TYPE is NORMAL or # HOSTED}, and SUFFIX is the file suffix, capitalized (e.g. C for a .c file). @@ -149,10 +146,11 @@ links: sed 's,../.*/\(.*.o\),rm -f \1; ln -s ../GENERIC/\1 \1,' > makelinks sh makelinks && rm -f dontlink -SRCS= ${_machdir}/hppa64/locore.S \ +SRCS= ${_machdir}/${_mach}/locore.S \ param.c ioconf.c ${CFILES} ${SFILES} +depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} - ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/hppa64/locore.S + ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.S ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} -if test -n "${SFILES}"; then \ ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}; \ @@ -168,7 +166,7 @@ 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}/hppa64/locore.S assym.h +locore.o: ${_machdir}/${_mach}/locore.S assym.h ${NORMAL_S} fpemu.o: assym.h diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386 index 9585ca813b9..e09de721730 100644 --- a/sys/arch/i386/conf/Makefile.i386 +++ b/sys/arch/i386/conf/Makefile.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.i386,v 1.60 2010/04/27 04:31:46 deraadt Exp $ +# $OpenBSD: Makefile.i386,v 1.61 2010/04/27 05:05:21 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -161,11 +161,11 @@ links: sed 's,.*/\(.*.o\),rm -f \1; ln -s ../GENERIC/\1 \1,' > makelinks sh makelinks && rm -f dontlink makelinks -SRCS= ${_machdir}/i386/locore.s \ +SRCS= ${_machdir}/${_mach}/locore.s \ param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend -.depend: ${SRCS} assym.h param.c ${APMINC} ${DB_STRUCTINFO} - ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/i386/locore.s +.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} + ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.s ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ @@ -179,8 +179,7 @@ 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}/i386/locore.s assym.h +locore.o: ${_machdir}/${_mach}/locore.s assym.h ${NORMAL_S} # The install target can be redefined by putting a diff --git a/sys/arch/landisk/conf/Makefile.landisk b/sys/arch/landisk/conf/Makefile.landisk index fe79d925cf0..4711ad8c171 100644 --- a/sys/arch/landisk/conf/Makefile.landisk +++ b/sys/arch/landisk/conf/Makefile.landisk @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.landisk,v 1.18 2010/04/27 04:31:46 deraadt Exp $ +# $OpenBSD: Makefile.landisk,v 1.19 2010/04/27 05:05:21 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -154,11 +154,11 @@ links: sed 's,../.*/\(.*.o\),rm -f \1; ln -s ../GENERIC/\1 \1,' > makelinks sh makelinks && rm -f dontlink -SRCS= ${_machdir}/landisk/locore.S \ +SRCS= ${_machdir}/${_mach}/locore.S \ param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} - ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/landisk/locore.S + ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.S ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} .if ${SFILES} != "" ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} @@ -174,7 +174,7 @@ 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}/landisk/locore.S assym.h +locore.o: ${_machdir}/${_mach}/locore.S assym.h ${NORMAL_S} # The install target can be redefined by putting a diff --git a/sys/arch/loongson/conf/Makefile.loongson b/sys/arch/loongson/conf/Makefile.loongson index cc175459abc..bde39b92125 100644 --- a/sys/arch/loongson/conf/Makefile.loongson +++ b/sys/arch/loongson/conf/Makefile.loongson @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.loongson,v 1.9 2010/04/27 04:31:47 deraadt Exp $ +# $OpenBSD: Makefile.loongson,v 1.10 2010/04/27 05:05:21 deraadt Exp $ # This makefile is constructed from a machine description: # config ``machineid'' @@ -61,6 +61,12 @@ CFLAGS= ${DEBUG} ${CDIAGFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} AFLAGS= -x assembler-with-cpp -D_LOCORE ${CMACHFLAGS} STRIPFLAGS= -g -X -x +.if ${IDENT:M-DDDB_STRUCT} +DB_STRUCTINFO= db_structinfo.h +.else +DB_STRUCTINFO= +.endif + NORMAL_C_NOP= ${CC} ${CFLAGS} ${CPPFLAGS} -c $< NORMAL_C= ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $< NORMAL_C_C= ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $< @@ -104,17 +110,17 @@ SYSTEM_LD_TAIL+=; \ clean:: rm -f eddep bsd bsd.gdb bsd.ecoff tags *.o locore.i [a-z]*.s \ - Errs errs linterrs makelinks + Errs errs linterrs makelinks assym.h ${DB_STRUCTINFO} lint: /tmp param.c @lint -hbxn -DGENERIC -Dvolatile= ${COPTS} ${PARAM} -UKGDB \ ${CFILES} ioconf.c param.c -symbols.sort: ${_machdir}/loongson/symbols.raw - grep -v '^#' ${_machdir}/loongson/symbols.raw \ +symbols.sort: ${_machdir}/${_mach}/symbols.raw + grep -v '^#' ${_machdir}/${_mach}/symbols.raw \ | sed 's/^ //' | sort -u > symbols.sort -locore.o: ${_machdir}/loongson/locore.S assym.h +locore.o: ${_machdir}/${_mach}/locore.S assym.h ${NORMAL_S} assym.h: $S/kern/genassym.sh Makefile \ @@ -152,11 +158,11 @@ vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c -SRCS= ${_machdir}/loongson/locore.S \ +SRCS= ${_machdir}/${_mach}/locore.S \ param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend -.depend: ${SRCS} assym.h param.c - ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/loongson/locore.S +.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} + ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.S ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ @@ -165,6 +171,11 @@ depend:: .depend < assym.dep >> .depend @rm -f assym.dep +db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk + ${CC} ${CFLAGS} ${CPPFLAGS} -gstabs -c $S/ddb/db_structinfo.c + objdump -g db_structinfo.o | awk -f $S/ddb/parse_structinfo.awk > $@ + rm -f db_structinfo.o + # 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 f89486fcb42..6aeb21ac95d 100644 --- a/sys/arch/luna88k/conf/Makefile.luna88k +++ b/sys/arch/luna88k/conf/Makefile.luna88k @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.luna88k,v 1.22 2010/04/27 04:31:47 deraadt Exp $ +# $OpenBSD: Makefile.luna88k,v 1.23 2010/04/27 05:05:21 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -171,7 +171,7 @@ 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}/luna88k/locore.S assym.h +locore.o: ${_machdir}/${_mach}/locore.S assym.h ${NORMAL_S} # The install target can be redefined by putting a diff --git a/sys/arch/mac68k/conf/Makefile.mac68k b/sys/arch/mac68k/conf/Makefile.mac68k index 5356df224d8..857d8183185 100644 --- a/sys/arch/mac68k/conf/Makefile.mac68k +++ b/sys/arch/mac68k/conf/Makefile.mac68k @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.mac68k,v 1.50 2010/04/27 04:31:47 deraadt Exp $ +# $OpenBSD: Makefile.mac68k,v 1.51 2010/04/27 05:05:21 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -156,11 +156,11 @@ links: sed 's,../.*/\(.*.o\),rm -f \1; ln -s ../GENERIC/\1 \1,' > makelinks sh makelinks && rm -f dontlink -SRCS= ${_machdir}/mac68k/locore.s \ +SRCS= ${_machdir}/${_mach}/locore.s \ param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} - ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/mac68k/locore.s + ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.s ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} -if test -n "${SFILES}"; then \ @@ -177,7 +177,7 @@ 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}/mac68k/locore.s assym.h +locore.o: ${_machdir}/${_mach}/locore.s assym.h ${NORMAL_S} # The install target can be redefined by putting a diff --git a/sys/arch/macppc/conf/Makefile.macppc b/sys/arch/macppc/conf/Makefile.macppc index 1e495eeb8a7..658b99c727d 100644 --- a/sys/arch/macppc/conf/Makefile.macppc +++ b/sys/arch/macppc/conf/Makefile.macppc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.macppc,v 1.39 2010/04/27 04:31:47 deraadt Exp $ +# $OpenBSD: Makefile.macppc,v 1.40 2010/04/27 05:05:21 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -154,11 +154,11 @@ links: sed 's,../.*/\(.*.o\),rm -f \1; ln -s ../GENERIC/\1 \1,' > makelinks sh makelinks && rm -f dontlink -SRCS= ${_machdir}/macppc/locore.S \ +SRCS= ${_machdir}/${_mach}/locore.S \ param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} - ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/macppc/locore.S + ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.S ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} .if ${SFILES} != "" ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} @@ -174,7 +174,7 @@ 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}/macppc/locore.S assym.h +locore.o: ${_machdir}/${_mach}/locore.S assym.h ${NORMAL_S} # The install target can be redefined by putting a diff --git a/sys/arch/moko/conf/Makefile.moko b/sys/arch/moko/conf/Makefile.moko index 80de5c42290..925eaa91562 100644 --- a/sys/arch/moko/conf/Makefile.moko +++ b/sys/arch/moko/conf/Makefile.moko @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.moko,v 1.11 2010/04/27 04:31:47 deraadt Exp $ +# $OpenBSD: Makefile.moko,v 1.12 2010/04/27 05:05:21 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -169,7 +169,7 @@ links: SRCS= ${_archdir}/arm/locore.S \ param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend -.depend: ${SRCS} assym.h param.c ${APMINC} ${DB_STRUCTINFO} +.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_archdir}/arm/locore.S ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} .if ${SFILES} != "" diff --git a/sys/arch/mvme68k/conf/Makefile.mvme68k b/sys/arch/mvme68k/conf/Makefile.mvme68k index 9e1cc288202..e0ad150896e 100644 --- a/sys/arch/mvme68k/conf/Makefile.mvme68k +++ b/sys/arch/mvme68k/conf/Makefile.mvme68k @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.mvme68k,v 1.42 2010/04/27 04:31:47 deraadt Exp $ +# $OpenBSD: Makefile.mvme68k,v 1.43 2010/04/27 05:05:21 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -154,11 +154,11 @@ links: sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks sh makelinks && rm -f dontlink -SRCS= ${_machdir}/mvme68k/locore.s \ +SRCS= ${_machdir}/${_mach}/locore.s \ param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} - ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/mvme68k/locore.s + ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.s ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ @@ -172,7 +172,7 @@ 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}/mvme68k/locore.s assym.h +locore.o: ${_machdir}/${_mach}/locore.s assym.h ${NORMAL_S} # The install target can be redefined by putting a diff --git a/sys/arch/mvme88k/conf/Makefile.mvme88k b/sys/arch/mvme88k/conf/Makefile.mvme88k index f5a686caa74..29eb2afd8f3 100644 --- a/sys/arch/mvme88k/conf/Makefile.mvme88k +++ b/sys/arch/mvme88k/conf/Makefile.mvme88k @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.mvme88k,v 1.53 2010/04/27 04:31:47 deraadt Exp $ +# $OpenBSD: Makefile.mvme88k,v 1.54 2010/04/27 05:05:21 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -174,7 +174,7 @@ 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}/mvme88k/locore.S assym.h +locore.o: ${_machdir}/${_mach}/locore.S assym.h ${NORMAL_S} # The install target can be redefined by putting a diff --git a/sys/arch/mvmeppc/conf/Makefile.mvmeppc b/sys/arch/mvmeppc/conf/Makefile.mvmeppc index 64b23b65a63..1fad38a7acc 100644 --- a/sys/arch/mvmeppc/conf/Makefile.mvmeppc +++ b/sys/arch/mvmeppc/conf/Makefile.mvmeppc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.mvmeppc,v 1.37 2010/04/27 04:31:47 deraadt Exp $ +# $OpenBSD: Makefile.mvmeppc,v 1.38 2010/04/27 05:05:21 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -155,11 +155,11 @@ links: sed 's,../.*/\(.*.o\),rm -f \1; ln -s ../GENERIC/\1 \1,' > makelinks sh makelinks && rm -f dontlink -SRCS= ${_machdir}/mvmeppc/locore.S \ +SRCS= ${_machdir}/${_mach}/locore.S \ param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} - ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/mvmeppc/locore.S + ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.S ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} .if ${SFILES} != "" ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} @@ -175,7 +175,7 @@ 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}/mvmeppc/locore.S assym.h +locore.o: ${_machdir}/${_mach}/locore.S assym.h ${NORMAL_S} # The install target can be redefined by putting a diff --git a/sys/arch/palm/conf/Makefile.palm b/sys/arch/palm/conf/Makefile.palm index 6afaacddd99..6d2ff19de46 100644 --- a/sys/arch/palm/conf/Makefile.palm +++ b/sys/arch/palm/conf/Makefile.palm @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.palm,v 1.8 2010/04/27 04:31:47 deraadt Exp $ +# $OpenBSD: Makefile.palm,v 1.9 2010/04/27 05:05:21 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -57,6 +57,12 @@ LINKFLAGS= -T ldscript LINKFLAGS+= --warn-common STRIPFLAGS= -g -X -x +.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 +148,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 + [Ee]rrs linterrs makelinks assym.h ${DB_STRUCTINFO} lint: @lint -hbxncez -Dvolatile= ${CPPFLAGS} ${PARAM} -UKGDB \ @@ -163,7 +169,7 @@ links: SRCS= ${_archdir}/arm/locore.S \ param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend -.depend: ${SRCS} assym.h param.c ${APMINC} +.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_archdir}/arm/locore.S ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} .if ${SFILES} != "" @@ -175,6 +181,10 @@ depend:: .depend < assym.dep >> .depend @rm -f assym.dep +db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk + ${CC} ${CFLAGS} ${CPPFLAGS} -gstabs -c $S/ddb/db_structinfo.c + objdump -g db_structinfo.o | awk -f $S/ddb/parse_structinfo.awk > $@ + rm -f db_structinfo.o ${_mach}_start.o: ${_machdir}/${_mach}/${_mach}_start.S assym.h ${NORMAL_S} diff --git a/sys/arch/sgi/conf/Makefile.sgi b/sys/arch/sgi/conf/Makefile.sgi index c088165c4ce..4489239ccbe 100644 --- a/sys/arch/sgi/conf/Makefile.sgi +++ b/sys/arch/sgi/conf/Makefile.sgi @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.sgi,v 1.32 2010/04/27 04:31:47 deraadt Exp $ +# $OpenBSD: Makefile.sgi,v 1.33 2010/04/27 05:05:21 deraadt Exp $ # Makefile for OpenBSD # @@ -118,11 +118,11 @@ lint: /tmp param.c @lint -hbxn -DGENERIC -Dvolatile= ${COPTS} ${PARAM} -UKGDB \ ${CFILES} ioconf.c param.c -symbols.sort: ${_machdir}/sgi/symbols.raw - grep -v '^#' ${_machdir}/sgi/symbols.raw \ +symbols.sort: ${_machdir}/${_mach}/symbols.raw + grep -v '^#' ${_machdir}/${_mach}/symbols.raw \ | sed 's/^ //' | sort -u > symbols.sort -locore.o: ${_machdir}/sgi/locore.S assym.h +locore.o: ${_machdir}/${_mach}/locore.S assym.h ${NORMAL_S} assym.h: $S/kern/genassym.sh Makefile \ @@ -160,11 +160,11 @@ vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c -SRCS= ${_machdir}/sgi/locore.S \ +SRCS= ${_machdir}/${_mach}/locore.S \ param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} - ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/sgi/locore.S + ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.S ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ diff --git a/sys/arch/socppc/conf/Makefile.socppc b/sys/arch/socppc/conf/Makefile.socppc index 8285ac80e5e..19ebf71c974 100644 --- a/sys/arch/socppc/conf/Makefile.socppc +++ b/sys/arch/socppc/conf/Makefile.socppc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.socppc,v 1.11 2010/04/27 04:31:47 deraadt Exp $ +# $OpenBSD: Makefile.socppc,v 1.12 2010/04/27 05:05:21 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -155,11 +155,11 @@ links: sed 's,../.*/\(.*.o\),rm -f \1; ln -s ../GENERIC/\1 \1,' > makelinks sh makelinks && rm -f dontlink -SRCS= ${_machdir}/socppc/locore.S \ +SRCS= ${_machdir}/${_mach}/locore.S \ param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} - ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/socppc/locore.S + ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.S ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} .if ${SFILES} != "" ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} @@ -175,7 +175,7 @@ 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}/socppc/locore.S assym.h +locore.o: ${_machdir}/${_mach}/locore.S assym.h ${NORMAL_S} # The install target can be redefined by putting a diff --git a/sys/arch/solbourne/conf/Makefile.solbourne b/sys/arch/solbourne/conf/Makefile.solbourne index 04a9552b52c..3b4567d515d 100644 --- a/sys/arch/solbourne/conf/Makefile.solbourne +++ b/sys/arch/solbourne/conf/Makefile.solbourne @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.solbourne,v 1.17 2010/04/27 04:31:47 deraadt Exp $ +# $OpenBSD: Makefile.solbourne,v 1.18 2010/04/27 05:05:21 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -157,11 +157,11 @@ links: sed 's,../.*/\(.*.o\),rm -f \1; ln -s ../GENERIC/\1 \1,' > makelinks sh makelinks && rm -f dontlink -SRCS= ${_machdir}/solbourne/locore.s \ +SRCS= ${_machdir}/${_mach}/locore.s \ param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} - ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/solbourne/locore.s + ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.s ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} .if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} @@ -177,8 +177,7 @@ 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}/solbourne/locore.s assym.h +locore.o: ${_machdir}/${_mach}/locore.s assym.h ${NORMAL_S} # The install target can be redefined by putting a diff --git a/sys/arch/sparc/conf/Makefile.sparc b/sys/arch/sparc/conf/Makefile.sparc index 1a72bad24cf..5a3491389e8 100644 --- a/sys/arch/sparc/conf/Makefile.sparc +++ b/sys/arch/sparc/conf/Makefile.sparc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.sparc,v 1.54 2010/04/27 04:31:48 deraadt Exp $ +# $OpenBSD: Makefile.sparc,v 1.55 2010/04/27 05:05:21 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -162,11 +162,11 @@ links: sed 's,../.*/\(.*.o\),rm -f \1; ln -s ../GENERIC/\1 \1,' > makelinks sh makelinks && rm -f dontlink -SRCS= ${_machdir}/sparc/locore.s \ +SRCS= ${_machdir}/${_mach}/locore.s \ param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} - ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/sparc/locore.s + ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.s ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} .if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} @@ -182,8 +182,7 @@ 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}/sparc/locore.s assym.h +locore.o: ${_machdir}/${_mach}/locore.s assym.h ${NORMAL_S} # The install target can be redefined by putting a diff --git a/sys/arch/sparc64/conf/Makefile.sparc64 b/sys/arch/sparc64/conf/Makefile.sparc64 index a9ab4ad7c2a..1e210646122 100644 --- a/sys/arch/sparc64/conf/Makefile.sparc64 +++ b/sys/arch/sparc64/conf/Makefile.sparc64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.sparc64,v 1.39 2010/04/27 04:31:48 deraadt Exp $ +# $OpenBSD: Makefile.sparc64,v 1.40 2010/04/27 05:05:22 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -155,11 +155,11 @@ links: sed 's,../.*/\(.*.o\),rm -f \1; ln -s ../GENERIC/\1 \1,' > makelinks sh makelinks && rm -f dontlink -SRCS= ${_machdir}/sparc64/locore.s \ +SRCS= ${_machdir}/${_mach}/locore.s \ param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} - ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/sparc64/locore.s + ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.s ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} .if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} @@ -175,7 +175,7 @@ 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}/sparc64/locore.s assym.h +locore.o: ${_machdir}/${_mach}/locore.s assym.h ${NORMAL_S} # The install target can be redefined by putting a diff --git a/sys/arch/vax/conf/Makefile.vax b/sys/arch/vax/conf/Makefile.vax index fa71e5785fa..2e13c46ace1 100644 --- a/sys/arch/vax/conf/Makefile.vax +++ b/sys/arch/vax/conf/Makefile.vax @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.vax,v 1.41 2010/04/27 04:31:48 deraadt Exp $ +# $OpenBSD: Makefile.vax,v 1.42 2010/04/27 05:05:22 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -153,7 +153,7 @@ clean:: lint: @lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \ - ${_machdir}/vax/Locore.c ${CFILES} \ + ${_machdir}/${_mach}/Locore.c ${CFILES} \ ioconf.c param.c | \ grep -v 'static function .* unused' @@ -168,12 +168,12 @@ links: sed 's,../.*/\(.*.o\),rm -f \1; ln -s ../GENERIC/\1 \1,' > makelinks sh makelinks && rm -f dontlink -SRCS= ${_machdir}/vax/intvec.s ${_machdir}/vax/subr.s \ +SRCS= ${_machdir}/${_mach}/intvec.s ${_machdir}/${_mach}/subr.s \ param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} - ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/vax/intvec.s ${_machdir}/vax/subr.s + ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/intvec.s ${_machdir}/${_mach}/subr.s ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ @@ -188,10 +188,10 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk rm -f db_structinfo.o -intvec.o: ${_machdir}/vax/intvec.s assym.h +intvec.o: ${_machdir}/${_mach}/intvec.s assym.h ${NORMAL_S} -subr.o: ${_machdir}/vax/subr.s assym.h +subr.o: ${_machdir}/${_mach}/subr.s assym.h ${NORMAL_S} # The install target can be redefined by putting a diff --git a/sys/arch/zaurus/conf/Makefile.zaurus b/sys/arch/zaurus/conf/Makefile.zaurus index 95ef8f50b08..00f6e2d5d88 100644 --- a/sys/arch/zaurus/conf/Makefile.zaurus +++ b/sys/arch/zaurus/conf/Makefile.zaurus @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.zaurus,v 1.21 2010/04/27 04:31:48 deraadt Exp $ +# $OpenBSD: Makefile.zaurus,v 1.22 2010/04/27 05:05:22 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -169,7 +169,7 @@ links: SRCS= ${_archdir}/arm/locore.S \ param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend -.depend: ${SRCS} assym.h param.c ${APMINC} ${DB_STRUCTINFO} +.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_archdir}/arm/locore.S ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} .if ${SFILES} != "" @@ -186,7 +186,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 - ${_mach}_start.o: ${_machdir}/${_mach}/${_mach}_start.S assym.h ${NORMAL_S} |