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>

diff --git a/meta/packages/gcc/gcc-4.3.3/64bithack.patch b/meta/packages/gcc/gcc-4.3.3/64bithack.patch
index ac65e01afab754a3522c1a2757d92e15e662ca5d..f6931b85afa2ab3a0cefe92e367c16e9ad47841e 100644 (file)
--- a/meta/packages/gcc/gcc-4.3.3/64bithack.patch
+++ b/meta/packages/gcc/gcc-4.3.3/64bithack.patch
@@ -5,8 +5,8 @@ RP 25/7/10
 
 Index: gcc-4.3.3/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
+--- gcc-4.3.3.orig/gcc/config/i386/t-linux64   2007-09-27 20:56:06.000000000 +0100
++++ gcc-4.3.3/gcc/config/i386/t-linux64        2010-08-03 12:55:04.642189070 +0100
 @@ -12,8 +12,8 @@
  # MULTILIB_OSDIRNAMES according to what is found on the target.
  
@@ -18,3 +18,16 @@ Index: gcc-4.3.3/gcc/config/i386/t-linux64
  
  LIBGCC = stmp-multilib
  INSTALL_LIBGCC = install-multilib
+Index: gcc-4.3.3/gcc/config/i386/linux64.h
+===================================================================
+--- gcc-4.3.3.orig/gcc/config/i386/linux64.h   2007-08-02 11:49:31.000000000 +0100
++++ gcc-4.3.3/gcc/config/i386/linux64.h        2010-08-03 13:01:51.621182117 +0100
+@@ -54,7 +54,7 @@
+    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"

diff --git a/meta/packages/gcc/gcc-4.5.0/64bithack.patch b/meta/packages/gcc/gcc-4.5.0/64bithack.patch
index ac65e01afab754a3522c1a2757d92e15e662ca5d..8527963111eb9cd7d6c9225ff3d5220a604f3245 100644 (file)
--- 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"

diff --git a/meta/packages/gcc/gcc-cross-canadian_4.5.0.bb b/meta/packages/gcc/gcc-cross-canadian_4.5.0.bb
index 37c64fb4eee5d3c34498f39b3e3bc74308a44428..3eea4bcafede92b9382266010de75b307c338d2c 100644 (file)
--- a/meta/packages/gcc/gcc-cross-canadian_4.5.0.bb
+++ b/meta/packages/gcc/gcc-cross-canadian_4.5.0.bb
@@ -5,7 +5,7 @@ require gcc-cross-canadian.inc
 require gcc-configure-sdk.inc
 require gcc-package-sdk.inc
 
-PR = "r2"
+PR = "r3"
 
 DEPENDS += "gmp-nativesdk mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk"
 RDEPENDS_${PN} += "mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk"

diff --git a/meta/packages/gcc/gcc-cross-initial_4.3.3.bb b/meta/packages/gcc/gcc-cross-initial_4.3.3.bb
index a121782233966259840b0d1e1bb1f1abf87af982..b2c257d9d40e4e731f5655b672ef4fe41c650dde 100644 (file)
--- a/meta/packages/gcc/gcc-cross-initial_4.3.3.bb
+++ b/meta/packages/gcc/gcc-cross-initial_4.3.3.bb
@@ -1,5 +1,5 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-initial.inc
 
-PR = "r1"
+PR = "r2"
 

diff --git a/meta/packages/gcc/gcc-cross-initial_4.5.0.bb b/meta/packages/gcc/gcc-cross-initial_4.5.0.bb
index b2c257d9d40e4e731f5655b672ef4fe41c650dde..38e0964fedc8b8c50ad63849863e8ff216edea44 100644 (file)
--- a/meta/packages/gcc/gcc-cross-initial_4.5.0.bb
+++ b/meta/packages/gcc/gcc-cross-initial_4.5.0.bb
@@ -1,5 +1,5 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-initial.inc
 
-PR = "r2"
+PR = "r3"
 

diff --git a/meta/packages/gcc/gcc-cross-intermediate_4.3.3.bb b/meta/packages/gcc/gcc-cross-intermediate_4.3.3.bb
index 7aaa5b051285ba196e02a7044fee2096c4da6fc6..10681dad4b5d0961405ef999dd3f73b9b3c52d11 100644 (file)
--- a/meta/packages/gcc/gcc-cross-intermediate_4.3.3.bb
+++ b/meta/packages/gcc/gcc-cross-intermediate_4.3.3.bb
@@ -1,4 +1,4 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-intermediate.inc
-PR = "r1"
+PR = "r2"
 

