diff options
| author | dim <dim@FreeBSD.org> | 2010-11-18 18:30:03 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2010-11-18 18:30:03 +0000 |
| commit | 79e78b2c61c034f70491270cd04b4c5672a6c0c7 (patch) | |
| tree | 19350fb5ff0ba3262aa241208bd8a169711b7e9a /gnu | |
| parent | b0df1c137c1d7cc6c086e8c3de63b91a97e180c7 (diff) | |
| download | FreeBSD-src-79e78b2c61c034f70491270cd04b4c5672a6c0c7.zip FreeBSD-src-79e78b2c61c034f70491270cd04b4c5672a6c0c7.tar.gz | |
Sync: merge r215396 through r215463 from ^/head.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/usr.bin/binutils/ld/Makefile.amd64 | 2 | ||||
| -rw-r--r-- | gnu/usr.bin/cc/cc_tools/Makefile | 2 |
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;", \ |
