The pure64 patch set the ld loader path to /lib instead of /lib64 for x86_64 builds.
Signed-off-by: Andreas Bießmann <[email protected]> --- .../0304-gcc-i386-use-pure64-CLFS-patch.patch | 47 ++++++++++++++++++++ patches/gcc-4.6.2/series | 3 +- 2 files changed, 49 insertions(+), 1 deletions(-) create mode 100644 patches/gcc-4.6.2/0304-gcc-i386-use-pure64-CLFS-patch.patch diff --git a/patches/gcc-4.6.2/0304-gcc-i386-use-pure64-CLFS-patch.patch b/patches/gcc-4.6.2/0304-gcc-i386-use-pure64-CLFS-patch.patch new file mode 100644 index 0000000..9e3f822 --- /dev/null +++ b/patches/gcc-4.6.2/0304-gcc-i386-use-pure64-CLFS-patch.patch @@ -0,0 +1,47 @@ +From: =?UTF-8?q?Andreas=20Bie=C3=9Fmann?= <[email protected]> +Date: Thu, 9 Feb 2012 13:59:12 +0100 +Subject: [PATCH] gcc/i386: use pure64 CLFS patch +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This is a modified version of +http://trac.cross-lfs.org/browser/patches/gcc-4.6.0-pure64-1.patch to use /lib +instead of /lib64 for x86_64. +This will only work as generic patch, if we do _not_ build multilib x86 +toolchains. + +Signed-off-by: Andreas Bießmann <[email protected]> +--- + gcc/config/i386/linux64.h | 4 ++-- + gcc/config/i386/t-linux64 | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h +index 103ab0c..a3aab5a 100644 +--- a/gcc/config/i386/linux64.h ++++ b/gcc/config/i386/linux64.h +@@ -62,8 +62,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + When the -shared link option is used a final link is not being + done. */ + +-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" +-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" ++#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2" ++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" + + #if TARGET_64BIT_DEFAULT + #define SPEC_32 "m32" +diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64 +index 5d5a476..2a999f1 100644 +--- a/gcc/config/i386/t-linux64 ++++ b/gcc/config/i386/t-linux64 +@@ -25,7 +25,7 @@ + + MULTILIB_OPTIONS = m64/m32 + MULTILIB_DIRNAMES = 64 32 +-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) ++MULTILIB_OSDIRNAMES = ../lib ../lib32 + + LIBGCC = stmp-multilib + INSTALL_LIBGCC = install-multilib diff --git a/patches/gcc-4.6.2/series b/patches/gcc-4.6.2/series index e4ed42c..a39fc16 100644 --- a/patches/gcc-4.6.2/series +++ b/patches/gcc-4.6.2/series @@ -16,4 +16,5 @@ 0301-flatten-switch-stmt-into-if-else-chain-for-Os.patch 0302-libiberty-pic.patch 0303-libstdc-pic.patch -# 19cc4f8bfbc9cbec87de32579a9f88fd - git-ptx-patches magic +0304-gcc-i386-use-pure64-CLFS-patch.patch +# fafe6c53dbc3db9d6019dec03d36185a - git-ptx-patches magic -- 1.7.9 -- ptxdist mailing list [email protected]
