[src/trunk]: src/external/gpl3/gcc/lib/libstdc++-v3 Make earmv5 work.

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

details:   https://anonhg.NetBSD.org/src/rev/1e2dd954e3c6
branches:  trunk
changeset: 789567:1e2dd954e3c6
user:      matt <matt%NetBSD.org@localhost>
date:      Thu Aug 22 16:03:30 2013 +0000

description:
Make earmv5 work.

diffstat:

 external/gpl3/gcc/lib/libstdc++-v3/Makefile                  |  14 ++++++-----
 external/gpl3/gcc/lib/libstdc++-v3/Makefile.inc              |   3 ++
 external/gpl3/gcc/lib/libstdc++-v3/include/Makefile          |   5 ++-
 external/gpl3/gcc/lib/libstdc++-v3/include/Makefile.inc      |   3 ++
 external/gpl3/gcc/lib/libstdc++-v3/include/backward/Makefile |   5 ++-
 external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile     |  11 +++++----
 external/gpl3/gcc/lib/libstdc++-v3/include/debug/Makefile    |   5 ++-
 external/gpl3/gcc/lib/libstdc++-v3/include/decimal/Makefile  |   5 ++-
 external/gpl3/gcc/lib/libstdc++-v3/include/ext/Makefile      |   5 ++-
 external/gpl3/gcc/lib/libstdc++-v3/include/parallel/Makefile |   5 ++-
 external/gpl3/gcc/lib/libstdc++-v3/include/tr1/Makefile      |   5 ++-
 external/gpl3/gcc/lib/libstdc++-v3/include/tr1_impl/Makefile |   5 ++-
 12 files changed, 44 insertions(+), 27 deletions(-)

diffs (219 lines):

diff -r 636f47b9bfbf -r 1e2dd954e3c6 external/gpl3/gcc/lib/libstdc++-v3/Makefile
--- a/external/gpl3/gcc/lib/libstdc++-v3/Makefile       Thu Aug 22 15:53:05 2013 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/Makefile       Thu Aug 22 16:03:30 2013 +0000
@@ -1,10 +1,12 @@
-#      $NetBSD: Makefile,v 1.5 2011/08/09 13:00:04 joerg Exp $
+#      $NetBSD: Makefile,v 1.6 2013/08/22 16:03:30 matt Exp $
 
 REQUIRETOOLS=  yes
 NOLINT=                # defined
 
 .include <bsd.own.mk>
 
+.include "Makefile.inc"
+
 LIB=           stdc++
 LDADD=         -lgcc_s
 
@@ -14,8 +16,8 @@
 CWARNFLAGS.clang+=     -Wno-logical-op-parentheses \
                        -Wno-deprecated-writable-strings -Wno-parentheses
 
