Module Name: src
Committed By: matt
Date: Mon Aug 6 00:19:03 UTC 2012
Modified Files:
src/external/gpl3/gcc/lib/libgcc: Makefile.inc
src/external/gpl3/gcc/lib/libgcc/libgcc_s: Makefile
Log Message:
deal with LIB2_EH has ASM (.S) files.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/gpl3/gcc/lib/libgcc/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/lib/libgcc/libgcc_s/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.13 src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.14
--- src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.13 Sun Sep 25 13:34:16 2011
+++ src/external/gpl3/gcc/lib/libgcc/Makefile.inc Mon Aug 6 00:19:03 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.13 2011/09/25 13:34:16 chs Exp $
+# $NetBSD: Makefile.inc,v 1.14 2012/08/06 00:19:03 matt Exp $
.if ${MKGCC} != "no"
.if exists(${.CURDIR}/../arch/${MACHINE_ARCH}.mk)
@@ -72,6 +72,7 @@ LIB2FUNCS= ${LIB2FUNCS_SHORT:=.c}
LIB2FUNCS_ST= ${G_LIB2FUNCS_ST:=.c}
LIB2DIVMOD= ${LIB2_DIVMOD_FUNCS:=.c}
LIB2_EH= ${G_LIB2ADDEH:M*.c:T}
+LIB2_EHASM= ${G_LIB2ADDEH:M*.S:T}
.if !empty(G_LIB1ASMFUNCS)
LIB1ASMFUNCS= ${G_LIB1ASMFUNCS:=.S}
.endif
Index: src/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile
diff -u src/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile:1.5 src/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile:1.6
--- src/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile:1.5 Sat Oct 29 17:14:12 2011
+++ src/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile Mon Aug 6 00:19:03 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/10/29 17:14:12 christos Exp $
+# $NetBSD: Makefile,v 1.6 2012/08/06 00:19:03 matt Exp $
USE_SHLIBDIR= yes
REQUIRETOOLS= yes
@@ -27,7 +27,7 @@ G_LIB2ADD_HACK+= ${GNUHOSTDIST}/gcc/conf
${GNUHOSTDIST}/gcc/config/floatunsisf.c
.endif
-SRCS+= ${LIB2FUNCS} ${LIB2DIVMOD} ${LIB2_EH} \
+SRCS+= ${LIB2FUNCS} ${LIB2DIVMOD} ${LIB2_EH} ${LIB2_EHASM} \
${G_LIB2ADD:T:S/.asm/.S/} ${G_LIB2ADD_HACK:T:S/.asm/.S/} \
${LIB1ASMFUNCS}
