| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Disable the MULTILIB_OSDIRNAMES and other multilib options. |
| 2 | |
| 3 | Hard coding the MULTILIB_OSDIRNAMES with ../lib64 is causing problems on |
| 4 | systems where the libdir is NOT set to /lib64. This is allowed by the ABI, as |
| 5 | long as the dynamic loader is present in /lib. |
| 6 | |
| 7 | We simply want to use the default rules in gcc to find and configure the |
| 8 | normal libdir. |
| 9 | |
| 10 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
| 11 | |
| 12 | Index: 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 = |