Module Name: src
Committed By: martin
Date: Thu Mar 31 15:06:39 UTC 2016
Modified Files:
src/external/gpl3/gcc.old/lib/libgcc/libgcc: Makefile
Log Message:
"Extended version" of the "mips64 hack" used in gcc 5.3's libgcc.a
build: avoid lots of duplicate symbols on softfloat builds.
Now mac68k is buildable with MKSOFTFLOAT=yes again, finally!
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc.old/lib/libgcc/libgcc/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.old/lib/libgcc/libgcc/Makefile
diff -u src/external/gpl3/gcc.old/lib/libgcc/libgcc/Makefile:1.3 src/external/gpl3/gcc.old/lib/libgcc/libgcc/Makefile:1.4
--- src/external/gpl3/gcc.old/lib/libgcc/libgcc/Makefile:1.3 Wed Sep 23 04:24:01 2015
+++ src/external/gpl3/gcc.old/lib/libgcc/libgcc/Makefile Thu Mar 31 15:06:39 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/09/23 04:24:01 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2016/03/31 15:06:39 martin Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -22,9 +22,20 @@ G_LIB2ADD_HACK+= ${GNUHOSTDIST}/gcc/conf
${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_ST:T} ${LIB1ASMFUNCS}
+# XXX avoid duplicate softfloat symbols in libc and libgcc.a,
+# which would break the /rescue build
+.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:Nxfgnulib.c:Nfpgnulib.c:S/.asm/.S/}
+LIB2FUNCS_EDITED= ${LIB2FUNCS:N_floatundisf.c:N_floatundidf.c:N_floatundixf.c:N_floatunditf.c:N_fixsfdi.c:N_fixdfdi.c:N_fixxfdi.c:N_fixtfdi.c:N_addvsi3.c:N_addvdi3.c:N_subvsi3.c:N_subvdi3.c:N_mulvsi3.c:N_mulvdi3.c:N_muldi3.c}
+LIB1ASMFUNCS_EDITED= ${LIB1ASMFUNCS:N_float.S:N_double.S:N_gedf2.S:N_eqdf2.S:N_nedf2.S:N_ltdf2.S:N_gesf2.S:N_gtdf2.S:N_ledf2.S:N_lesf2.S}
+.else
+LIB2ADD_EDITED= ${G_LIB2ADD:T:S/.asm/.S/}
+LIB2FUNCS_EDITED= ${LIB2FUNCS}
+LIB1ASMFUNCS_EDITED= ${LIB1ASMFUNCS}
+.endif
+SRCS+= ${LIB2FUNCS_EDITED} ${LIB2FUNCS_ST} ${LIB2DIVMOD} \
+ ${LIB2ADD_EDITED} ${G_LIB2ADD_HACK:T:S/.asm/.S/} \
+ ${G_LIB2ADD_ST:T} ${LIB1ASMFUNCS_EDITED}
.if ${MKPIC} == "no"
.if empty(LIBGCC_MACHINE_ARCH:Mearm*)
SRCS+= ${LIB2_EH} ${LIB2_EHASM}
