summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-27 10:19:30 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-27 16:18:51 +0100
commit6c936b4b1a2fb1bdf1f3f91482af7e33e71b5c10 (patch)
tree01553af00625590eee571204f6092005d63205a1 /meta
parent6d82688589ab46152a505d8d9be7a15cacf361fb (diff)
downloadpoky-6c936b4b1a2fb1bdf1f3f91482af7e33e71b5c10.tar.gz
gcc: Drop part of the 64bithack patch which is no longer used
Since we now handle GLIBC_DYNAMIC_LINKER in gcc-configure-common.inc: 's#\(GLIBC_DYNAMIC_LINKER[^ ]*\)\( *"/lib.*\)#\1 SYSTEMLIBS_DIR\2#' we can drop the patch which changes a hardcoded value for this. No PR bump since there is no code change resulting from this, its just a cleanup. There is still a valid question over the remainder of this patch and its interaction with multilib configurations. (From OE-Core rev: 036faf66c3889cd8bf4cd3c9b97c80f008f3c6e2) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.5.1/64bithack.patch13
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch13
2 files changed, 0 insertions, 26 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.5.1/64bithack.patch b/meta/recipes-devtools/gcc/gcc-4.5.1/64bithack.patch
index 890cc2f24c..05eafe3551 100644
--- a/meta/recipes-devtools/gcc/gcc-4.5.1/64bithack.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.1/64bithack.patch
@@ -20,16 +20,3 @@ Index: gcc-4.5.0/gcc/config/i386/t-linux64
20 20
21 LIBGCC = stmp-multilib 21 LIBGCC = stmp-multilib
22 INSTALL_LIBGCC = install-multilib 22 INSTALL_LIBGCC = install-multilib
23Index: gcc-4.5.0/gcc/config/i386/linux64.h
24===================================================================
25--- gcc-4.5.0.orig/gcc/config/i386/linux64.h 2010-08-10 15:49:06.000000000 +0100
26+++ gcc-4.5.0/gcc/config/i386/linux64.h 2010-08-10 15:49:16.000000000 +0100
27@@ -59,7 +59,7 @@
28 done. */
29
30 #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
31-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
32+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
33
34 #if TARGET_64BIT_DEFAULT
35 #define SPEC_32 "m32"
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch b/meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch
index 84962e6d46..4b846bbf3a 100644
--- a/meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch
@@ -20,16 +20,3 @@ Index: gcc-4.6.0/gcc/config/i386/t-linux64
20 20
21 LIBGCC = stmp-multilib 21 LIBGCC = stmp-multilib
22 INSTALL_LIBGCC = install-multilib 22 INSTALL_LIBGCC = install-multilib
23Index: gcc-4.6.0/gcc/config/i386/linux64.h
24===================================================================
25--- gcc-4.6.0.orig/gcc/config/i386/linux64.h
26+++ gcc-4.6.0/gcc/config/i386/linux64.h
27@@ -63,7 +63,7 @@ see the files COPYING3 and COPYING.RUNTI
28 done. */
29
30 #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
31-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
32+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
33
34 #if TARGET_64BIT_DEFAULT
35 #define SPEC_32 "m32"