From 9383074deb75fda69d2302f85d03618fa1b5fe27 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Tue, 3 Aug 2010 16:49:31 +0100 Subject: [PATCH] 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 --- meta/packages/gcc/gcc-4.3.3/64bithack.patch | 17 +++++++++++++-- meta/packages/gcc/gcc-4.5.0/64bithack.patch | 21 +++++++++++++++---- meta/packages/gcc/gcc-cross-canadian_4.5.0.bb | 2 +- meta/packages/gcc/gcc-cross-initial_4.3.3.bb | 2 +- meta/packages/gcc/gcc-cross-initial_4.5.0.bb | 2 +- .../gcc/gcc-cross-intermediate_4.3.3.bb | 2 +- .../gcc/gcc-cross-intermediate_4.5.0.bb | 2 +- meta/packages/gcc/gcc-cross_4.3.3.bb | 2 +- meta/packages/gcc/gcc-cross_4.5.0.bb | 2 +- .../gcc/gcc-crosssdk-initial_4.3.3.bb | 2 +- .../gcc/gcc-crosssdk-initial_4.5.0.bb | 2 +- .../gcc/gcc-crosssdk-intermediate_4.3.3.bb | 2 +- .../gcc/gcc-crosssdk-intermediate_4.5.0.bb | 2 +- meta/packages/gcc/gcc-crosssdk_4.3.3.bb | 1 + meta/packages/gcc/gcc-crosssdk_4.5.0.bb | 2 +- meta/packages/gcc/gcc-runtime_4.3.3.bb | 2 +- meta/packages/gcc/gcc-runtime_4.5.0.bb | 2 +- meta/packages/gcc/gcc_4.3.3.bb | 2 +- meta/packages/gcc/gcc_4.5.0.bb | 2 +- 19 files changed, 49 insertions(+), 22 deletions(-) diff --git a/meta/packages/gcc/gcc-4.3.3/64bithack.patch b/meta/packages/gcc/gcc-4.3.3/64bithack.patch index ac65e01afa..f6931b85af 100644 --- 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 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" 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 37c64fb4ee..3eea4bcafe 100644 --- 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 a121782233..b2c257d9d4 100644 --- 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 b2c257d9d4..38e0964fed 100644 --- 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 7aaa5b0512..10681dad4b 100644 --- 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 10681dad4b..e65d5df671 100644 --- 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 98573f0c5a..36f91d0221 100644 --- 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 a5a80b765d..3d75bd4a19 100644 --- 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 8d86e414ce..e804b4b016 100644 --- 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 240caf56f7..fec53b931c 100644 --- 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 e11e064386..5f01473add 100644 --- 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 a6653ddfcc..161d870e63 100644 --- 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 7430888ed7..92a3f11388 100644 --- 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 129e8d31a4..70690881aa 100644 --- 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 6768674c1e..543bf24b77 100644 --- 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 093f9bf963..c1e680d3c0 100644 --- 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 556fc74267..a2ae0c0e92 100644 --- 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 3a1edec607..7c1869f503 100644 --- 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