[src/trunk]: src/external/gpl3/gcc/lib/libgcc/libgcc_s Treat emips specially ...

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

details:   https://anonhg.NetBSD.org/src/rev/7bb78b9598e9
branches:  trunk
changeset: 770657:7bb78b9598e9
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Oct 28 02:28:01 2011 +0000

description:
Treat emips specially as we did with libgcc. Needs some of the softfloat
functions, even if it does not MKSOFTFLOAT.
XXX: still bad text relocations in eh_frame.

diffstat:

 external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (28 lines):

diff -r 1478443668ef -r 7bb78b9598e9 external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile
--- a/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile    Fri Oct 28 02:00:50 2011 +0000
+++ b/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile    Fri Oct 28 02:28:01 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2011/08/15 09:19:21 mrg Exp $
+#      $NetBSD: Makefile,v 1.4 2011/10/28 02:28:01 christos Exp $
 
 USE_SHLIBDIR=  yes
 REQUIRETOOLS=  yes
@@ -22,13 +22,14 @@
 LDFLAGS+=      -Wl,--version-script=${.OBJDIR}/libgcc.map
 
 # XXX handle this better?
-.if ${MACHINE_CPU} == "mips" && !(${MKSOFTFLOAT} != "no")
-G_LIB2ADD+=    ${GNUHOSTDIST}/gcc/config/floatunsidf.c \
-               ${GNUHOSTDIST}/gcc/config/floatunsisf.c
+.if ${MACHINE} == "emips" || (${MACHINE_CPU} == "mips" && !(${MKSOFTFLOAT} != "no"))
+G_LIB2ADD_HACK+=       ${GNUHOSTDIST}/gcc/config/floatunsidf.c \
+                       ${GNUHOSTDIST}/gcc/config/floatunsisf.c
 .endif
 
 SRCS+=         ${LIB2FUNCS} ${LIB2DIVMOD} ${LIB2_EH} \
-               ${G_LIB2ADD:T:S/.asm/.S/} ${LIB1ASMFUNCS}
+               ${G_LIB2ADD:T:S/.asm/.S/} ${G_LIB2ADD_HACK:T:S/.asm/.S/} \
+               ${LIB1ASMFUNCS}
 
 COPTS.unwind-dw2.c = -Wno-stack-protector