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>
This commit is contained in:
parent
1fbcd2ca17
commit
9383074deb
|
@ -5,8 +5,8 @@ RP 25/7/10
|
||||||
|
|
||||||
Index: gcc-4.3.3/gcc/config/i386/t-linux64
|
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.orig/gcc/config/i386/t-linux64 2007-09-27 20:56:06.000000000 +0100
|
||||||
+++ gcc-4.3.3/gcc/config/i386/t-linux64 2010-07-25 13:43:02.000000000 +0100
|
+++ gcc-4.3.3/gcc/config/i386/t-linux64 2010-08-03 12:55:04.642189070 +0100
|
||||||
@@ -12,8 +12,8 @@
|
@@ -12,8 +12,8 @@
|
||||||
# MULTILIB_OSDIRNAMES according to what is found on the target.
|
# 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
|
LIBGCC = stmp-multilib
|
||||||
INSTALL_LIBGCC = install-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"
|
||||||
|
|
|
@ -3,11 +3,11 @@ By default gcc places 64 bit libs in a lib64 directory. This makes it use
|
||||||
|
|
||||||
RP 25/7/10
|
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.5.0.orig/gcc/config/i386/t-linux64 2009-04-21 20:03:23.000000000 +0100
|
||||||
+++ gcc-4.3.3/gcc/config/i386/t-linux64 2010-07-25 13:43:02.000000000 +0100
|
+++ gcc-4.5.0/gcc/config/i386/t-linux64 2010-08-03 14:53:26.471180113 +0100
|
||||||
@@ -12,8 +12,8 @@
|
@@ -24,8 +24,8 @@
|
||||||
# MULTILIB_OSDIRNAMES according to what is found on the target.
|
# MULTILIB_OSDIRNAMES according to what is found on the target.
|
||||||
|
|
||||||
MULTILIB_OPTIONS = m64/m32
|
MULTILIB_OPTIONS = m64/m32
|
||||||
|
@ -18,3 +18,16 @@ Index: gcc-4.3.3/gcc/config/i386/t-linux64
|
||||||
|
|
||||||
LIBGCC = stmp-multilib
|
LIBGCC = stmp-multilib
|
||||||
INSTALL_LIBGCC = install-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"
|
||||||
|
|
|
@ -5,7 +5,7 @@ require gcc-cross-canadian.inc
|
||||||
require gcc-configure-sdk.inc
|
require gcc-configure-sdk.inc
|
||||||
require gcc-package-sdk.inc
|
require gcc-package-sdk.inc
|
||||||
|
|
||||||
PR = "r2"
|
PR = "r3"
|
||||||
|
|
||||||
DEPENDS += "gmp-nativesdk mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk"
|
DEPENDS += "gmp-nativesdk mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk"
|
||||||
RDEPENDS_${PN} += "mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk"
|
RDEPENDS_${PN} += "mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
require gcc-cross_${PV}.bb
|
require gcc-cross_${PV}.bb
|
||||||
require gcc-cross-initial.inc
|
require gcc-cross-initial.inc
|
||||||
|
|
||||||
PR = "r1"
|
PR = "r2"
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
require gcc-cross_${PV}.bb
|
require gcc-cross_${PV}.bb
|
||||||
require gcc-cross-initial.inc
|
require gcc-cross-initial.inc
|
||||||
|
|
||||||
PR = "r2"
|
PR = "r3"
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require gcc-cross_${PV}.bb
|
require gcc-cross_${PV}.bb
|
||||||
require gcc-cross-intermediate.inc
|
require gcc-cross-intermediate.inc
|
||||||
PR = "r1"
|
PR = "r2"
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require gcc-cross_${PV}.bb
|
require gcc-cross_${PV}.bb
|
||||||
require gcc-cross-intermediate.inc
|
require gcc-cross-intermediate.inc
|
||||||
PR = "r2"
|
PR = "r3"
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
PR = "r14"
|
PR = "r15"
|
||||||
|
|
||||||
require gcc-${PV}.inc
|
require gcc-${PV}.inc
|
||||||
require gcc-cross4.inc
|
require gcc-cross4.inc
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
PR = "r2"
|
PR = "r3"
|
||||||
|
|
||||||
require gcc-${PV}.inc
|
require gcc-${PV}.inc
|
||||||
require gcc-cross4.inc
|
require gcc-cross4.inc
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
require gcc-cross-initial_${PV}.bb
|
require gcc-cross-initial_${PV}.bb
|
||||||
require gcc-crosssdk-initial.inc
|
require gcc-crosssdk-initial.inc
|
||||||
PR = "r2"
|
PR = "r3"
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require gcc-cross-initial_${PV}.bb
|
require gcc-cross-initial_${PV}.bb
|
||||||
require gcc-crosssdk-initial.inc
|
require gcc-crosssdk-initial.inc
|
||||||
|
|
||||||
PR = "r2"
|
PR = "r3"
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
require gcc-cross-intermediate_${PV}.bb
|
require gcc-cross-intermediate_${PV}.bb
|
||||||
require gcc-crosssdk-intermediate.inc
|
require gcc-crosssdk-intermediate.inc
|
||||||
PR = "r5"
|
PR = "r6"
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require gcc-cross-intermediate_${PV}.bb
|
require gcc-cross-intermediate_${PV}.bb
|
||||||
require gcc-crosssdk-intermediate.inc
|
require gcc-crosssdk-intermediate.inc
|
||||||
|
|
||||||
PR = "r2"
|
PR = "r3"
|
||||||
|
|
|
@ -1,2 +1,3 @@
|
||||||
require gcc-cross_${PV}.bb
|
require gcc-cross_${PV}.bb
|
||||||
require gcc-crosssdk.inc
|
require gcc-crosssdk.inc
|
||||||
|
PR="r1"
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require gcc-cross_${PV}.bb
|
require gcc-cross_${PV}.bb
|
||||||
require gcc-crosssdk.inc
|
require gcc-crosssdk.inc
|
||||||
|
|
||||||
PR = "r2"
|
PR = "r3"
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
PR = "r14"
|
PR = "r15"
|
||||||
|
|
||||||
require gcc-${PV}.inc
|
require gcc-${PV}.inc
|
||||||
require gcc-configure-runtime.inc
|
require gcc-configure-runtime.inc
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
PR = "r2"
|
PR = "r3"
|
||||||
|
|
||||||
require gcc-${PV}.inc
|
require gcc-${PV}.inc
|
||||||
require gcc-configure-runtime.inc
|
require gcc-configure-runtime.inc
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
PR = "r7"
|
PR = "r8"
|
||||||
|
|
||||||
require gcc-${PV}.inc
|
require gcc-${PV}.inc
|
||||||
require gcc-configure-target.inc
|
require gcc-configure-target.inc
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
PR = "r2"
|
PR = "r3"
|
||||||
|
|
||||||
require gcc-${PV}.inc
|
require gcc-${PV}.inc
|
||||||
require gcc-configure-target.inc
|
require gcc-configure-target.inc
|
||||||
|
|
Loading…
Reference in New Issue