Module Name:    src
Committed By:   christos
Date:           Fri Oct 28 02:28:01 UTC 2011

Modified Files:
        src/external/gpl3/gcc/lib/libgcc/libgcc_s: Makefile

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 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_s/Makefile
diff -u src/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile:1.3 src/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile:1.4
--- src/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile:1.3	Mon Aug 15 05:19:21 2011
+++ src/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile	Thu Oct 27 22:28:01 2011
@@ -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+=	-nodefaultlibs
 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
 

Reply via email to