| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 1 | From d4326ab74a362b0fc83ed866f82c359389a36adc Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Fri, 20 Feb 2015 10:21:55 +0000 |
| 4 | Subject: [PATCH 20/40] Disable the MULTILIB_OSDIRNAMES and other multilib |
| 5 | options. |
| 6 | |
| 7 | Hard coding the MULTILIB_OSDIRNAMES with ../lib64 is causing problems on |
| 8 | systems where the libdir is NOT set to /lib64. This is allowed by the |
| 9 | ABI, as |
| 10 | long as the dynamic loader is present in /lib. |
| 11 | |
| 12 | We simply want to use the default rules in gcc to find and configure the |
| 13 | normal libdir. |
| 14 | |
| 15 | Upstream-Status: Inappropriate[OE-Specific] |
| 16 | |
| 17 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
| 18 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 19 | --- |
| 20 | gcc/config/aarch64/t-aarch64-linux | 8 ++++---- |
| 21 | 1 file changed, 4 insertions(+), 4 deletions(-) |
| 22 | |
| 23 | diff --git a/gcc/config/aarch64/t-aarch64-linux b/gcc/config/aarch64/t-aarch64-linux |
| 24 | index b9897785a89..7d06f0d0edb 100644 |
| 25 | --- a/gcc/config/aarch64/t-aarch64-linux |
| 26 | +++ b/gcc/config/aarch64/t-aarch64-linux |
| 27 | @@ -21,8 +21,8 @@ |
| 28 | LIB1ASMSRC = aarch64/lib1funcs.asm |
| 29 | LIB1ASMFUNCS = _aarch64_sync_cache_range |
| 30 | |
| 31 | -AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be) |
| 32 | -MULTILIB_OSDIRNAMES = mabi.lp64=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu) |
| 33 | -MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu) |
| 34 | +#AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be) |
| 35 | +#MULTILIB_OSDIRNAMES = mabi.lp64=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu) |
| 36 | +#MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu) |
| 37 | |
| 38 | -MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32) |
| 39 | +#MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32) |
| 40 | -- |
| 41 | 2.21.0 |
| 42 | |