diff --git a/meta/packages/gcc/gcc-cross-intermediate_4.5.0.bb b/meta/packages/gcc/gcc-cross-intermediate_4.5.0.bb
index 10681dad4b5d0961405ef999dd3f73b9b3c52d11..e65d5df671789da6dd819783b32ac602bba79996 100644 (file)
--- a/meta/packages/gcc/gcc-cross-intermediate_4.5.0.bb
+++ b/meta/packages/gcc/gcc-cross-intermediate_4.5.0.bb
@@ -1,4 +1,4 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-intermediate.inc
-PR = "r2"
+PR = "r3"
 

diff --git a/meta/packages/gcc/gcc-cross_4.3.3.bb b/meta/packages/gcc/gcc-cross_4.3.3.bb
index 98573f0c5a906c2cde00f4e3f68a3c49d36aa19d..36f91d0221874483540a6da6f27dfd3505457999 100644 (file)
--- a/meta/packages/gcc/gcc-cross_4.3.3.bb
+++ b/meta/packages/gcc/gcc-cross_4.3.3.bb
@@ -1,4 +1,4 @@
-PR = "r14"
+PR = "r15"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc

diff --git a/meta/packages/gcc/gcc-cross_4.5.0.bb b/meta/packages/gcc/gcc-cross_4.5.0.bb
index a5a80b765df64a00bfbd287dae6a913030ed561f..3d75bd4a195bf3151fec6bc1e87e9446720e5d0a 100644 (file)
--- a/meta/packages/gcc/gcc-cross_4.5.0.bb
+++ b/meta/packages/gcc/gcc-cross_4.5.0.bb
@@ -1,4 +1,4 @@
-PR = "r2"
+PR = "r3"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc

diff --git a/meta/packages/gcc/gcc-crosssdk-initial_4.3.3.bb b/meta/packages/gcc/gcc-crosssdk-initial_4.3.3.bb
index 8d86e414cec64a9fa4c42c256a74a2b34300d415..e804b4b01666b661a8e44fa941e81db7463f32a6 100644 (file)
--- a/meta/packages/gcc/gcc-crosssdk-initial_4.3.3.bb
+++ b/meta/packages/gcc/gcc-crosssdk-initial_4.3.3.bb
@@ -1,3 +1,3 @@
 require gcc-cross-initial_${PV}.bb
 require gcc-crosssdk-initial.inc
-PR = "r2"
+PR = "r3"

diff --git a/meta/packages/gcc/gcc-crosssdk-initial_4.5.0.bb b/meta/packages/gcc/gcc-crosssdk-initial_4.5.0.bb
index 240caf56f78be399232b9c66d13f6a0302401cdb..fec53b931cd0145fe1540d36fc2951a49d56ae65 100644 (file)
--- a/meta/packages/gcc/gcc-crosssdk-initial_4.5.0.bb
+++ b/meta/packages/gcc/gcc-crosssdk-initial_4.5.0.bb
@@ -1,4 +1,4 @@
 require gcc-cross-initial_${PV}.bb
 require gcc-crosssdk-initial.inc
 
-PR = "r2"
+PR = "r3"

diff --git a/meta/packages/gcc/gcc-crosssdk-intermediate_4.3.3.bb b/meta/packages/gcc/gcc-crosssdk-intermediate_4.3.3.bb
index e11e064386568e344a6cce73de20484fed48622f..5f01473addf86fb85a211c43e1abd4d2a3d31877 100644 (file)
--- a/meta/packages/gcc/gcc-crosssdk-intermediate_4.3.3.bb
+++ b/meta/packages/gcc/gcc-crosssdk-intermediate_4.3.3.bb
@@ -1,3 +1,3 @@
 require gcc-cross-intermediate_${PV}.bb
 require gcc-crosssdk-intermediate.inc
-PR = "r5"
+PR = "r6"

