[src/trunk]: src/external/gpl3 For HAVE_LIBGCC_EH=no, skip libgcc's unwind code.

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

details:   https://anonhg.NetBSD.org/src/rev/01c21fd9ab84
branches:  trunk
changeset: 327941:01c21fd9ab84
user:      joerg <joerg%NetBSD.org@localhost>
date:      Fri Mar 21 20:54:13 2014 +0000

description:
For HAVE_LIBGCC_EH=no, skip libgcc's unwind code.

diffstat:

 external/gpl3/gcc.old/lib/libgcc/Makefile.inc       |  6 +++++-
 external/gpl3/gcc.old/lib/libgcc/libgcc_eh/Makefile |  4 ++--
 external/gpl3/gcc.old/lib/libgcc/libgcc_eh/empty.c  |  1 +
 external/gpl3/gcc/lib/libgcc/Makefile.inc           |  6 +++++-
 external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile     |  4 ++--
 external/gpl3/gcc/lib/libgcc/libgcc_eh/empty.c      |  1 +
 6 files changed, 16 insertions(+), 6 deletions(-)

diffs (88 lines):

diff -r c1f3628ae8c5 -r 01c21fd9ab84 external/gpl3/gcc.old/lib/libgcc/Makefile.inc
--- a/external/gpl3/gcc.old/lib/libgcc/Makefile.inc     Fri Mar 21 18:14:20 2014 +0000
+++ b/external/gpl3/gcc.old/lib/libgcc/Makefile.inc     Fri Mar 21 20:54:13 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.1.1.2 2014/02/26 10:57:30 mrg Exp $
+#      $NetBSD: Makefile.inc,v 1.2 2014/03/21 20:54:13 joerg Exp $
 
 .if ${MKGCC} != "no"
 LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/}
@@ -82,7 +82,11 @@
 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}
+.else
 LIB2_EH=       ${G_LIB2ADDEH:M*.c:T}
+.endif
 LIB2_EHASM=    ${G_LIB2ADDEH:M*.S:T}
 .if !empty(G_LIB1ASMFUNCS)
 LIB1ASMFUNCS=  ${G_LIB1ASMFUNCS:=.S}
diff -r c1f3628ae8c5 -r 01c21fd9ab84 external/gpl3/gcc.old/lib/libgcc/libgcc_eh/Makefile
--- a/external/gpl3/gcc.old/lib/libgcc/libgcc_eh/Makefile       Fri Mar 21 18:14:20 2014 +0000
+++ b/external/gpl3/gcc.old/lib/libgcc/libgcc_eh/Makefile       Fri Mar 21 20:54:13 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.1.2 2014/02/26 10:57:30 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2014/03/21 20:54:13 joerg Exp $
 
 REQUIRETOOLS=  yes
 NOLINT=                # defined
@@ -14,7 +14,7 @@
 
 .cc: # disable .cc->NULL transform
 
-SRCS+=         ${LIB2_EH} ${LIB2_EHASM}
+SRCS+=         ${LIB2_EH} ${LIB2_EHASM} empty.c
 COPTS.unwind-dw2.c = -Wno-stack-protector
 
 MKPIC:=        no
diff -r c1f3628ae8c5 -r 01c21fd9ab84 external/gpl3/gcc.old/lib/libgcc/libgcc_eh/empty.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl3/gcc.old/lib/libgcc/libgcc_eh/empty.c        Fri Mar 21 20:54:13 2014 +0000
@@ -0,0 +1,1 @@
+/* This page is intentionally left blank. */
diff -r c1f3628ae8c5 -r 01c21fd9ab84 external/gpl3/gcc/lib/libgcc/Makefile.inc
--- a/external/gpl3/gcc/lib/libgcc/Makefile.inc Fri Mar 21 18:14:20 2014 +0000
+++ b/external/gpl3/gcc/lib/libgcc/Makefile.inc Fri Mar 21 20:54:13 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.24 2014/03/09 23:23:09 mrg Exp $
+#      $NetBSD: Makefile.inc,v 1.25 2014/03/21 20:54:13 joerg Exp $
 
 LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/}
 
@@ -91,7 +91,11 @@
 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}
+.else
 LIB2_EH=       ${G_LIB2ADDEH:M*.c:T}
+.endif
 LIB2_EHASM=    ${G_LIB2ADDEH:M*.S:T}
 
 # We have to weed out any existing func.S file that may exist
diff -r c1f3628ae8c5 -r 01c21fd9ab84 external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile
--- a/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile   Fri Mar 21 18:14:20 2014 +0000
+++ b/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile   Fri Mar 21 20:54:13 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2014/03/05 21:37:02 tron Exp $
+#      $NetBSD: Makefile,v 1.9 2014/03/21 20:54:13 joerg Exp $
 
 REQUIRETOOLS=  yes
 NOLINT=                # defined
@@ -13,7 +13,7 @@
 
 .cc: # disable .cc->NULL transform
 
-SRCS+=         ${LIB2_EH} ${LIB2_EHASM}
+SRCS+=         ${LIB2_EH} ${LIB2_EHASM} empty.c
 COPTS.c-typeck.c=      -Wno-stack-protector
 COPTS.unwind-dw2.c=    -Wno-stack-protector
 
diff -r c1f3628ae8c5 -r 01c21fd9ab84 external/gpl3/gcc/lib/libgcc/libgcc_eh/empty.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl3/gcc/lib/libgcc/libgcc_eh/empty.c    Fri Mar 21 20:54:13 2014 +0000
@@ -0,0 +1,1 @@
+/* This page is intentionally left blank. */