mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-26 18:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

gcc: Disable aarch64 multilib options

Browse Source 
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>
This commit is contained in:
Mark Hatle
2014-12-18 16:51:12 +08:00
committed by Richard Purdie
parent 5fd4e25c89
commit 3923f7ea0b
2 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
meta/recipes-devtools/gcc/gcc-4.9.inc
View File

@@ -71,6 +71,7 @@ SRC_URI = "\
file://0054-gcc-Makefile.in-fix-parallel-building-failure.patch \
file://0055-PR-rtl-optimization-61801.patch \
file://0056-top-level-reorder_gcc-bug-61144.patch \
file://0057-aarch64-config.patch \
file://0058-gcc-r212171.patch \
file://0059-gcc-PR-rtl-optimization-63348.patch \
"

32
meta/recipes-devtools/gcc/gcc-4.9/0057-aarch64-config.patch Normal file
View File

@@ -0,0 +1,32 @@
Disable the MULTILIB_OSDIRNAMES and other multilib options.
Hard coding the MULTILIB_OSDIRNAMES with ../lib64 is causing problems on
systems where the libdir is NOT set to /lib64. This is allowed by the ABI, as
long as the dynamic loader is present in /lib.
We simply want to use the default rules in gcc to find and configure the
normal libdir.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Index: gcc-4.9.1/gcc/config/aarch64/t-aarch64-linux
===================================================================
--- gcc-4.9.1.orig/gcc/config/aarch64/t-aarch64-linux
+++ gcc-4.9.1/gcc/config/aarch64/t-aarch64-linux
@@ -21,11 +21,11 @@
LIB1ASMSRC = aarch64/lib1funcs.asm
LIB1ASMFUNCS = _aarch64_sync_cache_range
-AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be)
-MULTILIB_OSDIRNAMES = .=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)
-MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu)
+#AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be)
+#MULTILIB_OSDIRNAMES = .=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)
+#MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu)
# Disable the multilib for linux-gnu targets for the time being; focus
# on the baremetal targets.
-MULTILIB_OPTIONS =
-MULTILIB_DIRNAMES =
+#MULTILIB_OPTIONS =
+#MULTILIB_DIRNAMES =