From bb6fea821483aa3259b34e101a39c993edd01411 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 20 Feb 2015 10:21:55 +0000 Subject: [PATCH 31/46] 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 Signed-off-by: Khem Raj --- 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 c296376..3bb59bf 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.6.3