Module Name: src
Committed By: mrg
Date: Wed Mar 23 00:20:18 UTC 2016
Modified Files:
src/external/gpl3/gcc/lib/libgcc/libgcc: Makefile
src/external/gpl3/gcc/lib/libgcc/libgcc_s: Makefile
Log Message:
slightly rearrange the generation of SRCS.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile
cvs rdiff -u -r1.11 -r1.12 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/libgcc/Makefile
diff -u src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.23 src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.24
--- src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.23 Sun Nov 2 14:54:27 2014
+++ src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile Wed Mar 23 00:20:18 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2014/11/02 14:54:27 matt Exp $
+# $NetBSD: Makefile,v 1.24 2016/03/23 00:20:18 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -18,12 +18,13 @@ LIB= gcc
# XXX handle this better? GCC 4.8 moved them.
.if ${MACHINE} == "emips"
-G_LIB2ADD_HACK+= ${GNUHOSTDIST}/gcc/config/floatunsidf.c \
- ${GNUHOSTDIST}/gcc/config/floatunsisf.c
+LIB2ADD_HACK+= ${GNUHOSTDIST}/gcc/config/floatunsidf.c \
+ ${GNUHOSTDIST}/gcc/config/floatunsisf.c
.endif
SRCS+= ${LIB2FUNCS} ${LIB2FUNCS_ST} ${LIB2DIVMOD} \
- ${G_LIB2ADD:T:S/.asm/.S/} ${G_LIB2ADD_HACK:T:S/.asm/.S/} \
+ ${G_LIB2ADD:T:S/.asm/.S/} \
+ ${LIB2ADD_HACK:T:S/.asm/.S/} \
${G_LIB2ADD_ST:T} ${LIB1ASMFUNCS}
.if ${MKPIC} == "no"
.if empty(LIBGCC_MACHINE_ARCH:Mearm*)
Index: src/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile
diff -u src/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile:1.11 src/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile:1.12
--- src/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile:1.11 Fri Oct 3 12:41:41 2014
+++ src/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile Wed Mar 23 00:20:18 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2014/10/03 12:41:41 apb Exp $
+# $NetBSD: Makefile,v 1.12 2016/03/23 00:20:18 mrg Exp $
USE_SHLIBDIR= yes
REQUIRETOOLS= yes
@@ -22,15 +22,15 @@ SHLIB_MINOR= 0
LDFLAGS+= -nodefaultlibs
LDFLAGS+= -Wl,--version-script=${.OBJDIR}/libgcc.map
-# XXX handle this better?
# XXX handle this better? GCC 4.8 moved them.
.if ${MACHINE} == "emips"
-G_LIB2ADD_HACK+= ${GNUHOSTDIST}/gcc/config/floatunsidf.c \
- ${GNUHOSTDIST}/gcc/config/floatunsisf.c
+LIB2ADD_HACK+= ${GNUHOSTDIST}/gcc/config/floatunsidf.c \
+ ${GNUHOSTDIST}/gcc/config/floatunsisf.c
.endif
SRCS+= ${LIB2FUNCS} ${LIB2DIVMOD} ${LIB2_EH} ${LIB2_EHASM} \
- ${G_LIB2ADD:T:S/.asm/.S/} ${G_LIB2ADD_HACK:T:S/.asm/.S/} \
+ ${G_LIB2ADD:T:S/.asm/.S/} \
+ ${LIB2ADD_HACK:T:S/.asm/.S/} \
${G_LIB2ADD_ST:T} ${LIB1ASMFUNCS}
COPTS.unwind-dw2.c = -Wno-stack-protector
