[src/trunk]: src/external/gpl3/gcc/lib/libgcc/libgcc force on -DPIC and re-ap...

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

details:   https://anonhg.NetBSD.org/src/rev/b980278804f2
branches:  trunk
changeset: 770282:b980278804f2
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Oct 11 03:10:26 2011 +0000

description:
force on -DPIC and re-apply the old .pico rules again.

i'd expect this to help hppa/sh3 builds, but it doesn't entirely.
it does get the related command lines much closer though.

diffstat:

 external/gpl3/gcc/lib/libgcc/libgcc/Makefile |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (45 lines):

diff -r ed34efd70630 -r b980278804f2 external/gpl3/gcc/lib/libgcc/libgcc/Makefile
--- a/external/gpl3/gcc/lib/libgcc/libgcc/Makefile      Mon Oct 10 23:14:48 2011 +0000
+++ b/external/gpl3/gcc/lib/libgcc/libgcc/Makefile      Tue Oct 11 03:10:26 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2011/10/07 09:15:21 mrg Exp $
+#      $NetBSD: Makefile,v 1.6 2011/10/11 03:10:26 mrg Exp $
 
 REQUIRETOOLS=  yes
 NOLINT=                # defined
@@ -21,6 +21,8 @@
                ${G_LIB2ADD_HACK:T:S/.asm/.S/} ${G_LIB2ADD:T:S/.asm/.S/} ${G_LIB2ADD_ST} ${LIB1ASMFUNCS}
 .if ${MKPIC} == "no"
 SRCS+=         ${LIB2_EH}
+.else
+CPPFLAGS+=     -DPIC
 .endif
 
 # These usually just have "foo.S", we need to link from the
@@ -33,6 +35,8 @@
 .endfor
 .   endif
 
+# Force building libgcc.a.  It will be PIC from -DPIC above and also
+# the -fpic/-FPIC present in ${G_LIBGCC2_CFLAGS}.
 MKPIC:= no
 
 .include <bsd.lib.mk>
@@ -40,7 +44,7 @@
 
 CLEANFILES+=   ${SOBJS:=.tmp1} ${SOBJS:=.tmp2}
 
-.c.pico:
+.c.o:
        ${_MKTARGET_COMPILE}
        ${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}.tmp1
        ${NM} -pg ${.TARGET}.tmp1 | \
@@ -54,7 +58,7 @@
 .endif
        rm -f ${.TARGET}.tmp1
 
-.S.pico .s.pico:
+.S.o .s.o:
        ${_MKTARGET_COMPILE}
        ${COMPILE.S} ${CAPICFLAGS} ${CFLAGS:M-[ID]*} ${.IMPSRC} -o ${.TARGET}.tmp1
        ${NM} -pg ${.TARGET}.tmp1 | \