diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-04-26 22:11:39 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-04-26 22:11:39 +0000 |
| commit | cf73c4ff4bd72c5b565aa20b4d28e922b49c282a (patch) | |
| tree | 47f31973b2218f31aa239bf603f7e139c6f6e20f /sys/arch | |
| parent | a76c37785eb21eb31565d5c29545230eb5eafee4 (diff) | |
next step towards unification: make all the genassym chunks handle both
arch and machine dependent files (and add the missing files)
ok miod drahn
Diffstat (limited to 'sys/arch')
38 files changed, 260 insertions, 193 deletions
diff --git a/sys/arch/alpha/conf/Makefile.alpha b/sys/arch/alpha/conf/Makefile.alpha index 5a1020c2584..ac7e0841261 100644 --- a/sys/arch/alpha/conf/Makefile.alpha +++ b/sys/arch/alpha/conf/Makefile.alpha @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.alpha,v 1.49 2010/04/26 20:50:15 deraadt Exp $ +# $OpenBSD: Makefile.alpha,v 1.50 2010/04/26 22:11:36 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -103,9 +103,11 @@ LINKFLAGS+= -S -x %LOAD -assym.h: $S/kern/genassym.sh ${_machdir}/alpha/genassym.cf Makefile - sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} \ - ${PARAM} < ${_machdir}/alpha/genassym.cf > assym.h.tmp && \ +assym.h: $S/kern/genassym.sh Makefile \ + ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PARAM} | \ + sort -u > assym.h.tmp && \ mv -f assym.h.tmp assym.h param.c: $S/conf/param.c @@ -153,8 +155,9 @@ depend:: .depend ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${_machdir}/alpha/cpuconf.c \ param.c ioconf.c ${CFILES} ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} - sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \ - ${CPPFLAGS} < ${_machdir}/alpha/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${MKDEP} ${CFLAGS} ${CPPFLAGS} | \ + sort -u > assym.dep @sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \ < assym.dep >> .depend @rm -f assym.dep diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64 index 1744453e6e2..4f958ee1f24 100644 --- a/sys/arch/amd64/conf/Makefile.amd64 +++ b/sys/arch/amd64/conf/Makefile.amd64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.amd64,v 1.24 2010/04/26 21:46:36 deraadt Exp $ +# $OpenBSD: Makefile.amd64,v 1.25 2010/04/26 22:11:37 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -112,9 +112,11 @@ LINKFLAGS+= -S -x %LOAD -assym.h: $S/kern/genassym.sh ${_machdir}/amd64/genassym.cf Makefile - sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} \ - ${PARAM} < ${_machdir}/amd64/genassym.cf > assym.h.tmp && \ +assym.h: $S/kern/genassym.sh Makefile \ + ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PARAM} | \ + sort -u > assym.h.tmp && \ mv -f assym.h.tmp assym.h param.c: $S/conf/param.c @@ -163,8 +165,9 @@ depend:: .depend ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AFILES} ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} - sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \ - ${CPPFLAGS} ${PARAM} < ${_machdir}/amd64/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${MKDEP} ${CFLAGS} ${CPPFLAGS} | \ + sort -u > assym.dep @sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \ < assym.dep >> .depend @rm -f assym.dep diff --git a/sys/arch/armish/armish/genassym.cf b/sys/arch/armish/armish/genassym.cf new file mode 100644 index 00000000000..679dcad021f --- /dev/null +++ b/sys/arch/armish/armish/genassym.cf @@ -0,0 +1 @@ +# $OpenBSD: genassym.cf,v 1.1 2010/04/26 22:11:38 deraadt Exp $ diff --git a/sys/arch/armish/conf/Makefile.armish b/sys/arch/armish/conf/Makefile.armish index 5c3b398ef45..d693e082a4b 100644 --- a/sys/arch/armish/conf/Makefile.armish +++ b/sys/arch/armish/conf/Makefile.armish @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.armish,v 1.14 2010/04/26 20:50:16 deraadt Exp $ +# $OpenBSD: Makefile.armish,v 1.15 2010/04/26 22:11:37 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -123,10 +123,11 @@ LINKFLAGS+= -x %LOAD -assym.h: $S/kern/genassym.sh ${_archdir}/arm/genassym.cf Makefile - cat ${_archdir}/arm/genassym.cf | \ - sh $S/kern/genassym.sh ${CC} ${CFLAGS} \ - ${CPPFLAGS} ${PARAM} > assym.h.tmp && \ +assym.h: $S/kern/genassym.sh Makefile \ + ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PARAM} | \ + sort -u > assym.h.tmp && \ mv -f assym.h.tmp assym.h param.c: $S/conf/param.c @@ -176,9 +177,9 @@ depend:: .depend .if ${SFILES} != "" ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} .endif - cat ${_archdir}/arm/genassym.cf | \ - sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \ - ${CPPFLAGS} + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${MKDEP} ${CFLAGS} ${CPPFLAGS} | \ + sort -u > assym.dep @sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \ < assym.dep >> .depend @rm -f assym.dep diff --git a/sys/arch/aviion/aviion/genassym.cf b/sys/arch/aviion/aviion/genassym.cf new file mode 100644 index 00000000000..679dcad021f --- /dev/null +++ b/sys/arch/aviion/aviion/genassym.cf @@ -0,0 +1 @@ +# $OpenBSD: genassym.cf,v 1.1 2010/04/26 22:11:38 deraadt Exp $ diff --git a/sys/arch/aviion/conf/Makefile.aviion b/sys/arch/aviion/conf/Makefile.aviion index f27b4a05b1f..db9dfb27caa 100644 --- a/sys/arch/aviion/conf/Makefile.aviion +++ b/sys/arch/aviion/conf/Makefile.aviion @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.aviion,v 1.12 2010/04/26 20:50:16 deraadt Exp $ +# $OpenBSD: Makefile.aviion,v 1.13 2010/04/26 22:11:37 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -111,9 +111,11 @@ LINKFLAGS+= -x %LOAD -assym.h: $S/kern/genassym.sh ${_archdir}/m88k/genassym.cf Makefile - sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} \ - ${PARAM} < ${_archdir}/m88k/genassym.cf > assym.h.tmp && \ +assym.h: $S/kern/genassym.sh Makefile \ + ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PARAM} | \ + sort -u > assym.h.tmp && \ mv -f assym.h.tmp assym.h param.c: $S/conf/param.c @@ -162,8 +164,9 @@ depend:: .depend .if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} .endif - sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \ - ${CPPFLAGS} < ${_archdir}/m88k/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${MKDEP} ${CFLAGS} ${CPPFLAGS} | \ + sort -u > assym.dep @sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \ < assym.dep >> .depend @rm -f assym.dep diff --git a/sys/arch/beagle/beagle/genassym.cf b/sys/arch/beagle/beagle/genassym.cf new file mode 100644 index 00000000000..679dcad021f --- /dev/null +++ b/sys/arch/beagle/beagle/genassym.cf @@ -0,0 +1 @@ +# $OpenBSD: genassym.cf,v 1.1 2010/04/26 22:11:38 deraadt Exp $ diff --git a/sys/arch/beagle/conf/Makefile.beagle b/sys/arch/beagle/conf/Makefile.beagle index 56037ebf76a..9424ed39310 100644 --- a/sys/arch/beagle/conf/Makefile.beagle +++ b/sys/arch/beagle/conf/Makefile.beagle @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.beagle,v 1.9 2010/04/26 20:52:50 deraadt Exp $ +# $OpenBSD: Makefile.beagle,v 1.10 2010/04/26 22:11:37 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -120,10 +120,11 @@ LINKFLAGS+= -x %LOAD -assym.h: $S/kern/genassym.sh ${_archdir}/arm/genassym.cf Makefile - cat ${_archdir}/arm/genassym.cf | \ - sh $S/kern/genassym.sh ${CC} ${CFLAGS} \ - ${CPPFLAGS} ${PARAM} > assym.h.tmp && \ +assym.h: $S/kern/genassym.sh Makefile \ + ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PARAM} | \ + sort -u > assym.h.tmp && \ mv -f assym.h.tmp assym.h param.c: $S/conf/param.c @@ -173,9 +174,9 @@ depend:: .depend .if ${SFILES} != "" ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} .endif - cat ${_archdir}/arm/genassym.cf | \ - sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \ - ${CPPFLAGS} + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${MKDEP} ${CFLAGS} ${CPPFLAGS} | \ + sort -u > assym.dep @sed -e 's/.*\.o:.* /assym.h: /' < assym.dep >> .depend @rm -f assym.dep diff --git a/sys/arch/gumstix/conf/Makefile.gumstix b/sys/arch/gumstix/conf/Makefile.gumstix index 955f0bfe5a0..ff94a74c14d 100644 --- a/sys/arch/gumstix/conf/Makefile.gumstix +++ b/sys/arch/gumstix/conf/Makefile.gumstix @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.gumstix,v 1.7 2010/04/26 20:52:50 deraadt Exp $ +# $OpenBSD: Makefile.gumstix,v 1.8 2010/04/26 22:11:37 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -124,10 +124,11 @@ LINKFLAGS+= -x %LOAD -assym.h: $S/kern/genassym.sh ${_archdir}/arm/genassym.cf Makefile - cat ${_archdir}/arm/genassym.cf | \ - sh $S/kern/genassym.sh ${CC} ${CFLAGS} \ - ${CPPFLAGS} ${PARAM} > assym.h.tmp && \ +assym.h: $S/kern/genassym.sh Makefile \ + ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PARAM} | \ + sort -u > assym.h.tmp && \ mv -f assym.h.tmp assym.h param.c: $S/conf/param.c @@ -177,9 +178,9 @@ depend:: .depend .if ${SFILES} != "" ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} .endif - cat ${_archdir}/arm/genassym.cf | \ - sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \ - ${CPPFLAGS} + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${MKDEP} ${CFLAGS} ${CPPFLAGS} | \ + sort -u > assym.dep @sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \ < assym.dep >> .depend @rm -f assym.dep diff --git a/sys/arch/gumstix/gumstix/genassym.cf b/sys/arch/gumstix/gumstix/genassym.cf new file mode 100644 index 00000000000..679dcad021f --- /dev/null +++ b/sys/arch/gumstix/gumstix/genassym.cf @@ -0,0 +1 @@ +# $OpenBSD: genassym.cf,v 1.1 2010/04/26 22:11:38 deraadt Exp $ diff --git a/sys/arch/hp300/conf/Makefile.hp300 b/sys/arch/hp300/conf/Makefile.hp300 index c6c462ed755..63717fde06c 100644 --- a/sys/arch/hp300/conf/Makefile.hp300 +++ b/sys/arch/hp300/conf/Makefile.hp300 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.hp300,v 1.49 2010/04/26 20:50:16 deraadt Exp $ +# $OpenBSD: Makefile.hp300,v 1.50 2010/04/26 22:11:37 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -140,12 +140,12 @@ LINKFLAGS+= -S %LOAD -assym.h: $S/kern/genassym.sh \ - ${_archdir}/m68k/genassym.cf ${_machdir}/hp300/genassym.cf Makefile - cat ${_archdir}/m68k/genassym.cf ${_machdir}/hp300/genassym.cf | \ - sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} \ - > assym.h.tmp && \ - mv -f assym.h.tmp assym.h +assym.h: $S/kern/genassym.sh Makefile \ + ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PARAM} | \ + sort -u > assym.h.tmp && \ + mv -f assym.h.tmp assym.h param.c: $S/conf/param.c rm -f param.c @@ -194,8 +194,9 @@ depend:: .depend -if test -n "${SFILES}"; then \ ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}; \ fi - sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \ - ${CPPFLAGS} < ${_machdir}/hp300/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${MKDEP} ${CFLAGS} ${CPPFLAGS} | \ + sort -u > assym.dep @sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \ < assym.dep >> .depend @rm -f assym.dep diff --git a/sys/arch/hppa/conf/Makefile.hppa b/sys/arch/hppa/conf/Makefile.hppa index 5f82414087d..06c27c430af 100644 --- a/sys/arch/hppa/conf/Makefile.hppa +++ b/sys/arch/hppa/conf/Makefile.hppa @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.hppa,v 1.39 2010/04/26 20:50:16 deraadt Exp $ +# $OpenBSD: Makefile.hppa,v 1.40 2010/04/26 22:11:37 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -124,9 +124,11 @@ LINKFLAGS+= -S -x %LOAD -assym.h: $S/kern/genassym.sh ${_machdir}/hppa/genassym.cf Makefile - sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} \ - < ${_machdir}/hppa/genassym.cf > assym.h.tmp && \ +assym.h: $S/kern/genassym.sh Makefile \ + ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PARAM} | \ + sort -u > assym.h.tmp && \ mv -f assym.h.tmp assym.h param.c: $S/conf/param.c @@ -175,8 +177,9 @@ SRCS= ${_machdir}/hppa/locore.S \ -if test -n "${SFILES}"; then \ ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}; \ fi - sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \ - ${CPPFLAGS} < ${_machdir}/hppa/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${MKDEP} ${CFLAGS} ${CPPFLAGS} | \ + sort -u > assym.dep @sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \ < assym.dep >> .depend @rm -f assym.dep diff --git a/sys/arch/hppa64/conf/Makefile.hppa64 b/sys/arch/hppa64/conf/Makefile.hppa64 index cc1e8935692..1671c5f1122 100644 --- a/sys/arch/hppa64/conf/Makefile.hppa64 +++ b/sys/arch/hppa64/conf/Makefile.hppa64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.hppa64,v 1.13 2010/04/26 20:50:16 deraadt Exp $ +# $OpenBSD: Makefile.hppa64,v 1.14 2010/04/26 22:11:37 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -104,9 +104,11 @@ LINKFLAGS+= -S %LOAD -assym.h: $S/kern/genassym.sh ${_machdir}/hppa64/genassym.cf Makefile - sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} \ - < ${_machdir}/hppa64/genassym.cf > assym.h.tmp && \ +assym.h: $S/kern/genassym.sh Makefile \ + ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PARAM} | \ + sort -u > assym.h.tmp && \ mv -f assym.h.tmp assym.h param.c: $S/conf/param.c @@ -155,8 +157,9 @@ SRCS= ${_machdir}/hppa64/locore.S \ -if test -n "${SFILES}"; then \ ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}; \ fi - sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \ - ${CPPFLAGS} < ${_machdir}/hppa64/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${MKDEP} ${CFLAGS} ${CPPFLAGS} | \ + sort -u > assym.dep @sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \ < assym.dep >> .depend @rm -f assym.dep diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386 index 83cacdc8924..aa900775a4d 100644 --- a/sys/arch/i386/conf/Makefile.i386 +++ b/sys/arch/i386/conf/Makefile.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.i386,v 1.56 2010/04/26 20:50:16 deraadt Exp $ +# $OpenBSD: Makefile.i386,v 1.57 2010/04/26 22:11:37 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -116,9 +116,11 @@ LINKFLAGS+= -S -x %LOAD -assym.h: $S/kern/genassym.sh ${_machdir}/i386/genassym.cf Makefile - sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} \ - ${PARAM} < ${_machdir}/i386/genassym.cf > assym.h.tmp && \ +assym.h: $S/kern/genassym.sh Makefile \ + ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PARAM} | \ + sort -u > assym.h.tmp && \ mv -f assym.h.tmp assym.h param.c: $S/conf/param.c @@ -166,8 +168,9 @@ depend:: .depend ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/i386/locore.s ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} - sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \ - ${CPPFLAGS} < ${_machdir}/i386/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${MKDEP} ${CFLAGS} ${CPPFLAGS} | \ + sort -u > assym.dep @sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \ < assym.dep >> .depend @rm -f assym.dep diff --git a/sys/arch/landisk/conf/Makefile.landisk b/sys/arch/landisk/conf/Makefile.landisk index fcc8947083a..2d02f0197a6 100644 --- a/sys/arch/landisk/conf/Makefile.landisk +++ b/sys/arch/landisk/conf/Makefile.landisk @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.landisk,v 1.14 2010/04/26 20:50:16 deraadt Exp $ +# $OpenBSD: Makefile.landisk,v 1.15 2010/04/26 22:11:37 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -110,12 +110,12 @@ LINKFLAGS+= -S -x %LOAD -assym.h: $S/kern/genassym.sh \ - ${_archdir}/sh/genassym.cf Makefile - cat ${_archdir}/sh/genassym.cf | \ - sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} \ - > assym.h.tmp && \ - mv -f assym.h.tmp assym.h +assym.h: $S/kern/genassym.sh Makefile \ + ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PARAM} | \ + sort -u > assym.h.tmp && \ + mv -f assym.h.tmp assym.h param.c: $S/conf/param.c rm -f param.c @@ -163,8 +163,9 @@ depend:: .depend .if ${SFILES} != "" ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} .endif - cat ${_archdir}/sh/genassym.cf | \ - sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} ${CPPFLAGS} + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${MKDEP} ${CFLAGS} ${CPPFLAGS} | \ + sort -u > assym.dep @sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \ < assym.dep >> .depend @rm -f assym.dep diff --git a/sys/arch/landisk/landisk/genassym.cf b/sys/arch/landisk/landisk/genassym.cf new file mode 100644 index 00000000000..679dcad021f --- /dev/null +++ b/sys/arch/landisk/landisk/genassym.cf @@ -0,0 +1 @@ +# $OpenBSD: genassym.cf,v 1.1 2010/04/26 22:11:38 deraadt Exp $ diff --git a/sys/arch/loongson/conf/Makefile.loongson b/sys/arch/loongson/conf/Makefile.loongson index 7c44fa3c5a2..2dd8372f60d 100644 --- a/sys/arch/loongson/conf/Makefile.loongson +++ b/sys/arch/loongson/conf/Makefile.loongson @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.loongson,v 1.5 2010/04/26 20:50:16 deraadt Exp $ +# $OpenBSD: Makefile.loongson,v 1.6 2010/04/26 22:11:37 deraadt Exp $ # This makefile is constructed from a machine description: # config ``machineid'' @@ -128,11 +128,11 @@ if_arp.o if_ether.o: Makefile ip_input.o ip_output.o in_pcb.o in_proto.o: Makefile tcp_subr.o tcp_timer.o tcp_output.o: Makefile -assym.h: $S/kern/genassym.sh \ - ${_archdir}/mips64/genassym.cf ${_machdir}/loongson/genassym.cf Makefile - cat ${_archdir}/mips64/genassym.cf ${_machdir}/loongson/genassym.cf | \ - sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PARAM} \ - > assym.h.tmp && \ +assym.h: $S/kern/genassym.sh Makefile \ + ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PARAM} | \ + sort -u > assym.h.tmp && \ mv -f assym.h.tmp assym.h links: @@ -170,8 +170,9 @@ depend:: .depend ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/loongson/locore.S ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} - cat ${_archdir}/mips64/genassym.cf ${_machdir}/loongson/genassym.cf | \ - sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} ${CPPFLAGS} + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${MKDEP} ${CFLAGS} ${CPPFLAGS} | \ + sort -u > assym.dep @sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \ < assym.dep >> .depend @rm -f assym.dep diff --git a/sys/arch/luna88k/conf/Makefile.luna88k b/sys/arch/luna88k/conf/Makefile.luna88k index bb797daf7f0..61ce900f6bc 100644 --- a/sys/arch/luna88k/conf/Makefile.luna88k +++ b/sys/arch/luna88k/conf/Makefile.luna88k @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.luna88k,v 1.18 2010/04/26 20:50:16 deraadt Exp $ +# $OpenBSD: Makefile.luna88k,v 1.19 2010/04/26 22:11:37 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -107,9 +107,11 @@ LINKFLAGS+= -x %LOAD -assym.h: $S/kern/genassym.sh ${_archdir}/m88k/genassym.cf Makefile - sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} \ - ${PARAM} < ${_archdir}/m88k/genassym.cf > assym.h.tmp && \ +assym.h: $S/kern/genassym.sh Makefile \ + ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PARAM} | \ + sort -u > assym.h.tmp && \ mv -f assym.h.tmp assym.h param.c: $S/conf/param.c @@ -158,8 +160,9 @@ depend:: .depend .if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} .endif - sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \ - ${CPPFLAGS} < ${_archdir}/m88k/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${MKDEP} ${CFLAGS} ${CPPFLAGS} | \ + sort -u > assym.dep @sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \ < assym.dep >> .depend @rm -f assym.dep diff --git a/sys/arch/luna88k/luna88k/genassym.cf b/sys/arch/luna88k/luna88k/genassym.cf new file mode 100644 index 00000000000..7357620b985 --- /dev/null +++ b/sys/arch/luna88k/luna88k/genassym.cf @@ -0,0 +1 @@ +# $OpenBSD: genassym.cf,v 1.3 2010/04/26 22:11:38 deraadt Exp $ diff --git a/sys/arch/mac68k/conf/Makefile.mac68k b/sys/arch/mac68k/conf/Makefile.mac68k index b1cd392edc0..2e2fd58fb3b 100644 --- a/sys/arch/mac68k/conf/Makefile.mac68k +++ b/sys/arch/mac68k/conf/Makefile.mac68k @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.mac68k,v 1.46 2010/04/26 20:50:16 deraadt Exp $ +# $OpenBSD: Makefile.mac68k,v 1.47 2010/04/26 22:11:37 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -111,12 +111,12 @@ LINKFLAGS+= -S %LOAD -assym.h: $S/kern/genassym.sh \ - ${_archdir}/m68k/genassym.cf ${_machdir}/mac68k/genassym.cf Makefile - cat ${_archdir}/m68k/genassym.cf ${_machdir}/mac68k/genassym.cf | \ - sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} \ - > assym.h.tmp && \ - mv -f assym.h.tmp assym.h +assym.h: $S/kern/genassym.sh Makefile \ + ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PARAM} | \ + sort -u > assym.h.tmp && \ + mv -f assym.h.tmp assym.h param.c: $S/conf/param.c rm -f param.c @@ -166,8 +166,9 @@ depend:: .depend -if test -n "${SFILES}"; then \ ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}; \ fi - sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \ - ${CPPFLAGS} < ${_machdir}/mac68k/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${MKDEP} ${CFLAGS} ${CPPFLAGS} | \ + sort -u > assym.dep @sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \ < assym.dep >> .depend @rm -f assym.dep diff --git a/sys/arch/macppc/conf/Makefile.macppc b/sys/arch/macppc/conf/Makefile.macppc index bf0530dc187..0ac2947965a 100644 --- a/sys/arch/macppc/conf/Makefile.macppc +++ b/sys/arch/macppc/conf/Makefile.macppc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.macppc,v 1.35 2010/04/26 20:50:16 deraadt Exp $ +# $OpenBSD: Makefile.macppc,v 1.36 2010/04/26 22:11:37 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -110,9 +110,11 @@ LINKFLAGS+= -S -x %LOAD -assym.h: $S/kern/genassym.sh ${_machdir}/macppc/genassym.cf Makefile - sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} \ - < ${_machdir}/macppc/genassym.cf > assym.h.tmp && \ +assym.h: $S/kern/genassym.sh Makefile \ + ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PARAM} | \ + sort -u > assym.h.tmp && \ mv -f assym.h.tmp assym.h param.c: $S/conf/param.c @@ -161,8 +163,9 @@ depend:: .depend .if ${SFILES} != "" ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} .endif - sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \ - ${CPPFLAGS} < ${_machdir}/macppc/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${MKDEP} ${CFLAGS} ${CPPFLAGS} | \ + sort -u > assym.dep @sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \ < assym.dep >> .depend @rm -f assym.dep diff --git a/sys/arch/moko/conf/Makefile.moko b/sys/arch/moko/conf/Makefile.moko index b2625d7cf89..ff6cc74f7b0 100644 --- a/sys/arch/moko/conf/Makefile.moko +++ b/sys/arch/moko/conf/Makefile.moko @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.moko,v 1.7 2010/04/26 20:52:50 deraadt Exp $ +# $OpenBSD: Makefile.moko,v 1.8 2010/04/26 22:11:37 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -121,10 +121,11 @@ LINKFLAGS+= -x %LOAD -assym.h: $S/kern/genassym.sh ${_archdir}/arm/genassym.cf Makefile - cat ${_archdir}/arm/genassym.cf | \ - sh $S/kern/genassym.sh ${CC} ${CFLAGS} \ - ${CPPFLAGS} ${PARAM} > assym.h.tmp && \ +assym.h: $S/kern/genassym.sh Makefile \ + ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PARAM} | \ + sort -u > assym.h.tmp && \ mv -f assym.h.tmp assym.h param.c: $S/conf/param.c @@ -174,9 +175,9 @@ depend:: .depend .if ${SFILES} != "" ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} .endif - cat ${_archdir}/arm/genassym.cf | \ - sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \ - ${CPPFLAGS} + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${MKDEP} ${CFLAGS} ${CPPFLAGS} | \ + sort -u > assym.dep @sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \ < assym.dep >> .depend @rm -f assym.dep diff --git a/sys/arch/moko/moko/genassym.cf b/sys/arch/moko/moko/genassym.cf new file mode 100644 index 00000000000..679dcad021f --- /dev/null +++ b/sys/arch/moko/moko/genassym.cf @@ -0,0 +1 @@ +# $OpenBSD: genassym.cf,v 1.1 2010/04/26 22:11:38 deraadt Exp $ diff --git a/sys/arch/mvme68k/conf/Makefile.mvme68k b/sys/arch/mvme68k/conf/Makefile.mvme68k index 88ea2103c3b..0e0fe807cac 100644 --- a/sys/arch/mvme68k/conf/Makefile.mvme68k +++ b/sys/arch/mvme68k/conf/Makefile.mvme68k @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile.mvme68k,v 1.38 2010/04/26 20:50:16 deraadt Exp $ +# $OpenBSD: Makefile.mvme68k,v 1.39 2010/04/26 22:11:37 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid # Most changes should be made in the machine description # /sys/arch/mvme68k/conf/``machineid'' # after which you should do -# config machineid +# config machineid # Machine generic makefile changes should be made in # /sys/arch/mvme68k/conf/Makefile.mvme68k # after which config should be rerun for all machines of that type. @@ -108,12 +108,12 @@ LINKFLAGS+= -S %LOAD -assym.h: $S/kern/genassym.sh \ - ${_archdir}/m68k/genassym.cf ${_machdir}/mvme68k/genassym.cf Makefile - cat ${_archdir}/m68k/genassym.cf ${_machdir}/mvme68k/genassym.cf | \ - sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} \ - > assym.h.tmp && \ - mv -f assym.h.tmp assym.h +assym.h: $S/kern/genassym.sh Makefile \ + ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PARAM} | \ + sort -u > assym.h.tmp && \ + mv -f assym.h.tmp assym.h param.c: $S/conf/param.c rm -f param.c @@ -161,8 +161,9 @@ depend:: .depend ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/mvme68k/locore.s ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} - sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \ - ${CPPFLAGS} < ${_machdir}/mvme68k/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${MKDEP} ${CFLAGS} ${CPPFLAGS} | \ + sort -u > assym.dep @sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \ < assym.dep >> .depend @rm -f assym.dep diff --git a/sys/arch/mvme88k/conf/Makefile.mvme88k b/sys/arch/mvme88k/conf/Makefile.mvme88k index e401ad6880f..d9df1bb6c73 100644 --- a/sys/arch/mvme88k/conf/Makefile.mvme88k +++ b/sys/arch/mvme88k/conf/Makefile.mvme88k @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.mvme88k,v 1.49 2010/04/26 20:50:17 deraadt Exp $ +# $OpenBSD: Makefile.mvme88k,v 1.50 2010/04/26 22:11:37 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -110,9 +110,11 @@ LINKFLAGS+= -x %LOAD -assym.h: $S/kern/genassym.sh ${_archdir}/m88k/genassym.cf Makefile - sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} \ - ${PARAM} < ${_archdir}/m88k/genassym.cf > assym.h.tmp && \ +assym.h: $S/kern/genassym.sh Makefile \ + ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PARAM} | \ + sort -u > assym.h.tmp && \ mv -f assym.h.tmp assym.h param.c: $S/conf/param.c @@ -161,8 +163,9 @@ depend:: .depend .if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} .endif - sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \ - ${CPPFLAGS} < ${_archdir}/m88k/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${MKDEP} ${CFLAGS} ${CPPFLAGS} | \ + sort -u > assym.dep @sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \ < assym.dep >> .depend @rm -f assym.dep diff --git a/sys/arch/mvme88k/mvme88k/genassym.cf b/sys/arch/mvme88k/mvme88k/genassym.cf new file mode 100644 index 00000000000..730cf74b2db --- /dev/null +++ b/sys/arch/mvme88k/mvme88k/genassym.cf @@ -0,0 +1 @@ +# $OpenBSD: genassym.cf,v 1.12 2010/04/26 22:11:38 deraadt Exp $ diff --git a/sys/arch/mvmeppc/conf/Makefile.mvmeppc b/sys/arch/mvmeppc/conf/Makefile.mvmeppc index 5235b8c9623..6078ace0cc8 100644 --- a/sys/arch/mvmeppc/conf/Makefile.mvmeppc +++ b/sys/arch/mvmeppc/conf/Makefile.mvmeppc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.mvmeppc,v 1.33 2010/04/26 20:50:17 deraadt Exp $ +# $OpenBSD: Makefile.mvmeppc,v 1.34 2010/04/26 22:11:38 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -111,9 +111,11 @@ LINKFLAGS+= -S -x %LOAD -assym.h: $S/kern/genassym.sh ${_machdir}/mvmeppc/genassym.cf Makefile - sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} \ - < ${_machdir}/mvmeppc/genassym.cf > assym.h.tmp && \ +assym.h: $S/kern/genassym.sh Makefile \ + ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PARAM} | \ + sort -u > assym.h.tmp && \ mv -f assym.h.tmp assym.h param.c: $S/conf/param.c @@ -162,8 +164,9 @@ depend:: .depend .if ${SFILES} != "" ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} .endif - sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \ - ${CPPFLAGS} < ${_machdir}/mvmeppc/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${MKDEP} ${CFLAGS} ${CPPFLAGS} | \ + sort -u > assym.dep @sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \ < assym.dep >> .depend @rm -f assym.dep diff --git a/sys/arch/palm/conf/Makefile.palm b/sys/arch/palm/conf/Makefile.palm index 901b2452dac..fbb707022e1 100644 --- a/sys/arch/palm/conf/Makefile.palm +++ b/sys/arch/palm/conf/Makefile.palm @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.palm,v 1.4 2010/04/26 20:50:17 deraadt Exp $ +# $OpenBSD: Makefile.palm,v 1.5 2010/04/26 22:11:38 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -115,10 +115,11 @@ LINKFLAGS+= -x %LOAD -assym.h: $S/kern/genassym.sh ${_archdir}/arm/genassym.cf Makefile - cat ${_archdir}/arm/genassym.cf | \ - sh $S/kern/genassym.sh ${CC} ${CFLAGS} \ - ${CPPFLAGS} ${PARAM} > assym.h.tmp && \ +assym.h: $S/kern/genassym.sh Makefile \ + ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PARAM} | \ + sort -u > assym.h.tmp && \ mv -f assym.h.tmp assym.h param.c: $S/conf/param.c @@ -168,9 +169,9 @@ depend:: .depend .if ${SFILES} != "" ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} .endif - cat ${_archdir}/arm/genassym.cf | \ - sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \ - ${CPPFLAGS} + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${MKDEP} ${CFLAGS} ${CPPFLAGS} | \ + sort -u > assym.dep @sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \ < assym.dep >> .depend @rm -f assym.dep diff --git a/sys/arch/palm/palm/genassym.cf b/sys/arch/palm/palm/genassym.cf new file mode 100644 index 00000000000..679dcad021f --- /dev/null +++ b/sys/arch/palm/palm/genassym.cf @@ -0,0 +1 @@ +# $OpenBSD: genassym.cf,v 1.1 2010/04/26 22:11:38 deraadt Exp $ diff --git a/sys/arch/powerpc/powerpc/genassym.cf b/sys/arch/powerpc/powerpc/genassym.cf new file mode 100644 index 00000000000..4e8985ebb5c --- /dev/null +++ b/sys/arch/powerpc/powerpc/genassym.cf @@ -0,0 +1 @@ +# $OpenBSD: genassym.cf,v 1.4 2010/04/26 22:11:38 deraadt Exp $ diff --git a/sys/arch/sgi/conf/Makefile.sgi b/sys/arch/sgi/conf/Makefile.sgi index 639c288379d..82e2595a2e1 100644 --- a/sys/arch/sgi/conf/Makefile.sgi +++ b/sys/arch/sgi/conf/Makefile.sgi @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.sgi,v 1.28 2010/04/26 20:50:17 deraadt Exp $ +# $OpenBSD: Makefile.sgi,v 1.29 2010/04/26 22:11:38 deraadt Exp $ # Makefile for OpenBSD # @@ -136,11 +136,11 @@ if_arp.o if_ether.o: Makefile ip_input.o ip_output.o in_pcb.o in_proto.o: Makefile tcp_subr.o tcp_timer.o tcp_output.o: Makefile -assym.h: $S/kern/genassym.sh \ - ${_archdir}/mips64/genassym.cf ${_machdir}/sgi/genassym.cf Makefile - cat ${_archdir}/mips64/genassym.cf ${_machdir}/sgi/genassym.cf | \ - sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PARAM} \ - > assym.h.tmp && \ +assym.h: $S/kern/genassym.sh Makefile \ + ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PARAM} | \ + sort -u > assym.h.tmp && \ mv -f assym.h.tmp assym.h links: @@ -178,8 +178,9 @@ depend:: .depend ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/sgi/locore.S ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} - cat ${_archdir}/mips64/genassym.cf ${_machdir}/sgi/genassym.cf | \ - sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} ${CPPFLAGS} + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${MKDEP} ${CFLAGS} ${CPPFLAGS} | \ + sort -u > assym.dep @sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \ < assym.dep >> .depend @rm -f assym.dep diff --git a/sys/arch/socppc/conf/Makefile.socppc b/sys/arch/socppc/conf/Makefile.socppc index d342bb138e3..cab7d984225 100644 --- a/sys/arch/socppc/conf/Makefile.socppc +++ b/sys/arch/socppc/conf/Makefile.socppc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.socppc,v 1.7 2010/04/26 20:50:17 deraadt Exp $ +# $OpenBSD: Makefile.socppc,v 1.8 2010/04/26 22:11:38 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -111,9 +111,11 @@ LINKFLAGS+= -S -x %LOAD -assym.h: $S/kern/genassym.sh ${_machdir}/socppc/genassym.cf Makefile - sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} \ - < ${_machdir}/socppc/genassym.cf > assym.h.tmp && \ +assym.h: $S/kern/genassym.sh Makefile \ + ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PARAM} | \ + sort -u > assym.h.tmp && \ mv -f assym.h.tmp assym.h param.c: $S/conf/param.c @@ -162,8 +164,9 @@ depend:: .depend .if ${SFILES} != "" ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} .endif - sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \ - ${CPPFLAGS} < ${_machdir}/socppc/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${MKDEP} ${CFLAGS} ${CPPFLAGS} | \ + sort -u > assym.dep @sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \ < assym.dep >> .depend @rm -f assym.dep diff --git a/sys/arch/solbourne/conf/Makefile.solbourne b/sys/arch/solbourne/conf/Makefile.solbourne index 67510d783f7..b14a9b52998 100644 --- a/sys/arch/solbourne/conf/Makefile.solbourne +++ b/sys/arch/solbourne/conf/Makefile.solbourne @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.solbourne,v 1.14 2010/04/26 20:50:17 deraadt Exp $ +# $OpenBSD: Makefile.solbourne,v 1.15 2010/04/26 22:11:38 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -112,9 +112,11 @@ LINKFLAGS+= -S -x %LOAD -assym.h: $S/kern/genassym.sh ${_machdir}/solbourne/genassym.cf Makefile - sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} \ - ${PARAM} < ${_machdir}/solbourne/genassym.cf > assym.h.tmp && \ +assym.h: $S/kern/genassym.sh Makefile \ + ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PARAM} | \ + sort -u > assym.h.tmp && \ mv -f assym.h.tmp assym.h param.c: $S/conf/param.c @@ -164,8 +166,9 @@ depend:: .depend .if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} .endif - sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \ - ${CPPFLAGS} < ${_machdir}/solbourne/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${MKDEP} ${CFLAGS} ${CPPFLAGS} | \ + sort -u > assym.dep @sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \ < assym.dep >> .depend @rm -f assym.dep diff --git a/sys/arch/sparc/conf/Makefile.sparc b/sys/arch/sparc/conf/Makefile.sparc index 8239fcaa0cf..1409c9cf13b 100644 --- a/sys/arch/sparc/conf/Makefile.sparc +++ b/sys/arch/sparc/conf/Makefile.sparc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.sparc,v 1.50 2010/04/26 20:50:17 deraadt Exp $ +# $OpenBSD: Makefile.sparc,v 1.51 2010/04/26 22:11:38 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -117,9 +117,11 @@ LINKFLAGS+= -S -x %LOAD -assym.h: $S/kern/genassym.sh ${_machdir}/sparc/genassym.cf Makefile - sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} \ - ${PARAM} < ${_machdir}/sparc/genassym.cf > assym.h.tmp && \ +assym.h: $S/kern/genassym.sh Makefile \ + ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PARAM} | \ + sort -u > assym.h.tmp && \ mv -f assym.h.tmp assym.h param.c: $S/conf/param.c @@ -169,8 +171,9 @@ depend:: .depend .if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} .endif - sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \ - ${CPPFLAGS} < ${_machdir}/sparc/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${MKDEP} ${CFLAGS} ${CPPFLAGS} | \ + sort -u > assym.dep @sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \ < assym.dep >> .depend @rm -f assym.dep diff --git a/sys/arch/sparc64/conf/Makefile.sparc64 b/sys/arch/sparc64/conf/Makefile.sparc64 index b4d7b7371cf..c90aa966334 100644 --- a/sys/arch/sparc64/conf/Makefile.sparc64 +++ b/sys/arch/sparc64/conf/Makefile.sparc64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.sparc64,v 1.36 2010/04/26 20:50:17 deraadt Exp $ +# $OpenBSD: Makefile.sparc64,v 1.37 2010/04/26 22:11:38 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -110,9 +110,11 @@ LINKFLAGS+= -S -x %LOAD -assym.h: $S/kern/genassym.sh ${_machdir}/sparc64/genassym.cf Makefile - sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} \ - ${PARAM} < ${_machdir}/sparc64/genassym.cf > assym.h.tmp && \ +assym.h: $S/kern/genassym.sh Makefile \ + ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PARAM} | \ + sort -u > assym.h.tmp && \ mv -f assym.h.tmp assym.h param.c: $S/conf/param.c @@ -162,8 +164,9 @@ depend:: .depend .if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} .endif - sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \ - ${CPPFLAGS} < ${_machdir}/sparc64/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${MKDEP} ${CFLAGS} ${CPPFLAGS} | \ + sort -u > assym.dep @sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \ < assym.dep >> .depend @rm -f assym.dep diff --git a/sys/arch/vax/conf/Makefile.vax b/sys/arch/vax/conf/Makefile.vax index 7a5a4402a5a..bf12192f4fc 100644 --- a/sys/arch/vax/conf/Makefile.vax +++ b/sys/arch/vax/conf/Makefile.vax @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.vax,v 1.37 2010/04/26 20:50:17 deraadt Exp $ +# $OpenBSD: Makefile.vax,v 1.38 2010/04/26 22:11:38 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -123,9 +123,11 @@ LINKFLAGS+= -S %LOAD -assym.h: $S/kern/genassym.sh ${_machdir}/vax/genassym.cf Makefile - sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} \ - < ${_machdir}/vax/genassym.cf > assym.h.tmp && \ +assym.h: $S/kern/genassym.sh Makefile \ + ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PARAM} | \ + sort -u > assym.h.tmp && \ mv -f assym.h.tmp assym.h param.c: $S/conf/param.c @@ -145,8 +147,7 @@ vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c -clean:: cleankernel -cleankernel: +clean:: rm -f eddep *bsd bsd.gdb tags *.[io] [a-z]*.s \ [Ee]rrs linterrs makelinks assym.h ${DB_STRUCTINFO} @@ -175,8 +176,9 @@ depend:: .depend ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/vax/intvec.s ${_machdir}/vax/subr.s ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} - sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \ - ${CPPFLAGS} < ${_machdir}/vax/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${MKDEP} ${CFLAGS} ${CPPFLAGS} | \ + sort -u > assym.dep @sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \ < assym.dep >> .depend @rm -f assym.dep diff --git a/sys/arch/zaurus/conf/Makefile.zaurus b/sys/arch/zaurus/conf/Makefile.zaurus index a529ba6914a..0273cdcfc1e 100644 --- a/sys/arch/zaurus/conf/Makefile.zaurus +++ b/sys/arch/zaurus/conf/Makefile.zaurus @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.zaurus,v 1.17 2010/04/26 20:50:17 deraadt Exp $ +# $OpenBSD: Makefile.zaurus,v 1.18 2010/04/26 22:11:38 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -121,10 +121,11 @@ LINKFLAGS+= -x %LOAD -assym.h: $S/kern/genassym.sh ${_archdir}/arm/genassym.cf Makefile - cat ${_archdir}/arm/genassym.cf | \ - sh $S/kern/genassym.sh ${CC} ${CFLAGS} \ - ${CPPFLAGS} ${PARAM} > assym.h.tmp && \ +assym.h: $S/kern/genassym.sh Makefile \ + ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PARAM} | \ + sort -u > assym.h.tmp && \ mv -f assym.h.tmp assym.h param.c: $S/conf/param.c @@ -174,9 +175,9 @@ depend:: .depend .if ${SFILES} != "" ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} .endif - cat ${_archdir}/arm/genassym.cf | \ - sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \ - ${CPPFLAGS} + cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \ + sh $S/kern/genassym.sh ${MKDEP} ${CFLAGS} ${CPPFLAGS} | \ + sort -u > assym.dep @sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \ < assym.dep >> .depend @rm -f assym.dep diff --git a/sys/arch/zaurus/zaurus/genassym.cf b/sys/arch/zaurus/zaurus/genassym.cf new file mode 100644 index 00000000000..679dcad021f --- /dev/null +++ b/sys/arch/zaurus/zaurus/genassym.cf @@ -0,0 +1 @@ +# $OpenBSD: genassym.cf,v 1.1 2010/04/26 22:11:38 deraadt Exp $ |