diff --git a/meta/packages/gcc/gcc-crosssdk-intermediate_4.5.0.bb b/meta/packages/gcc/gcc-crosssdk-intermediate_4.5.0.bb
index a6653ddfcc0f8c2fee3d907352f8211e78e235f8..161d870e639958f91e930ca9ddce11f69733a147 100644 (file)
--- a/meta/packages/gcc/gcc-crosssdk-intermediate_4.5.0.bb
+++ b/meta/packages/gcc/gcc-crosssdk-intermediate_4.5.0.bb
@@ -1,4 +1,4 @@
 require gcc-cross-intermediate_${PV}.bb
 require gcc-crosssdk-intermediate.inc
 
-PR = "r2"
+PR = "r3"

diff --git a/meta/packages/gcc/gcc-crosssdk_4.3.3.bb b/meta/packages/gcc/gcc-crosssdk_4.3.3.bb
index 7430888ed766b2fa9a93d73c237b8159f7036d80..92a3f11388fffc6e23f95d4ddad99bef633c200e 100644 (file)
--- a/meta/packages/gcc/gcc-crosssdk_4.3.3.bb
+++ b/meta/packages/gcc/gcc-crosssdk_4.3.3.bb
@@ -1,2 +1,3 @@
 require gcc-cross_${PV}.bb
 require gcc-crosssdk.inc
+PR="r1"

diff --git a/meta/packages/gcc/gcc-crosssdk_4.5.0.bb b/meta/packages/gcc/gcc-crosssdk_4.5.0.bb
index 129e8d31a4b9c0c8a0d43d02cfdf81f7fd5f6bb2..70690881aa57a17eb5e9b91f3fe3349baf0ec62c 100644 (file)
--- a/meta/packages/gcc/gcc-crosssdk_4.5.0.bb
+++ b/meta/packages/gcc/gcc-crosssdk_4.5.0.bb
@@ -1,4 +1,4 @@
 require gcc-cross_${PV}.bb
 require gcc-crosssdk.inc
 
-PR = "r2"
+PR = "r3"

diff --git a/meta/packages/gcc/gcc-runtime_4.3.3.bb b/meta/packages/gcc/gcc-runtime_4.3.3.bb
index 6768674c1e48211e7f6fa345ccb2a6e464490f20..543bf24b7759533e6d4445f3f45fdbf2d2e8844d 100644 (file)
--- a/meta/packages/gcc/gcc-runtime_4.3.3.bb
+++ b/meta/packages/gcc/gcc-runtime_4.3.3.bb
@@ -1,4 +1,4 @@
-PR = "r14"
+PR = "r15"
 
 require gcc-${PV}.inc
 require gcc-configure-runtime.inc

diff --git a/meta/packages/gcc/gcc-runtime_4.5.0.bb b/meta/packages/gcc/gcc-runtime_4.5.0.bb
index 093f9bf9638416c8a4dfb53735944726105b75dc..c1e680d3c04eff5ae62e6a581302a32306312200 100644 (file)
--- a/meta/packages/gcc/gcc-runtime_4.5.0.bb
+++ b/meta/packages/gcc/gcc-runtime_4.5.0.bb
@@ -1,4 +1,4 @@
-PR = "r2"
+PR = "r3"
 
 require gcc-${PV}.inc
 require gcc-configure-runtime.inc

diff --git a/meta/packages/gcc/gcc_4.3.3.bb b/meta/packages/gcc/gcc_4.3.3.bb
index 556fc74267c6b307a9f26c98376f6d8e21982405..a2ae0c0e92b355ab03bf5bd3f92dfd054009531a 100644 (file)
--- a/meta/packages/gcc/gcc_4.3.3.bb
+++ b/meta/packages/gcc/gcc_4.3.3.bb
@@ -1,4 +1,4 @@
-PR = "r7"
+PR = "r8"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc

diff --git a/meta/packages/gcc/gcc_4.5.0.bb b/meta/packages/gcc/gcc_4.5.0.bb
index 3a1edec607414ed436552b3f24a9128ff8a87b2f..7c1869f503b2d0c5bb06c0a961edd63a18d6c846 100644 (file)
--- a/meta/packages/gcc/gcc_4.5.0.bb
+++ b/meta/packages/gcc/gcc_4.5.0.bb
@@ -1,4 +1,4 @@
-PR = "r2"
+PR = "r3"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc