Module Name: src
Committed By: matt
Date: Fri Aug 23 05:02:47 UTC 2013
Modified Files:
src/external/gpl3/gcc/lib/libgomp: Makefile
src/external/gpl3/gcc/lib/libsupc++: Makefile Makefile.common
Log Message:
More evbarmv5 fixes.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc/lib/libgomp/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/lib/libsupc++/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/lib/libsupc++/Makefile.common
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/libgomp/Makefile
diff -u src/external/gpl3/gcc/lib/libgomp/Makefile:1.8 src/external/gpl3/gcc/lib/libgomp/Makefile:1.9
--- src/external/gpl3/gcc/lib/libgomp/Makefile:1.8 Thu Aug 22 00:16:54 2013
+++ src/external/gpl3/gcc/lib/libgomp/Makefile Fri Aug 23 05:02:46 2013
@@ -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 @@ LDFLAGS+= -Wl,--version-script,${DIST}/l
.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}
Index: src/external/gpl3/gcc/lib/libsupc++/Makefile
diff -u src/external/gpl3/gcc/lib/libsupc++/Makefile:1.4 src/external/gpl3/gcc/lib/libsupc++/Makefile:1.5
--- src/external/gpl3/gcc/lib/libsupc++/Makefile:1.4 Tue Aug 9 13:00:04 2011
+++ src/external/gpl3/gcc/lib/libsupc++/Makefile Fri Aug 23 05:02:46 2013
@@ -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 @@ UNSUPPORTED_COMPILER.clang= # defined
.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 @@ CLEANFILES+= unwind.h
.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
Index: src/external/gpl3/gcc/lib/libsupc++/Makefile.common
diff -u src/external/gpl3/gcc/lib/libsupc++/Makefile.common:1.3 src/external/gpl3/gcc/lib/libsupc++/Makefile.common:1.4
--- src/external/gpl3/gcc/lib/libsupc++/Makefile.common:1.3 Tue Jun 28 04:03:16 2011
+++ src/external/gpl3/gcc/lib/libsupc++/Makefile.common Fri Aug 23 05:02:46 2013
@@ -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
