[src/trunk]: src/external/gpl3/gcc/lib/libgcc For compat, use LIBGCC_MACHINE_...

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

details:   https://anonhg.NetBSD.org/src/rev/2125a91d548a
branches:  trunk
changeset: 784928:2125a91d548a
user:      matt <matt%NetBSD.org@localhost>
date:      Thu Feb 14 09:19:28 2013 +0000

description:
For compat, use LIBGCC_MACHINE_ARCH (which defaults to MACHINE_ARCH).
When generating .hidden stub, use ${COPTS}

diffstat:

 external/gpl3/gcc/lib/libgcc/Makefile.inc    |  30 ++++++++++++++-------------
 external/gpl3/gcc/lib/libgcc/libgcc/Makefile |   8 +++---
 2 files changed, 20 insertions(+), 18 deletions(-)

diffs (115 lines):

diff -r bbb4932f64b4 -r 2125a91d548a external/gpl3/gcc/lib/libgcc/Makefile.inc
--- a/external/gpl3/gcc/lib/libgcc/Makefile.inc Thu Feb 14 08:56:59 2013 +0000
+++ b/external/gpl3/gcc/lib/libgcc/Makefile.inc Thu Feb 14 09:19:28 2013 +0000
@@ -1,8 +1,10 @@
-#      $NetBSD: Makefile.inc,v 1.18 2013/02/03 01:59:55 matt Exp $
+#      $NetBSD: Makefile.inc,v 1.19 2013/02/14 09:19:28 matt Exp $
 
 .if ${MKGCC} != "no"
-.if exists(${.CURDIR}/../arch/${MACHINE_ARCH}.mk)
-.include "${.CURDIR}/../arch/${MACHINE_ARCH}.mk"
+LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH}
+#.info LIBGCC_MACHINE_ARCH=${LIBGCC_MACHINE_ARCH}
+.if exists(${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}.mk)
+.include "${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}.mk"
 .endif
 .endif
 
@@ -10,9 +12,9 @@
 
 DIST=          ${NETBSDSRCDIR}/external/gpl3/gcc/dist
 GNUHOSTDIST=   ${DIST}
-GCCARCH=       ${NETBSDSRCDIR}/external/gpl3/gcc/usr.bin/gcc/arch/${MACHINE_ARCH}
-GCCARCHLIBGCC= ${NETBSDSRCDIR}/external/gpl3/gcc/lib/libgcc/arch/${MACHINE_ARCH}
-GCCARCHXX=     ${NETBSDSRCDIR}/external/gpl3/gcc/lib/libstdc++-v3/arch/${MACHINE_ARCH}
+GCCARCH=       ${NETBSDSRCDIR}/external/gpl3/gcc/usr.bin/gcc/arch/${LIBGCC_MACHINE_ARCH}
+GCCARCHLIBGCC= ${NETBSDSRCDIR}/external/gpl3/gcc/lib/libgcc/arch/${LIBGCC_MACHINE_ARCH}
+GCCARCHXX=     ${NETBSDSRCDIR}/external/gpl3/gcc/lib/libstdc++-v3/arch/${LIBGCC_MACHINE_ARCH}
 
 GCPPFLAGS=     ${G_LIBGCC2_CFLAGS} ${G_USE_COLLECT2} ${G_INCLUDES}
 CPPFLAGS+=     -I${.CURDIR} -I${GCCARCHLIBGCC}
