[src/trunk]: src/external/gpl3/gcc/lib/libgcc slightly rearrange the generati...

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

details:   https://anonhg.NetBSD.org/src/rev/0d5c7405201b
branches:  trunk
changeset: 344328:0d5c7405201b
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Mar 23 00:20:18 2016 +0000

description:
slightly rearrange the generation of SRCS.

diffstat:

 external/gpl3/gcc/lib/libgcc/libgcc/Makefile   |   9 +++++----
 external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile |  10 +++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diffs (55 lines):

diff -r 2d60b4eac8cf -r 0d5c7405201b external/gpl3/gcc/lib/libgcc/libgcc/Makefile
--- a/external/gpl3/gcc/lib/libgcc/libgcc/Makefile      Tue Mar 22 17:41:26 2016 +0000
+++ b/external/gpl3/gcc/lib/libgcc/libgcc/Makefile      Wed Mar 23 00:20:18 2016 +0000
@@ -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 @@
 
 # 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*)
diff -r 2d60b4eac8cf -r 0d5c7405201b external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile
--- a/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile    Tue Mar 22 17:41:26 2016 +0000
+++ b/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile    Wed Mar 23 00:20:18 2016 +0000
@@ -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 @@
 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