summaryrefslogtreecommitdiffstats
path: root/gnu
diff options
context:
space:
mode:
authortijl <tijl@FreeBSD.org>2010-11-17 19:54:01 +0000
committertijl <tijl@FreeBSD.org>2010-11-17 19:54:01 +0000
commit3ed7e4e8d8f687feeb6ea0226026272b6d62bf56 (patch)
tree4e0cc6bf58ce859c149764a1e62ee3876e130b82 /gnu
parentd0e1702d582a8cacabfdda86bbf842986beceefa (diff)
downloadFreeBSD-src-3ed7e4e8d8f687feeb6ea0226026272b6d62bf56.zip
FreeBSD-src-3ed7e4e8d8f687feeb6ea0226026272b6d62bf56.tar.gz
Let gcc and ld know where to find 32 bit libraries on amd64.
Reviewed by: arch@ Approved by: kib (mentor)
Diffstat (limited to 'gnu')
-rw-r--r--gnu/usr.bin/binutils/ld/Makefile.amd642
-rw-r--r--gnu/usr.bin/cc/cc_tools/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/gnu/usr.bin/binutils/ld/Makefile.amd64 b/gnu/usr.bin/binutils/ld/Makefile.amd64
index 8a08129..d7276a0 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.amd64
+++ b/gnu/usr.bin/binutils/ld/Makefile.amd64
@@ -12,7 +12,7 @@ e${NATIVE_EMULATION}.c: emulparams/${NATIVE_EMULATION}.sh emultempl/elf32.em \
${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}
diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile
index 1ba2300..4d6de02 100644
--- a/gnu/usr.bin/cc/cc_tools/Makefile
+++ b/gnu/usr.bin/cc/cc_tools/Makefile
@@ -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;", \
OpenPOWER on IntegriCloud