-.if exists(${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk) && ${MKGCC} != "no"
-.include "${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk"
+.if exists(${.CURDIR}/arch/${GCC_MACHINE_ARCH}/defs.mk) && ${MKGCC} != "no"
+.include "${.CURDIR}/arch/${GCC_MACHINE_ARCH}/defs.mk"
 
 SHLIB_MAJOR=   7
 SHLIB_MINOR=   1
@@ -30,7 +32,7 @@
 #CXXFLAGS+=    -ffunction-sections -fdata-sections 
 CXXFLAGS+=     -fno-implicit-templates -fdiagnostics-show-location=once
 CPPFLAGS+=     -I${DIST}/libstdc++-v3/include
-CPPFLAGS+=     -I${.CURDIR}/arch/${MACHINE_ARCH}
+CPPFLAGS+=     -I${.CURDIR}/arch/${GCC_MACHINE_ARCH}
 
 CONF=          ${DIST}/libstdc++-v3/config
 
@@ -150,9 +152,9 @@
        ${DIST}/libstdc++-v3/libsupc++ \
        ${DIST}/libiberty \
        ${CONF}/locale/generic \
-       ${.CURDIR}/arch/${MACHINE_ARCH}
+       ${.CURDIR}/arch/${GCC_MACHINE_ARCH}
 
-${OBJS}: ${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk
+${OBJS}: ${.CURDIR}/arch/${GCC_MACHINE_ARCH}/defs.mk
 .else
 .include <bsd.prog.mk> # do nothing
 .endif
diff -r 636f47b9bfbf -r 1e2dd954e3c6 external/gpl3/gcc/lib/libstdc++-v3/Makefile.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/Makefile.inc   Thu Aug 22 16:03:30 2013 +0000
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.inc,v 1.1 2013/08/22 16:03:30 matt Exp $
+
+GCC_MACHINE_ARCH=${MACHINE_ARCH:S/earmv5/earm/}
diff -r 636f47b9bfbf -r 1e2dd954e3c6 external/gpl3/gcc/lib/libstdc++-v3/include/Makefile
--- a/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile       Thu Aug 22 15:53:05 2013 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile       Thu Aug 22 16:03:30 2013 +0000
@@ -1,11 +1,12 @@
-#      $NetBSD: Makefile,v 1.5 2011/07/01 01:21:38 mrg Exp $
+#      $NetBSD: Makefile,v 1.6 2013/08/22 16:03:30 matt Exp $
 
 SUBDIR=                backward ext bits debug decimal parallel tr1 tr1_impl
 #SUBDIR+=      pb_assoc
 
+.include <bsd.init.mk>
 .include <bsd.own.mk>
 
-.include "${.CURDIR}/../arch/${MACHINE_ARCH}/defs.mk"
+.include "${.CURDIR}/../arch/${GCC_MACHINE_ARCH}/defs.mk"
 
 .cc: # disable .cc->NULL transform
 
diff -r 636f47b9bfbf -r 1e2dd954e3c6 external/gpl3/gcc/lib/libstdc++-v3/include/Makefile.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile.inc   Thu Aug 22 16:03:30 2013 +0000
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.inc,v 1.1 2013/08/22 16:03:30 matt Exp $
+
+.include "../Makefile.inc"
diff -r 636f47b9bfbf -r 1e2dd954e3c6 external/gpl3/gcc/lib/libstdc++-v3/include/backward/Makefile
--- a/external/gpl3/gcc/lib/libstdc++-v3/include/backward/Makefile      Thu Aug 22 15:53:05 2013 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/include/backward/Makefile      Thu Aug 22 16:03:30 2013 +0000
@@ -1,8 +1,9 @@
-#      $NetBSD: Makefile,v 1.2 2011/06/23 11:47:12 mrg Exp $
+#      $NetBSD: Makefile,v 1.3 2013/08/22 16:03:30 matt Exp $
 
 .include <bsd.own.mk>
+.include <bsd.init.mk>
 
-.include "${.CURDIR}/../../arch/${MACHINE_ARCH}/defs.mk"
+.include "${.CURDIR}/../../arch/${GCC_MACHINE_ARCH}/defs.mk"
 
 .cc: # disable .cc->NULL transform
 
diff -r 636f47b9bfbf -r 1e2dd954e3c6 external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile
--- a/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile  Thu Aug 22 15:53:05 2013 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile  Thu Aug 22 16:03:30 2013 +0000
@@ -1,8 +1,9 @@
-#      $NetBSD: Makefile,v 1.5 2013/04/30 20:45:41 skrll Exp $
+#      $NetBSD: Makefile,v 1.6 2013/08/22 16:03:31 matt Exp $
 
 .include <bsd.own.mk>
+.include <bsd.init.mk>
 
-.include "${.CURDIR}/../../arch/${MACHINE_ARCH}/defs.mk"
+.include "${.CURDIR}/../../arch/${GCC_MACHINE_ARCH}/defs.mk"
 
 .cc: # disable .cc->NULL transform
 
@@ -26,14 +27,14 @@
 # mknative?
 BITS_CPUDIR.sparc64=sparc
 
-_DIR=${BITS_CPUDIR.${MACHINE_ARCH}}
+_DIR=${BITS_CPUDIR.${GCC_MACHINE_ARCH}}
 .if ${_DIR} != ""
-BITS_CPUDIR=${BITS_CPUDIR.${MACHINE_ARCH}}
+BITS_CPUDIR=${BITS_CPUDIR.${GCC_MACHINE_ARCH}}
 .else
 BITS_CPUDIR=${MACHINE_GNU_ARCH}
 .endif
 
-.PATH: ${.CURDIR}/../../arch/${MACHINE_ARCH} \
+.PATH: ${.CURDIR}/../../arch/${GCC_MACHINE_ARCH} \
        ${DIST}/libstdc++-v3/include/bits \
        ${DIST}/libstdc++-v3/include/c_std \
        ${DIST}/libstdc++-v3/include/precompiled \
diff -r 636f47b9bfbf -r 1e2dd954e3c6 external/gpl3/gcc/lib/libstdc++-v3/include/debug/Makefile
--- a/external/gpl3/gcc/lib/libstdc++-v3/include/debug/Makefile Thu Aug 22 15:53:05 2013 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/include/debug/Makefile Thu Aug 22 16:03:30 2013 +0000
@@ -1,8 +1,9 @@
-#      $NetBSD: Makefile,v 1.2 2011/06/23 11:47:13 mrg Exp $
+#      $NetBSD: Makefile,v 1.3 2013/08/22 16:03:31 matt Exp $
 
 .include <bsd.own.mk>
+.include <bsd.init.mk>
 
-.include "${.CURDIR}/../../arch/${MACHINE_ARCH}/defs.mk"
+.include "${.CURDIR}/../../arch/${GCC_MACHINE_ARCH}/defs.mk"
 
 .cc: # disable .cc->NULL transform
 
diff -r 636f47b9bfbf -r 1e2dd954e3c6 external/gpl3/gcc/lib/libstdc++-v3/include/decimal/Makefile
--- a/external/gpl3/gcc/lib/libstdc++-v3/include/decimal/Makefile       Thu Aug 22 15:53:05 2013 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/include/decimal/Makefile       Thu Aug 22 16:03:30 2013 +0000
@@ -1,8 +1,9 @@
-#      $NetBSD: Makefile,v 1.1 2011/07/01 01:21:38 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2013/08/22 16:03:31 matt Exp $
 
 .include <bsd.own.mk>
+.include <bsd.init.mk>
 
-.include "${.CURDIR}/../../arch/${MACHINE_ARCH}/defs.mk"
+.include "${.CURDIR}/../../arch/${GCC_MACHINE_ARCH}/defs.mk"
 
 .cc: # disable .cc->NULL transform
 
diff -r 636f47b9bfbf -r 1e2dd954e3c6 external/gpl3/gcc/lib/libstdc++-v3/include/ext/Makefile
--- a/external/gpl3/gcc/lib/libstdc++-v3/include/ext/Makefile   Thu Aug 22 15:53:05 2013 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/include/ext/Makefile   Thu Aug 22 16:03:30 2013 +0000
@@ -1,8 +1,9 @@
-#      $NetBSD: Makefile,v 1.3 2011/06/28 04:07:04 mrg Exp $
+#      $NetBSD: Makefile,v 1.4 2013/08/22 16:03:31 matt Exp $
 
 .include <bsd.own.mk>
+.include <bsd.init.mk>
 
-.include "${.CURDIR}/../../arch/${MACHINE_ARCH}/defs.mk"
+.include "${.CURDIR}/../../arch/${GCC_MACHINE_ARCH}/defs.mk"
 
 .cc: # disable .cc->NULL transform
 
diff -r 636f47b9bfbf -r 1e2dd954e3c6 external/gpl3/gcc/lib/libstdc++-v3/include/parallel/Makefile
--- a/external/gpl3/gcc/lib/libstdc++-v3/include/parallel/Makefile      Thu Aug 22 15:53:05 2013 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/include/parallel/Makefile      Thu Aug 22 16:03:30 2013 +0000
@@ -1,8 +1,9 @@
-#      $NetBSD: Makefile,v 1.1 2011/07/01 01:21:38 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2013/08/22 16:03:31 matt Exp $
 
 .include <bsd.own.mk>
+.include <bsd.init.mk>
 
-.include "${.CURDIR}/../../arch/${MACHINE_ARCH}/defs.mk"
+.include "${.CURDIR}/../../arch/${GCC_MACHINE_ARCH}/defs.mk"
 
 .cc: # disable .cc->NULL transform
 
diff -r 636f47b9bfbf -r 1e2dd954e3c6 external/gpl3/gcc/lib/libstdc++-v3/include/tr1/Makefile
--- a/external/gpl3/gcc/lib/libstdc++-v3/include/tr1/Makefile   Thu Aug 22 15:53:05 2013 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/include/tr1/Makefile   Thu Aug 22 16:03:30 2013 +0000
@@ -1,8 +1,9 @@
-#      $NetBSD: Makefile,v 1.2 2011/06/23 11:47:13 mrg Exp $
+#      $NetBSD: Makefile,v 1.3 2013/08/22 16:03:31 matt Exp $
 
 .include <bsd.own.mk>
+.include <bsd.init.mk>
 
-.include "${.CURDIR}/../../arch/${MACHINE_ARCH}/defs.mk"
+.include "${.CURDIR}/../../arch/${GCC_MACHINE_ARCH}/defs.mk"
 
 .cc: # disable .cc->NULL transform
 
diff -r 636f47b9bfbf -r 1e2dd954e3c6 external/gpl3/gcc/lib/libstdc++-v3/include/tr1_impl/Makefile
--- a/external/gpl3/gcc/lib/libstdc++-v3/include/tr1_impl/Makefile      Thu Aug 22 15:53:05 2013 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/include/tr1_impl/Makefile      Thu Aug 22 16:03:30 2013 +0000
@@ -1,8 +1,9 @@
-#      $NetBSD: Makefile,v 1.1 2011/07/01 01:21:39 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2013/08/22 16:03:31 matt Exp $
 
 .include <bsd.own.mk>
+.include <bsd.init.mk>
 
-.include "${.CURDIR}/../../arch/${MACHINE_ARCH}/defs.mk"
+.include "${.CURDIR}/../../arch/${GCC_MACHINE_ARCH}/defs.mk"
 
 .cc: # disable .cc->NULL transform