summaryrefslogtreecommitdiff
path: root/sys/arch/hppa64/conf
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2010-04-26 22:11:39 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2010-04-26 22:11:39 +0000
commitcf73c4ff4bd72c5b565aa20b4d28e922b49c282a (patch)
tree47f31973b2218f31aa239bf603f7e139c6f6e20f /sys/arch/hppa64/conf
parenta76c37785eb21eb31565d5c29545230eb5eafee4 (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/hppa64/conf')
-rw-r--r--sys/arch/hppa64/conf/Makefile.hppa6415
1 files changed, 9 insertions, 6 deletions
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