[src/trunk]: src/external/gpl3/gcc/lib Skip assembler helpers when using HAVE...

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

details:   https://anonhg.NetBSD.org/src/rev/e82e38ebce32
branches:  trunk
changeset: 329214:e82e38ebce32
user:      joerg <joerg%NetBSD.org@localhost>
date:      Thu May 15 14:37:08 2014 +0000

description:
Skip assembler helpers when using HAVE_LIBGCC_EH=no. Always use the
generic unwind.h version in that case, even on ARM.

diffstat:

 external/gpl3/gcc/lib/libgcc/Makefile.inc   |  8 +++++---
 external/gpl3/gcc/lib/libobjc/Makefile      |  6 +++++-
 external/gpl3/gcc/lib/libstdc++-v3/Makefile |  6 +++++-
 external/gpl3/gcc/lib/libsupc++/Makefile    |  6 +++++-
 4 files changed, 20 insertions(+), 6 deletions(-)

diffs (85 lines):

diff -r f36d676ba224 -r e82e38ebce32 external/gpl3/gcc/lib/libgcc/Makefile.inc
--- a/external/gpl3/gcc/lib/libgcc/Makefile.inc Thu May 15 12:53:52 2014 +0000
+++ b/external/gpl3/gcc/lib/libgcc/Makefile.inc Thu May 15 14:37:08 2014 +0000
@@ -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_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}
+LIB2_EHASM=    ${G_LIB2ADDEH:M*.S:T}
 .endif
-LIB2_EHASM=    ${G_LIB2ADDEH:M*.S:T}
 
 # We have to weed out any existing func.S file that may exist
 # from the list of files we create.
diff -r f36d676ba224 -r e82e38ebce32 external/gpl3/gcc/lib/libobjc/Makefile
--- a/external/gpl3/gcc/lib/libobjc/Makefile    Thu May 15 12:53:52 2014 +0000
+++ b/external/gpl3/gcc/lib/libobjc/Makefile    Thu May 15 14:37:08 2014 +0000
@@ -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 @@
 
 ${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}
diff -r f36d676ba224 -r e82e38ebce32 external/gpl3/gcc/lib/libstdc++-v3/Makefile
--- a/external/gpl3/gcc/lib/libstdc++-v3/Makefile       Thu May 15 12:53:52 2014 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/Makefile       Thu May 15 14:37:08 2014 +0000
@@ -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 @@
        ${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}
diff -r f36d676ba224 -r e82e38ebce32 external/gpl3/gcc/lib/libsupc++/Makefile
--- a/external/gpl3/gcc/lib/libsupc++/Makefile  Thu May 15 12:53:52 2014 +0000
+++ b/external/gpl3/gcc/lib/libsupc++/Makefile  Thu May 15 14:37:08 2014 +0000
@@ -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 @@
 
 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}