Module Name: src
Committed By: joerg
Date: Fri Mar 21 20:54:14 UTC 2014
Modified Files:
src/external/gpl3/gcc.old/lib/libgcc: Makefile.inc
src/external/gpl3/gcc.old/lib/libgcc/libgcc_eh: Makefile
src/external/gpl3/gcc/lib/libgcc: Makefile.inc
src/external/gpl3/gcc/lib/libgcc/libgcc_eh: Makefile
Added Files:
src/external/gpl3/gcc.old/lib/libgcc/libgcc_eh: empty.c
src/external/gpl3/gcc/lib/libgcc/libgcc_eh: empty.c
Log Message:
For HAVE_LIBGCC_EH=no, skip libgcc's unwind code.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/gpl3/gcc.old/lib/libgcc/Makefile.inc
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/gpl3/gcc.old/lib/libgcc/libgcc_eh/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc.old/lib/libgcc/libgcc_eh/empty.c
cvs rdiff -u -r1.24 -r1.25 src/external/gpl3/gcc/lib/libgcc/Makefile.inc
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/lib/libgcc/libgcc_eh/empty.c
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.old/lib/libgcc/Makefile.inc
diff -u src/external/gpl3/gcc.old/lib/libgcc/Makefile.inc:1.1.1.2 src/external/gpl3/gcc.old/lib/libgcc/Makefile.inc:1.2
--- src/external/gpl3/gcc.old/lib/libgcc/Makefile.inc:1.1.1.2 Wed Feb 26 10:57:30 2014
+++ src/external/gpl3/gcc.old/lib/libgcc/Makefile.inc Fri Mar 21 20:54:13 2014
@@ -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 @@ LIB2_DIVMOD_FUNCS:=${LIB2_DIVMOD_FUNCS:N
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}
Index: src/external/gpl3/gcc.old/lib/libgcc/libgcc_eh/Makefile
diff -u src/external/gpl3/gcc.old/lib/libgcc/libgcc_eh/Makefile:1.1.1.2 src/external/gpl3/gcc.old/lib/libgcc/libgcc_eh/Makefile:1.2
--- src/external/gpl3/gcc.old/lib/libgcc/libgcc_eh/Makefile:1.1.1.2 Wed Feb 26 10:57:30 2014
+++ src/external/gpl3/gcc.old/lib/libgcc/libgcc_eh/Makefile Fri Mar 21 20:54:13 2014
@@ -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 @@ LIB= gcc_eh
.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
Index: src/external/gpl3/gcc/lib/libgcc/Makefile.inc
diff -u src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.24 src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.25
--- src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.24 Sun Mar 9 23:23:09 2014
+++ src/external/gpl3/gcc/lib/libgcc/Makefile.inc Fri Mar 21 20:54:13 2014
@@ -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 @@ LIB2_DIVMOD_FUNCS:=${LIB2_DIVMOD_FUNCS:N
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
Index: src/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile
diff -u src/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile:1.8 src/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile:1.9
--- src/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile:1.8 Wed Mar 5 21:37:02 2014
+++ src/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile Fri Mar 21 20:54:13 2014
@@ -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 @@ LIB= gcc_eh
.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
Added files:
Index: src/external/gpl3/gcc.old/lib/libgcc/libgcc_eh/empty.c
diff -u /dev/null src/external/gpl3/gcc.old/lib/libgcc/libgcc_eh/empty.c:1.1
--- /dev/null Fri Mar 21 20:54:14 2014
+++ src/external/gpl3/gcc.old/lib/libgcc/libgcc_eh/empty.c Fri Mar 21 20:54:13 2014
@@ -0,0 +1 @@
+/* This page is intentionally left blank. */
Index: src/external/gpl3/gcc/lib/libgcc/libgcc_eh/empty.c
diff -u /dev/null src/external/gpl3/gcc/lib/libgcc/libgcc_eh/empty.c:1.1
--- /dev/null Fri Mar 21 20:54:14 2014
+++ src/external/gpl3/gcc/lib/libgcc/libgcc_eh/empty.c Fri Mar 21 20:54:13 2014
@@ -0,0 +1 @@
+/* This page is intentionally left blank. */
