gcc: Fix dynamic linker location for x86_64

gcc hard codes the linker path to lib64 for x86_64 machines, update our
64bithack patch to change this to lib.

Signed-off-by: Joshua Lock <josh@linux.intel.com>

1 files changed, 17 insertions, 4 deletions

diff --git a/meta/packages/gcc/gcc-4.5.0/64bithack.patch b/meta/packages/gcc/gcc-4.5.0/64bithack.patch
index ac65e01afa..8527963111 100644
--- a/meta/packages/gcc/gcc-4.5.0/64bithack.patch
+++ b/meta/packages/gcc/gcc-4.5.0/64bithack.patch
@@ -3,11 +3,11 @@ By default gcc places 64 bit libs in a lib64 directory. This makes it use
 
 RP 25/7/10
 
-Index: gcc-4.3.3/gcc/config/i386/t-linux64
+Index: gcc-4.5.0/gcc/config/i386/t-linux64
 ===================================================================
---- gcc-4.3.3.orig/gcc/config/i386/t-linux64    2010-07-25 12:26:36.000000000 +0100
-+++ gcc-4.3.3/gcc/config/i386/t-linux64 2010-07-25 13:43:02.000000000 +0100
-@@ -12,8 +12,8 @@
+--- gcc-4.5.0.orig/gcc/config/i386/t-linux64    2009-04-21 20:03:23.000000000 +0100
++++ gcc-4.5.0/gcc/config/i386/t-linux64 2010-08-03 14:53:26.471180113 +0100
+@@ -24,8 +24,8 @@
  # MULTILIB_OSDIRNAMES according to what is found on the target.
  
  MULTILIB_OPTIONS = m64/m32
@@ -18,3 +18,16 @@ Index: gcc-4.3.3/gcc/config/i386/t-linux64
  
  LIBGCC = stmp-multilib
  INSTALL_LIBGCC = install-multilib
+Index: gcc-4.5.0/gcc/config/i386/linux64.h
+===================================================================
+--- gcc-4.5.0.orig/gcc/config/i386/linux64.h    2010-03-24 20:44:48.000000000 +0000
++++ gcc-4.5.0/gcc/config/i386/linux64.h 2010-08-03 14:54:24.737056070 +0100
+@@ -59,1 +59,1 @@
+    done.  */
+
+ #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
+ 
+ #if TARGET_64BIT_DEFAULT
+ #define SPEC_32 "m32"