@@ -21,10 +23,10 @@
 CPPFLAGS+=     ${G_EXTRA_HEADERS:M/*:H:u:S/^/-I/g}
 CPPFLAGS+=     -I${DIST} -I${DIST}/gcc/cp -I${DIST}/gcc/config -I${GCCARCHXX} -I.
 
-.if ${MACHINE_ARCH} == "powerpc" || \
-    ${MACHINE_ARCH} == "sh3el" || \
-    ${MACHINE_ARCH} == "sh3eb" || \
-    ${MACHINE_ARCH} == "m68000"
+.if ${LIBGCC_MACHINE_ARCH} == "powerpc" || \
+    ${LIBGCC_MACHINE_ARCH} == "sh3el" || \
+    ${LIBGCC_MACHINE_ARCH} == "sh3eb" || \
+    ${LIBGCC_MACHINE_ARCH} == "m68000"
 _TRADITIONAL_CPP=
 COMPILE.S=     ${CC} ${AFLAGS} ${CPPFLAGS} -c
 .endif
@@ -77,7 +79,7 @@
 LIB1ASMFUNCS=  ${G_LIB1ASMFUNCS:=.S}
 .endif
 
-DPSRCS+=       ${.CURDIR}/../arch/${MACHINE_ARCH}.mk
+DPSRCS+=       ${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}.mk
 CLEANFILES+=   ${LIB2FUNCS} ${LIB2FUNCS_ST} ${LIB2DIVMOD} cs-tconfig.h
 .if !empty(G_LIB1ASMFUNCS)
 CLEANFILES+=   ${LIB1ASMFUNCS}
@@ -88,14 +90,14 @@
 .endfor
 
 # XXX
-.if (${MACHINE_ARCH} == "m68000" || ${MACHINE_ARCH} == "m68k")
+.if (${LIBGCC_MACHINE_ARCH} == "m68000" || ${LIBGCC_MACHINE_ARCH} == "m68k")
 CPICFLAGS:=
 BUILDSYMLINKS+=        ${DIST}/gcc/config/m68k/fpgnulib.c fpgnulib.c
 BUILDSYMLINKS+=        ${DIST}/gcc/config/m68k/fpgnulib.c xfgnulib.c
 CPPFLAGS.xfgnulib.c+=-DEXTFLOAT=1
 .endif
 
-.if ${MACHINE_ARCH} == "powerpc64"
+.if ${LIBGCC_MACHINE_ARCH} == "powerpc64"
 COPTS+=        -mlong-double-128
 .endif
 
@@ -170,6 +172,6 @@
 .endif
 
 # XXX
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 45 && ${MACHINE_ARCH} == "m68k"
+.if defined(HAVE_GCC) && ${HAVE_GCC} == 45 && ${LIBGCC_MACHINE_ARCH} == "m68k"
 COPTS._fixunsxfdi.c+=  -O0
 .endif
diff -r bbb4932f64b4 -r 2125a91d548a external/gpl3/gcc/lib/libgcc/libgcc/Makefile
--- a/external/gpl3/gcc/lib/libgcc/libgcc/Makefile      Thu Feb 14 08:56:59 2013 +0000
+++ b/external/gpl3/gcc/lib/libgcc/libgcc/Makefile      Thu Feb 14 09:19:28 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.10 2012/08/06 02:34:28 matt Exp $
+#      $NetBSD: Makefile,v 1.11 2013/02/14 09:19:28 matt Exp $
 
 REQUIRETOOLS=  yes
 NOLINT=                # defined
@@ -23,7 +23,7 @@
                ${G_LIB2ADD_HACK:T:S/.asm/.S/} ${G_LIB2ADD:T:S/.asm/.S/} \
                ${G_LIB2ADD_ST} ${LIB1ASMFUNCS}
 .if ${MKPIC} == "no"
-.if ${MACHINE_ARCH} != "earm" && ${MACHINE_ARCH} != "earmeb"
+.if ${LIBGCC_MACHINE_ARCH:Mearm*} == ""
 SRCS+=         ${LIB2_EH} ${LIB2_EHASM}
 .endif
 .else
@@ -34,7 +34,7 @@
 # gcc/config/$PLATFORM/foo.asm to it.  So far, only rs6000 uses it,
 # so we hack it for now.
 #.for file in ${G_LIB2ADD_ST}
-.   if ${MACHINE_ARCH} == "powerpc"  # XXX XXX why does the above work?*
+.   if ${LIBGCC_MACHINE_ARCH} == "powerpc"  # XXX XXX why does the above work?*
 .for file in crtsavfpr.S crtresfpr.S crtsavgpr.S crtresgpr.S crtresxfpr.S crtresxgpr.S
 BUILDSYMLINKS+=        ${GNUHOSTDIST}/gcc/config/rs6000/${file:S/.S$/.asm/} ${file}
 .endfor
@@ -70,7 +70,7 @@
        ${COMPILE.S} ${CAPICFLAGS} ${CFLAGS:M-[ID]*} ${.IMPSRC} -o ${.TARGET}.tmp1
        ${NM} -pg ${.TARGET}.tmp1 | \
            ${TOOL_AWK} 'NF == 3 { print "\t.hidden", $$3 }' | \
-           ${CC} -Wl,-x -r -nostdinc -nostdlib -o ${.TARGET}.tmp2 ${.TARGET}.tmp1 -xassembler -
+           ${CC} ${COPTS} -Wl,-x -r -nostdinc -nostdlib -o ${.TARGET}.tmp2 ${.TARGET}.tmp1 -xassembler -
 .if defined(COPTS) && !empty(COPTS:M*-g*)
        mv ${.TARGET}.tmp2 ${.TARGET}
 .else