Module Name: src
Committed By: matt
Date: Thu Aug 22 16:03:31 UTC 2013
Modified Files:
src/external/gpl3/gcc/lib/libstdc++-v3: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/backward: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/debug: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/decimal: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/ext: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/parallel: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1_impl: Makefile
Added Files:
src/external/gpl3/gcc/lib/libstdc++-v3: Makefile.inc
src/external/gpl3/gcc/lib/libstdc++-v3/include: Makefile.inc
Log Message:
Make earmv5 work.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/backward/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/debug/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/decimal/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/ext/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/parallel/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1_impl/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/lib/libstdc++-v3/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.5 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.6
--- src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.5 Tue Aug 9 13:00:04 2011
+++ src/external/gpl3/gcc/lib/libstdc++-v3/Makefile Thu Aug 22 16:03:30 2013
@@ -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 @@ UNSUPPORTED_COMPILER.clang= # defined
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 @@ SRCS= ${LIBSUPCXXSRCS} ${LIBSTDCXXSRCS}
#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 @@ CLEANFILES+= unwind.h
${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
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile:1.5 src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile:1.6
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile:1.5 Fri Jul 1 01:21:38 2011
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile Thu Aug 22 16:03:30 2013
@@ -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
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/backward/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/backward/Makefile:1.2 src/external/gpl3/gcc/lib/libstdc++-v3/include/backward/Makefile:1.3
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/backward/Makefile:1.2 Thu Jun 23 11:47:12 2011
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/backward/Makefile Thu Aug 22 16:03:30 2013
@@ -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
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile:1.5 src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile:1.6
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile:1.5 Tue Apr 30 20:45:41 2013
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile Thu Aug 22 16:03:31 2013
@@ -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 @@ c++locale.h: ${CONF}/locale/generic/c_lo
# 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 \
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/debug/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/debug/Makefile:1.2 src/external/gpl3/gcc/lib/libstdc++-v3/include/debug/Makefile:1.3
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/debug/Makefile:1.2 Thu Jun 23 11:47:13 2011
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/debug/Makefile Thu Aug 22 16:03:31 2013
@@ -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
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/decimal/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/decimal/Makefile:1.1 src/external/gpl3/gcc/lib/libstdc++-v3/include/decimal/Makefile:1.2
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/decimal/Makefile:1.1 Fri Jul 1 01:21:38 2011
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/decimal/Makefile Thu Aug 22 16:03:31 2013
@@ -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
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/ext/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/ext/Makefile:1.3 src/external/gpl3/gcc/lib/libstdc++-v3/include/ext/Makefile:1.4
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/ext/Makefile:1.3 Tue Jun 28 04:07:04 2011
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/ext/Makefile Thu Aug 22 16:03:31 2013
@@ -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
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/parallel/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/parallel/Makefile:1.1 src/external/gpl3/gcc/lib/libstdc++-v3/include/parallel/Makefile:1.2
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/parallel/Makefile:1.1 Fri Jul 1 01:21:38 2011
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/parallel/Makefile Thu Aug 22 16:03:31 2013
@@ -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
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1/Makefile:1.2 src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1/Makefile:1.3
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1/Makefile:1.2 Thu Jun 23 11:47:13 2011
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1/Makefile Thu Aug 22 16:03:31 2013
@@ -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
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1_impl/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1_impl/Makefile:1.1 src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1_impl/Makefile:1.2
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1_impl/Makefile:1.1 Fri Jul 1 01:21:39 2011
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1_impl/Makefile Thu Aug 22 16:03:31 2013
@@ -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
Added files:
Index: src/external/gpl3/gcc/lib/libstdc++-v3/Makefile.inc
diff -u /dev/null src/external/gpl3/gcc/lib/libstdc++-v3/Makefile.inc:1.1
--- /dev/null Thu Aug 22 16:03:31 2013
+++ src/external/gpl3/gcc/lib/libstdc++-v3/Makefile.inc Thu Aug 22 16:03:30 2013
@@ -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/}
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile.inc
diff -u /dev/null src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile.inc:1.1
--- /dev/null Thu Aug 22 16:03:31 2013
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile.inc Thu Aug 22 16:03:30 2013
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.inc,v 1.1 2013/08/22 16:03:30 matt Exp $
+
+.include "../Makefile.inc"
