diff options
| author | Khem Raj <raj.khem@gmail.com> | 2015-05-06 00:04:57 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-09 22:25:48 +0100 |
| commit | dd45caac51868263bc7e7911a9c1ac96141ed474 (patch) | |
| tree | 9a0f2b5e7dc10e9ee615363af1f61125e050b7a3 | |
| parent | 4bc4acc67e5d7b3f27afadeda5710f9ba5f627d2 (diff) | |
| download | openembedded-core-dd45caac51868263bc7e7911a9c1ac96141ed474.tar.gz openembedded-core-dd45caac51868263bc7e7911a9c1ac96141ed474.tar.bz2 openembedded-core-dd45caac51868263bc7e7911a9c1ac96141ed474.zip | |
gcc-4.9, gcc-5: Use variable SYSTEMLIBS_DIR instead of hardcoding it for aarch64
Change-Id: I54dc82a569f02d489137d88f16d6b768c4ab779b
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
4 files changed, 53 insertions, 0 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.9.inc b/meta/recipes-devtools/gcc/gcc-4.9.inc index ee31f0b620..9ed3e09dbd 100644 --- a/meta/recipes-devtools/gcc/gcc-4.9.inc +++ b/meta/recipes-devtools/gcc/gcc-4.9.inc @@ -78,6 +78,7 @@ SRC_URI = "\ file://0060-Only-allow-e500-double-in-SPE_SIMD_REGNO_P-registers.patch \ file://0061-target-gcc-includedir.patch \ file://0062-gcc-var-tracking.c-backport-from-gcc-trunk-r212178.patch \ + file://0063-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch \ " SRC_URI[md5sum] = "4df8ee253b7f3863ad0b86359cd39c43" SRC_URI[sha256sum] = "2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd" diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0063-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch b/meta/recipes-devtools/gcc/gcc-4.9/0063-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch new file mode 100644 index 0000000000..c48bd48478 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.9/0063-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch @@ -0,0 +1,24 @@ +From 861bcfd4ae814f351e0c668ee26d01d1331e0422 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 28 Apr 2015 23:15:27 -0700 +Subject: [PATCH 36/37] Use SYSTEMLIBS_DIR replacement instead of hardcoding + base_libdir + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + gcc/config/aarch64/aarch64-linux.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: gcc-4.9.2/gcc/config/aarch64/aarch64-linux.h +=================================================================== +--- gcc-4.9.2.orig/gcc/config/aarch64/aarch64-linux.h ++++ gcc-4.9.2/gcc/config/aarch64/aarch64-linux.h +@@ -21,7 +21,7 @@ + #ifndef GCC_AARCH64_LINUX_H + #define GCC_AARCH64_LINUX_H + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}.so.1" ++#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-aarch64%{mbig-endian:_be}.so.1" + + #define CPP_SPEC "%{pthread:-D_REENTRANT}" + diff --git a/meta/recipes-devtools/gcc/gcc-5.1.inc b/meta/recipes-devtools/gcc/gcc-5.1.inc index d38a7d9d91..db4c795ef9 100644 --- a/meta/recipes-devtools/gcc/gcc-5.1.inc +++ b/meta/recipes-devtools/gcc/gcc-5.1.inc @@ -67,6 +67,7 @@ SRC_URI = "\ file://0033-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch \ file://0034-Don-t-search-host-directory-during-relink-if-inst_pr.patch \ file://0035-Dont-link-the-plugins-with-libgomp-explicitly.patch \ + file://0036-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch \ " #S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${SNAP}" diff --git a/meta/recipes-devtools/gcc/gcc-5.1/0036-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch b/meta/recipes-devtools/gcc/gcc-5.1/0036-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch new file mode 100644 index 0000000000..b691946b0e --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-5.1/0036-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch @@ -0,0 +1,27 @@ +From 861bcfd4ae814f351e0c668ee26d01d1331e0422 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 28 Apr 2015 23:15:27 -0700 +Subject: [PATCH 36/37] Use SYSTEMLIBS_DIR replacement instead of hardcoding + base_libdir + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + gcc/config/aarch64/aarch64-linux.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h +index 9abb252..79525ee 100644 +--- a/gcc/config/aarch64/aarch64-linux.h ++++ b/gcc/config/aarch64/aarch64-linux.h +@@ -21,7 +21,7 @@ + #ifndef GCC_AARCH64_LINUX_H + #define GCC_AARCH64_LINUX_H + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" ++#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" + + #undef ASAN_CC1_SPEC + #define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}" +-- +2.1.4 + |