[src/netbsd-2-0]: src/gnu/lib/libgcc3/libgcc_s Pull up revision 1.7 (requeste...

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

details:   https://anonhg.NetBSD.org/src/rev/4c9d11199b62
branches:  netbsd-2-0
changeset: 562093:4c9d11199b62
user:      he <he%NetBSD.org@localhost>
date:      Fri Jul 16 21:07:43 2004 +0000

description:
Pull up revision 1.7 (requested by skrll in ticket #668):
  Do the same thing as stock gcc, by using the symbol
  versioning script to remove certain symbols from the
  dynamic symbol table, and pull in libgcc_pic in the
  -shared-libgcc case for the millicode platforms.
  Fixes PR#22452.

diffstat:

 gnu/lib/libgcc3/libgcc_s/Makefile |  38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)

diffs (59 lines):

diff -r f05a9fed58a0 -r 4c9d11199b62 gnu/lib/libgcc3/libgcc_s/Makefile
--- a/gnu/lib/libgcc3/libgcc_s/Makefile Fri Jul 16 21:07:38 2004 +0000
+++ b/gnu/lib/libgcc3/libgcc_s/Makefile Fri Jul 16 21:07:43 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5.2.1 2004/04/29 04:28:55 jmc Exp $
+#      $NetBSD: Makefile,v 1.5.2.2 2004/07/16 21:07:43 he Exp $
 
 REQUIRETOOLS=  yes
 NOLINT=                # defined
@@ -21,31 +21,31 @@
 SHLIB_MINOR=   0
 
 LDFLAGS+=      -nodefaultlibs
-#LDFLAGS+=     -Wl,--version-script=${DIST}/libgcc/libgcc.map
+LDFLAGS+=      -Wl,--version-script=libgcc.map
 
 SRCS+=         ${LIB2FUNCS} ${LIB2DIVMOD} ${LIB2_EH} \
                ${G_LIB2ADD:T:S/.asm/.S/} ${LIB1ASMFUNCS}
 
+DPADD+=                libgcc.map
+CLEANFILES+=   libgcc.map
+
 .include <bsd.lib.mk>
 
-.if ${MACHINE_CPU} == "sh3"
-# make sure the millicode is not externally visible
-
-CLEANFILES+=   ${SOBJS:=.tmp1} ${SOBJS:=.tmp2}
+.if ${MKPICLIB} != "no"
+LIBGCC_S_OBJS= ${SOBJS}
+.else
+LIBGCC_S_OBJS= ${OBJS}
+.endif
 
-.S.so .s.so:
-       ${_MKTARGET_COMPILE}
-       ${COMPILE.S} ${CAPICFLAGS} ${CFLAGS:M-[ID]*} ${.IMPSRC} -o ${.TARGET}.tmp1
-       ${NM} -pg ${.TARGET}.tmp1 | ${AWK} 'NF == 3 { print "\t.hidden", $$3 }' | \
-           ${CC} -Wl,-x -r -nostdinc -nostdlib -o ${.TARGET}.tmp2 ${.TARGET}.tmp1 -xassembler -
-.if defined(COPTS) && !empty(COPTS:M*-g*)
-       mv ${.TARGET}.tmp2 ${.TARGET}
-.else
-       ${LD} -x -r ${.TARGET}.tmp2 -o ${.TARGET}
-       rm -f ${.TARGET}.tmp2
-.endif
-       rm -f ${.TARGET}.tmp1
-.endif
+libgcc.map:    ${LIBGCC_S_OBJS} ${G_SHLIB_MKMAP} ${G_SHLIB_MAPFILES}
+       { \
+               ${NM} ${G_SHLIB_NM_FLAGS} ${LIBGCC_S_OBJS}; \
+               echo %%; \
+               cat ${G_SHLIB_MAPFILES} | \
+                       sed -e "/^[     ]*#/d" -e 's/^%\(if\|else\|elif\|endif\|define\)/#\1/' | \
+                       ${CC} ${G_LIBGCC2_CFLAGS} ${G_INCLUDES} -E -xassembler-with-cpp -; \
+       } | ${AWK} -f ${G_SHLIB_MKMAP} > ${.TARGET}.tmp
+       mv ${.TARGET}.tmp ${.TARGET} 
 
 .else
 .include <bsd.prog.mk> # do nothing