Thu Mar 19 12:01:50 2009 UTC ()
Reflect the change to archivebuild in bsd.lib.mk rev 1.296 for
deterministic builds, as hinted by perry.


(pooka)
diff -r1.33 -r1.34 src/sys/rump/Makefile.rump
cvs diff -r1.33 -r1.34 src/sys/rump/Makefile.rump (expand / switch to unified diff)

--- src/sys/rump/Makefile.rump 2009/02/12 13:23:17 1.33
+++ src/sys/rump/Makefile.rump 2009/03/19 12:01:50 1.34
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.rump,v 1.33 2009/02/12 13:23:17 lukem Exp $ 1# $NetBSD: Makefile.rump,v 1.34 2009/03/19 12:01:50 pooka Exp $
2# 2#
3 3
4WARNS?= 3 # XXX: src/sys won't compile with -Wsign-compare yet 4WARNS?= 3 # XXX: src/sys won't compile with -Wsign-compare yet
5NOLINT= # kernel code 5NOLINT= # kernel code
6 6
7.include <bsd.own.mk> 7.include <bsd.own.mk>
8 8
9# use kernel ABI instead of rump ABI (needs md code) 9# use kernel ABI instead of rump ABI (needs md code)
10.ifndef RUMPKMOD 10.ifndef RUMPKMOD
11CPPFLAGS:= -I${RUMPTOP}/include ${CPPFLAGS} 11CPPFLAGS:= -I${RUMPTOP}/include ${CPPFLAGS}
12.endif 12.endif
13 13
14CFLAGS+= -ffreestanding -fno-strict-aliasing 14CFLAGS+= -ffreestanding -fno-strict-aliasing
@@ -46,21 +46,21 @@ DPSRCS+= ${RUMPTOP}/Makefile.rump @@ -46,21 +46,21 @@ DPSRCS+= ${RUMPTOP}/Makefile.rump
46# Unfortunately, we do not know which of the symbols are generated by 46# Unfortunately, we do not know which of the symbols are generated by
47# the toolchain. Worse, they vary from platform to platform and 47# the toolchain. Worse, they vary from platform to platform and
48# toolchain to toolchain. The good news, however, is that this will 48# toolchain to toolchain. The good news, however, is that this will
49# be detected by a compile-time failure, so we can fairly easily manage 49# be detected by a compile-time failure, so we can fairly easily manage
50# a quirktable here. 50# a quirktable here.
51.if ${MACHINE_CPU} == "mips" 51.if ${MACHINE_CPU} == "mips"
52_SYMQUIRK='|_gp_disp' 52_SYMQUIRK='|_gp_disp'
53.elif ${MACHINE_CPU} == "hppa" 53.elif ${MACHINE_CPU} == "hppa"
54_SYMQUIRK='|\$$\$$' 54_SYMQUIRK='|\$$\$$'
55.endif 55.endif
56__archivebuild: .USE 56__archivebuild: .USE
57 ${_MKTARGET_BUILD} 57 ${_MKTARGET_BUILD}
58 rm -f ${.TARGET} 58 rm -f ${.TARGET}
59 ${AR} cq ${.TARGET} `NM=${NM} ${LORDER} ${.ALLSRC:M*o} | ${TSORT}` 59 ${AR} ${_ARFL} ${.TARGET} `NM=${NM} ${LORDER} ${.ALLSRC:M*o} | ${TSORT}`
60 ${NM} -go ${.TARGET} | ${TOOL_AWK} ' \ 60 ${NM} -go ${.TARGET} | ${TOOL_AWK} ' \
61 $$NF!~/^(rump|RUMP|__|_GLOBAL_OFFSET_TABLE'${_SYMQUIRK}')/ \ 61 $$NF!~/^(rump|RUMP|__|_GLOBAL_OFFSET_TABLE'${_SYMQUIRK}')/ \
62 {printf "%s rumpns_%s\n", $$NF, $$NF}' \ 62 {printf "%s rumpns_%s\n", $$NF, $$NF}' \
63 | sort | uniq > renametab.${.TARGET} 63 | sort | uniq > renametab.${.TARGET}
64 ${OBJCOPY} --redefine-syms renametab.${.TARGET} ${.TARGET} 64 ${OBJCOPY} --redefine-syms renametab.${.TARGET} ${.TARGET}
65 rm -f renametab.${.TARGET} 65 rm -f renametab.${.TARGET}
66 ${RANLIB} ${.TARGET} 66 ${RANLIB} ${.TARGET}