summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/gcc
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2014-12-18 16:51:12 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-23 10:18:19 +0000
commit3923f7ea0b581f7a0f283e512ae8e70f63841a42 (patch)
treee73fba7cf9d4d7f20cf9f713d1d79a9641e0f1e0 /meta/recipes-devtools/gcc
parent5fd4e25c89c4e5d0e184954d18bb2cb1a4cb0a22 (diff)
downloadpoky-3923f7ea0b581f7a0f283e512ae8e70f63841a42.tar.gz
gcc: Disable aarch64 multilib options
We want to revert to default gcc behavior to support oe-core's ability to change the libdir. (From OE-Core rev: 7ea9e87217c78a20cebcb16a23bfd412e276440f) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc')
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.9.inc1
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.9/0057-aarch64-config.patch32
2 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.9.inc b/meta/recipes-devtools/gcc/gcc-4.9.inc
index 8f212b23ae..2568e995ac 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.9.inc
@@ -71,6 +71,7 @@ SRC_URI = "\
71 file://0054-gcc-Makefile.in-fix-parallel-building-failure.patch \ 71 file://0054-gcc-Makefile.in-fix-parallel-building-failure.patch \
72 file://0055-PR-rtl-optimization-61801.patch \ 72 file://0055-PR-rtl-optimization-61801.patch \
73 file://0056-top-level-reorder_gcc-bug-61144.patch \ 73 file://0056-top-level-reorder_gcc-bug-61144.patch \
74 file://0057-aarch64-config.patch \
74 file://0058-gcc-r212171.patch \ 75 file://0058-gcc-r212171.patch \
75 file://0059-gcc-PR-rtl-optimization-63348.patch \ 76 file://0059-gcc-PR-rtl-optimization-63348.patch \
76" 77"
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0057-aarch64-config.patch b/meta/recipes-devtools/gcc/gcc-4.9/0057-aarch64-config.patch
new file mode 100644
index 0000000000..f29559698a
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-4.9/0057-aarch64-config.patch
@@ -0,0 +1,32 @@
1Disable the MULTILIB_OSDIRNAMES and other multilib options.
2
3Hard coding the MULTILIB_OSDIRNAMES with ../lib64 is causing problems on
4systems where the libdir is NOT set to /lib64. This is allowed by the ABI, as
5long as the dynamic loader is present in /lib.
6
7We simply want to use the default rules in gcc to find and configure the
8normal libdir.
9
10Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
11
12Index: gcc-4.9.1/gcc/config/aarch64/t-aarch64-linux
13===================================================================
14--- gcc-4.9.1.orig/gcc/config/aarch64/t-aarch64-linux
15+++ gcc-4.9.1/gcc/config/aarch64/t-aarch64-linux
16@@ -21,11 +21,11 @@
17 LIB1ASMSRC = aarch64/lib1funcs.asm
18 LIB1ASMFUNCS = _aarch64_sync_cache_range
19
20-AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be)
21-MULTILIB_OSDIRNAMES = .=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)
22-MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu)
23+#AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be)
24+#MULTILIB_OSDIRNAMES = .=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)
25+#MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu)
26
27 # Disable the multilib for linux-gnu targets for the time being; focus
28 # on the baremetal targets.
29-MULTILIB_OPTIONS =
30-MULTILIB_DIRNAMES =
31+#MULTILIB_OPTIONS =
32+#MULTILIB_DIRNAMES =