[src/trunk]: src/external/gpl3/gcc/lib/libgcc/libgcc Extend the "mips64 hack"...

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

details:   https://anonhg.NetBSD.org/src/rev/9ea08d7829d9
branches:  trunk
changeset: 344457:9ea08d7829d9
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Mar 31 06:59:44 2016 +0000

description:
Extend the "mips64 hack" to all MKSOFTFLOAT builds - avoid duplicate
symbols in libgcc.

diffstat:

 external/gpl3/gcc/lib/libgcc/libgcc/Makefile |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 04bafee5ac36 -r 9ea08d7829d9 external/gpl3/gcc/lib/libgcc/libgcc/Makefile
--- a/external/gpl3/gcc/lib/libgcc/libgcc/Makefile      Wed Mar 30 23:36:45 2016 +0000
+++ b/external/gpl3/gcc/lib/libgcc/libgcc/Makefile      Thu Mar 31 06:59:44 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.25 2016/03/23 05:28:01 mrg Exp $
+#      $NetBSD: Makefile,v 1.26 2016/03/31 06:59:44 martin Exp $
 
 REQUIRETOOLS=  yes
 NOLINT=                # defined
@@ -23,7 +23,7 @@
 .endif
 
 # XXXGCC5 GCC 5.3 has all these in libgcc and we have them in libc.
-.if ${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "mips64eb"
+.if ${MKSOFTFLOAT} == "yes"
 LIB2ADD_EDITED= 
${G_LIB2ADD:T:Nfloatsisf.c:Nfloatunsisf.c:Nfloatsidf.c:Nfloatunsidf.c:Nfixsfsi.c:Nextendsfdf2.c:Naddsf3.c:Nmulsf3.c:Ndivsf3.c:Nadddf3.c:Nsubdf3.c:Nmuldf3.c:Ndivdf3.c:Nfixdfsi.c:S/.asm/.S/}
 .else
 LIB2ADD_EDITED=        ${G_LIB2ADD:T:S/.asm/.S/}