forked from brl/citadel
43 lines
1.6 KiB
Diff
43 lines
1.6 KiB
Diff
|
From ec0f843b86c0f76bc5ebb20fafbc4aae1be4db61 Mon Sep 17 00:00:00 2001
|
||
|
From: Khem Raj <raj.khem@gmail.com>
|
||
|
Date: Fri, 20 Feb 2015 10:21:55 +0000
|
||
|
Subject: [PATCH 29/47] 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.
|
||
|
|
||
|
Upstream-Status: Inappropriate[OE-Specific]
|
||
|
|
||
|
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||
|
---
|
||
|
gcc/config/aarch64/t-aarch64-linux | 8 ++++----
|
||
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
||
|
|
||
|
diff --git a/gcc/config/aarch64/t-aarch64-linux b/gcc/config/aarch64/t-aarch64-linux
|
||
|
index ab064ab6f22..f4b1f98b216 100644
|
||
|
--- a/gcc/config/aarch64/t-aarch64-linux
|
||
|
+++ b/gcc/config/aarch64/t-aarch64-linux
|
||
|
@@ -21,8 +21,8 @@
|
||
|
LIB1ASMSRC = aarch64/lib1funcs.asm
|
||
|
LIB1ASMFUNCS = _aarch64_sync_cache_range
|
||
|
|
||
|
-AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be)
|
||
|
-MULTILIB_OSDIRNAMES = mabi.lp64=../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 = mabi.lp64=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)
|
||
|
+#MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu)
|
||
|
|
||
|
-MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32
|
||
|
+#MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32
|
||
|
--
|
||
|
2.12.2
|
||
|
|