Author: tijl
Date: Wed Nov 17 19:54:01 2010
New Revision: 215439
URL: http://svn.freebsd.org/changeset/base/215439
Log:
Let gcc and ld know where to find 32 bit libraries on amd64.
Reviewed by: arch@
Approved by: kib (mentor)
Modified:
head/gnu/usr.bin/binutils/ld/Makefile.amd64
head/gnu/usr.bin/cc/cc_tools/Makefile
Modified: head/gnu/usr.bin/binutils/ld/Makefile.amd64
==============================================================================
--- head/gnu/usr.bin/binutils/ld/Makefile.amd64 Wed Nov 17 19:35:56 2010
(r215438)
+++ head/gnu/usr.bin/binutils/ld/Makefile.amd64 Wed Nov 17 19:54:01 2010
(r215439)
@@ -12,7 +12,7 @@ e${NATIVE_EMULATION}.c: emulparams/${NAT
${NATIVE_EMULATION} "" no ${NATIVE_EMULATION} ${TARGET_TUPLE}
X86_EMULATION= elf_i386_fbsd
-_i386_path= \"${TOOLS_PREFIX}/usr/lib/i386\"
+_i386_path= \"${TOOLS_PREFIX}/usr/lib32\"
EMS+= ${X86_EMULATION}
.for ext in ${ELF_SCR_EXT}
LDSCRIPTS+= ${X86_EMULATION}.${ext}
Modified: head/gnu/usr.bin/cc/cc_tools/Makefile
==============================================================================
--- head/gnu/usr.bin/cc/cc_tools/Makefile Wed Nov 17 19:35:56 2010
(r215438)
+++ head/gnu/usr.bin/cc/cc_tools/Makefile Wed Nov 17 19:54:01 2010
(r215439)
@@ -307,7 +307,7 @@ GENSRCS+= gcov-iov.h
# Multilib config file
multilib.h:
-.if ${TARGET_ARCH} == "powerpc64"
+.if ${TARGET_ARCH} == "powerpc64" || ${TARGET_ARCH} == "amd64"
echo 'static const char *const multilib_raw[] = { \
". !m64 !m32;", \
"64:../lib m64 !m32;", \
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
