[src/trunk]: src/sys/rump apply a patch from dennis fergusson:

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/05d6be25b611
branches:  trunk
changeset: 753426:05d6be25b611
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Mar 28 04:29:34 2010 +0000

description:
apply a patch from dennis fergusson:

fix the powerpc64 quirk handling by introducing a prefix quirk and
using it as appropriate.  fix the (postfix) quirk.

now rump and powerpc64 get along nicely.

diffstat:

 sys/rump/Makefile.rump |  23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 deletions(-)

diffs (44 lines):

diff -r 3441eaff68a5 -r 05d6be25b611 sys/rump/Makefile.rump
--- a/sys/rump/Makefile.rump    Sun Mar 28 00:00:07 2010 +0000
+++ b/sys/rump/Makefile.rump    Sun Mar 28 04:29:34 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.rump,v 1.54 2010/03/22 05:39:00 mrg Exp $
+#      $NetBSD: Makefile.rump,v 1.55 2010/03/28 04:29:34 mrg Exp $
 #
 
 WARNS?=                3       # XXX: src/sys won't compile with -Wsign-compare yet
@@ -70,7 +70,22 @@
 .elif ${MACHINE_CPU} == "hppa"
 _SYMQUIRK='|\$$\$$'
 .elif ${MACHINE_ARCH} == "powerpc64"
-_SYMQUIRK='|\.(rump|RUMP)'
+_SYMQUIRK="|PF_funcs"
+.endif
+
+#
+# Prefix quirks.  At least one toolchain generates global
+# symbols with prefixes which really need to remain as prefixes
+# (i.e. the '.' on the front of some ppc64 globals).  The
+# way to know if you have the problem is if you get later
+# complaints about symbols like 'rumpns_XrumpBLAH' or 'XrumpBLAH';
+# the 'X' part was added by the toolchain and will need to
+# be mentioned here.
+# 
+.if ${MACHINE_ARCH} == "powerpc64"
+_PQ="\.?"
+.else
+_PQ=
 .endif
 
 rump_symren: __archivebuild
@@ -94,8 +109,8 @@
        ${AR} ${_ARFL} ${.TARGET} `NM=${NM} ${LORDER} ${.ALLSRC:M*o} | ${TSORT}`
 .endif
        ${NM} -go ${RUMP_SYMREN:U${.TARGET}} | ${TOOL_AWK} '    \
-           $$NF!~/^(rump|RUMP|__|_GLOBAL_OFFSET_TABLE'${_SYMQUIRK}')/ \
-             {printf "%s rumpns_%s\n", $$NF, $$NF}' \
+           $$NF!~/^'${_PQ}'(rump|RUMP|__|_GLOBAL_OFFSET_TABLE'${_SYMQUIRK}')/ \
+             {s = $$NF; sub(/^'${_PQ}'/, "&rumpns_", s); print $$NF, s}' \
            | sort | uniq  > renametab.${.TARGET}
        ${OBJCOPY} --preserve-dates --redefine-syms \
            renametab.${.TARGET} ${RUMP_SYMREN:U${.TARGET}}