[src/trunk]: src/external/gpl3/gcc/lib More evbarmv5 fixes.

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

details:   https://anonhg.NetBSD.org/src/rev/56239b714b78
branches:  trunk
changeset: 789574:56239b714b78
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Aug 23 05:02:46 2013 +0000

description:
More evbarmv5 fixes.

diffstat:

 external/gpl3/gcc/lib/libgomp/Makefile          |   4 ++--
 external/gpl3/gcc/lib/libsupc++/Makefile        |  12 +++++++-----
 external/gpl3/gcc/lib/libsupc++/Makefile.common |   6 ++++--
 3 files changed, 13 insertions(+), 9 deletions(-)

diffs (77 lines):

diff -r 876326b6e1c3 -r 56239b714b78 external/gpl3/gcc/lib/libgomp/Makefile
--- a/external/gpl3/gcc/lib/libgomp/Makefile    Fri Aug 23 00:22:16 2013 +0000
+++ b/external/gpl3/gcc/lib/libgomp/Makefile    Fri Aug 23 05:02:46 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2013/08/22 00:16:54 matt Exp $
+#      $NetBSD: Makefile,v 1.9 2013/08/23 05:02:46 matt Exp $
 
 # build GCC's libgomp, so that -fopenmp works.
 
@@ -60,7 +60,7 @@
 
 .PATH: ${ARCHDIR} ${DIST}/libgomp ${DIST}/libgomp/config/posix
 
-.if ${GOMP_MACHINE_ARCH} == ${MACHINE_ARCH}
+.if ${GOMP_MACHINE_ARCH} == ${MACHINE_ARCH:S/earmv5/earm/}
 # This is where GCC looks for it.
 FILES=         libgomp.spec
 FILESDIR=      ${LIBDIR}
diff -r 876326b6e1c3 -r 56239b714b78 external/gpl3/gcc/lib/libsupc++/Makefile
--- a/external/gpl3/gcc/lib/libsupc++/Makefile  Fri Aug 23 00:22:16 2013 +0000
+++ b/external/gpl3/gcc/lib/libsupc++/Makefile  Fri Aug 23 05:02:46 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2011/08/09 13:00:04 joerg Exp $
+#      $NetBSD: Makefile,v 1.5 2013/08/23 05:02:46 matt Exp $
 
 REQUIRETOOLS=  yes
 NOLINT=                # defined
@@ -10,10 +10,12 @@
 
 .include <bsd.own.mk>
 
+GCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/}
+
 LIB=           supc++
 
-.if exists(${.CURDIR}/../libstdc++-v3/arch/${MACHINE_ARCH}/defs.mk) && ${MKGCC} != "no"
-.include "${.CURDIR}/../libstdc++-v3/arch/${MACHINE_ARCH}/defs.mk"
+.if exists(${.CURDIR}/../libstdc++-v3/arch/${GCC_MACHINE_ARCH}/defs.mk) && ${MKGCC} != "no"
+.include "${.CURDIR}/../libstdc++-v3/arch/${GCC_MACHINE_ARCH}/defs.mk"
 
 SHLIB_MAJOR=   1
 SHLIB_MINOR=   0
@@ -37,9 +39,9 @@
 .PATH: ${DIST}/libstdc++-v3/src \
        ${DIST}/libstdc++-v3/libsupc++ \
        ${DIST}/libiberty \
-       ${.CURDIR}/../libstdc++-v3/arch/${MACHINE_ARCH}
+       ${.CURDIR}/../libstdc++-v3/arch/${GCC_MACHINE_ARCH}
 
-${OBJS}: ${.CURDIR}/../libstdc++-v3/arch/${MACHINE_ARCH}/defs.mk
+${OBJS}: ${.CURDIR}/../libstdc++-v3/arch/${GCC_MACHINE_ARCH}/defs.mk
 .else
 .include <bsd.prog.mk> # do nothing
 .endif
diff -r 876326b6e1c3 -r 56239b714b78 external/gpl3/gcc/lib/libsupc++/Makefile.common
--- a/external/gpl3/gcc/lib/libsupc++/Makefile.common   Fri Aug 23 00:22:16 2013 +0000
+++ b/external/gpl3/gcc/lib/libsupc++/Makefile.common   Fri Aug 23 05:02:46 2013 +0000
@@ -1,15 +1,17 @@
-#      $NetBSD: Makefile.common,v 1.3 2011/06/28 04:03:16 mrg Exp $
+#      $NetBSD: Makefile.common,v 1.4 2013/08/23 05:02:46 matt Exp $
 
 DIST=          ${NETBSDSRCDIR}/external/gpl3/gcc/dist
 GNUHOSTDIST=   ${DIST}
 
+GCC_MACHINE_ARCH=${MACHINE_ARCH:S/earmv5/earm/}
+
 LIBSTDCXXSRCS= ${G_SRC_SOURCES}
 LIBSUPCXXSRCS= ${G_LIBSUPCXX_SOURCES} ${G_LIBSUPCXX_C_SOURCES}
 
 CPPFLAGS+=     -I${DIST}/gcc
 CPPFLAGS+=     -I${DIST}/include
 CPPFLAGS+=     -I${DIST}/libstdc++-v3/libsupc++
-CPPFLAGS+=     -I${.CURDIR}/../libstdc++-v3_4/arch/${MACHINE_ARCH} -I.
+CPPFLAGS+=     -I${.CURDIR}/../libstdc++-v3_4/arch/${GCC_MACHINE_ARCH} -I.
 CPPFLAGS+=     -DHAVE_STDLIB_H -DHAVE_STRING_H
 
 CPPFLAGS.cp-demangle.c=-DIN_GLIBCPP_V3