Module Name: src
Committed By: joerg
Date: Thu May 15 14:37:08 UTC 2014
Modified Files:
src/external/gpl3/gcc/lib/libgcc: Makefile.inc
src/external/gpl3/gcc/lib/libobjc: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3: Makefile
src/external/gpl3/gcc/lib/libsupc++: Makefile
Log Message:
Skip assembler helpers when using HAVE_LIBGCC_EH=no. Always use the
generic unwind.h version in that case, even on ARM.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/external/gpl3/gcc/lib/libgcc/Makefile.inc
cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/gcc/lib/libobjc/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/lib/libsupc++/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/libgcc/Makefile.inc
diff -u src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.26 src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.27
--- src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.26 Sat May 3 16:43:10 2014
+++ src/external/gpl3/gcc/lib/libgcc/Makefile.inc Thu May 15 14:37:08 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.26 2014/05/03 16:43:10 martin Exp $
+# $NetBSD: Makefile.inc,v 1.27 2014/05/15 14:37:08 joerg Exp $
LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/}
@@ -92,11 +92,13 @@ LIB2FUNCS= ${LIB2FUNCS_SHORT:=.c}
LIB2FUNCS_ST= ${G_LIB2FUNCS_ST:=.c}
LIB2DIVMOD= ${LIB2_DIVMOD_FUNCS:=.c}
.if ${HAVE_LIBGCC_EH} == "no"
-LIB2_EH= ${G_LIB2ADDEH:M*.c:T:Nunwind-dw2.c:Nunwind-dw2-fde-dip.c:Nunwind-sjlj.c:Nunwind-c.c}
+LIB2_EH= ${G_LIB2ADDEH:M*.c:T:Nunwind-dw2.c:Nunwind-dw2-fde-dip.c:Nunwind-sjlj.c:Nunwind-c.c:Nunwind-arm.c:Npr-support.c}
+LIB2_EHASM= ${G_LIB2ADDEH:M*.S:T:Nlibunwind.S}
+G_CONFIGLINKS:= ${G_CONFIGLINKS:S,libgcc/config/arm/unwind-arm.h,libgcc/unwind-generic.h,}
.else
LIB2_EH= ${G_LIB2ADDEH:M*.c:T}
-.endif
LIB2_EHASM= ${G_LIB2ADDEH:M*.S:T}
+.endif
# We have to weed out any existing func.S file that may exist
# from the list of files we create.
Index: src/external/gpl3/gcc/lib/libobjc/Makefile
diff -u src/external/gpl3/gcc/lib/libobjc/Makefile:1.11 src/external/gpl3/gcc/lib/libobjc/Makefile:1.12
--- src/external/gpl3/gcc/lib/libobjc/Makefile:1.11 Fri Mar 14 12:17:53 2014
+++ src/external/gpl3/gcc/lib/libobjc/Makefile Thu May 15 14:37:08 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2014/03/14 12:17:53 christos Exp $
+# $NetBSD: Makefile,v 1.12 2014/05/15 14:37:08 joerg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -76,6 +76,10 @@ ${OBJS} ${POBJS} ${SOBJS}: runtime-info.
${SRCS}: tconfig.h options.h
+.if ${HAVE_LIBGCC_EH} == "no"
+G_CONFIGLINKS:= ${G_CONFIGLINKS:S,libgcc/config/arm/unwind-arm.h,libgcc/unwind-generic.h,}
+.endif
+
.if ${MKGCC} != "no"
.if defined(G_CONFIGLINKS) && !empty(G_CONFIGLINKS)
BUILDSYMLINKS+= ${G_CONFIGLINKS}
Index: src/external/gpl3/gcc/lib/libstdc++-v3/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.9 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.10
--- src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.9 Sat Mar 1 10:00:45 2014
+++ src/external/gpl3/gcc/lib/libstdc++-v3/Makefile Thu May 15 14:37:08 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2014/03/01 10:00:45 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2014/05/15 14:37:08 joerg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -110,6 +110,10 @@ BUILDSYMLINKS+= \
${DIST}/libiberty/cp-demangle.c cp-demangle.c \
${DIST}/libiberty/cp-demangle.h cp-demangle.h
+.if ${HAVE_LIBGCC_EH} == "no"
+G_CONFIGLINKS:= ${G_CONFIGLINKS:S,libgcc/config/arm/unwind-arm.h,libgcc/unwind-generic.h,}
+.endif
+
.if ${MKGCC} != "no"
.if defined(G_CONFIGLINKS) && !empty(G_CONFIGLINKS)
BUILDSYMLINKS+= ${G_CONFIGLINKS}
Index: src/external/gpl3/gcc/lib/libsupc++/Makefile
diff -u src/external/gpl3/gcc/lib/libsupc++/Makefile:1.7 src/external/gpl3/gcc/lib/libsupc++/Makefile:1.8
--- src/external/gpl3/gcc/lib/libsupc++/Makefile:1.7 Sat Mar 1 10:00:48 2014
+++ src/external/gpl3/gcc/lib/libsupc++/Makefile Thu May 15 14:37:08 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2014/03/01 10:00:48 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2014/05/15 14:37:08 joerg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -27,6 +27,10 @@ CXXFLAGS+= ${G_SECTION_FLAGS}
COPTS.cp-demangle.c = -Wno-stack-protector
+.if ${HAVE_LIBGCC_EH} == "no"
+G_CONFIGLINKS:= ${G_CONFIGLINKS:S,libgcc/config/arm/unwind-arm.h,libgcc/unwind-generic.h,}
+.endif
+
.if ${MKGCC} != "no"
.if defined(G_CONFIGLINKS) && !empty(G_CONFIGLINKS)
BUILDSYMLINKS+= ${G_CONFIGLINKS}
