Author: imp
Date: Fri Jan 8 23:09:11 2010
New Revision: 201851
URL: http://svn.freebsd.org/changeset/base/201851
Log:
Merge r195575 and 195530 from projects/mips to head by hand:
r195575 | imp | 2009-07-10 12:24:02 -0600 (Fri, 10 Jul 2009) | 2 lines
quick hack for the problem gonzo is seeing.
r195530 | imp | 2009-07-10 01:18:30 -0600 (Fri, 10 Jul 2009) | 5 lines
Always build all 4 emulators into the mips toolchain.
# I think we have a gcc spec file issue with abi=64 since I have to do other
# hacks to get it mostly kinda right.
Modified:
head/gnu/usr.bin/binutils/ld/Makefile.mips
Modified: head/gnu/usr.bin/binutils/ld/Makefile.mips
==============================================================================
--- head/gnu/usr.bin/binutils/ld/Makefile.mips Fri Jan 8 23:06:56 2010
(r201850)
+++ head/gnu/usr.bin/binutils/ld/Makefile.mips Fri Jan 8 23:09:11 2010
(r201851)
@@ -10,15 +10,22 @@ NATIVE_EMULATION=elf${_sz}btsmip_fbsd
NATIVE_EMULATION=elf${_sz}ltsmip_fbsd
.endif
-SRCS+= e${NATIVE_EMULATION}.c
-CLEANFILES+= e${NATIVE_EMULATION}.c
-
+MIPS_ABIS=elf32btsmip_fbsd elf32ltsmip_fbsd elf64btsmip_fbsd elf64ltsmip_fbsd
+.for abi in ${MIPS_ABIS}
+#.if (${abi} != ${NATIVE_EMULATION})
+EMS+= ${abi}
+#.endif
+.for ext in ${ELF_SCR_EXT}
+LDSCRIPTS+= ${abi}.${ext}
+.endfor
+SRCS+= e${abi}.c
+CLEANFILES+= e${abi}.c
# nb: elf32 handles both elf32 and elf64 targets
-e${NATIVE_EMULATION}.c: ${.CURDIR}/${NATIVE_EMULATION}.sh
emultempl/elf32.em \
+e${abi}.c: ${.CURDIR}/${abi}.sh emultempl/elf32.em \
scripttempl/elf.sc genscripts.sh stringify.sed
sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${LIBSERACHPATH} \
${TOOLS_PREFIX}/usr \
${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \
- ${NATIVE_EMULATION} "" no ${NATIVE_EMULATION} ${TARGET_TUPLE} \
- ${.CURDIR}/${NATIVE_EMULATION}.sh
-
+ ${abi} "" no ${abi} ${TARGET_TUPLE} \
+ ${.CURDIR}/${abi}.sh
+.endfor
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
