consistent-library-paths.patch (4842B)
1Always use lib64 for 64-bit and lib32 for 32-bit. 2 3Do not change the dynamic linkers in any way, though. 4 5When adding a new platform, fix this up too. 6 7--- gcc/config/aarch64/t-aarch64-linux 8+++ gcc/config/aarch64/t-aarch64-linux 9@@ -22,7 +22,7 @@ LIB1ASMSRC = aarch64/lib1funcs.asm 10 LIB1ASMFUNCS = _aarch64_sync_cache_range 11 12 AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be) 13-MULTILIB_OSDIRNAMES = mabi.lp64=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu) 14+MULTILIB_OSDIRNAMES = mabi.lp64=../lib64 15 MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu) 16 17 MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32) 18--- gcc/config/i386/t-linux64 19+++ gcc/config/i386/t-linux64 20@@ -33,6 +33,6 @@ 21 comma=, 22 MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG)) 23 MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS))) 24-MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu) 25-MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu) 26+MULTILIB_OSDIRNAMES = m64=../lib64 27+MULTILIB_OSDIRNAMES+= m32=../lib32 28 MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32) 29--- gcc/config/mips/t-linux64 30+++ gcc/config/mips/t-linux64 31@@ -21,6 +21,6 @@ MULTILIB_DIRNAMES = n32 32 64 32 MIPS_EL = $(if $(filter %el, $(firstword $(subst -, ,$(target)))),el) 33 MIPS_SOFT = $(if $(strip $(filter MASK_SOFT_FLOAT_ABI, $(target_cpu_default)) $(filter soft, $(with_float))),soft) 34 MULTILIB_OSDIRNAMES = \ 35- ../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \ 36- ../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \ 37- ../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT)) 38+ ../lib32 \ 39+ ../lib \ 40+ ../lib64 41--- gcc/config/rs6000/t-linux 42+++ gcc/config/rs6000/t-linux 43@@ -2,7 +2,8 @@ 44 # or soft-float. 45 ifeq (,$(filter $(with_cpu),$(SOFT_FLOAT_CPUS))$(findstring soft,$(with_float))) 46 ifneq (,$(findstring powerpc64,$(target))) 47-MULTILIB_OSDIRNAMES := .=../lib64$(call if_multiarch,:powerpc64-linux-gnu) 48+MULTILIB_OSDIRNAMES := m64=../lib64 49+MULTILIB_OSDIRNAMES += m32=../lib32 50 else 51 MULTIARCH_DIRNAME := $(call if_multiarch,powerpc-linux-gnu) 52 endif 53@@ -10,7 +11,8 @@ ifneq (,$(findstring powerpcle,$(target))) 54 MULTIARCH_DIRNAME := $(subst -linux,le-linux,$(MULTIARCH_DIRNAME)) 55 endif 56 ifneq (,$(findstring powerpc64le,$(target))) 57-MULTILIB_OSDIRNAMES := $(subst -linux,le-linux,$(MULTILIB_OSDIRNAMES)) 58+MULTILIB_OSDIRNAMES := m64=../lib64 59+MULTILIB_OSDIRNAMES += m32=../lib32 60 endif 61 endif 62 63--- gcc/config/rs6000/t-linux64 64+++ gcc/config/rs6000/t-linux64 65@@ -28,8 +28,8 @@ 66 MULTILIB_OPTIONS := m64/m32 67 MULTILIB_DIRNAMES := 64 32 68 MULTILIB_EXTRA_OPTS := 69-MULTILIB_OSDIRNAMES := m64=../lib64$(call if_multiarch,:powerpc64-linux-gnu) 70-MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu) 71+MULTILIB_OSDIRNAMES := m64=../lib64 72+MULTILIB_OSDIRNAMES += m32=../lib32 73 74 rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c 75 $(COMPILE) $< 76--- gcc/config/rs6000/t-linux64bele 77+++ gcc/config/rs6000/t-linux64bele 78@@ -2,6 +2,6 @@ 79 80 MULTILIB_OPTIONS += mlittle 81 MULTILIB_DIRNAMES += le 82-MULTILIB_OSDIRNAMES += $(subst =,.mlittle=,$(subst lible32,lib32le,$(subst lible64,lib64le,$(subst lib,lible,$(subst -linux,le-linux,$(MULTILIB_OSDIRNAMES)))))) 83-MULTILIB_OSDIRNAMES += $(subst $(if $(findstring 64,$(target)),m64,m32).,,$(filter $(if $(findstring 64,$(target)),m64,m32).mlittle%,$(MULTILIB_OSDIRNAMES))) 84+MULTILIB_OSDIRNAMES = m64=../lib64 85+MULTILIB_OSDIRNAMES+= m32=../lib32 86 MULTILIB_MATCHES := ${MULTILIB_MATCHES_ENDIAN} 87--- gcc/config/rs6000/t-linux64lebe 88+++ gcc/config/rs6000/t-linux64lebe 89@@ -2,6 +2,6 @@ 90 91 MULTILIB_OPTIONS += mbig 92 MULTILIB_DIRNAMES += be 93-MULTILIB_OSDIRNAMES += $(subst =,.mbig=,$(subst libbe32,lib32be,$(subst libbe64,lib64be,$(subst lib,libbe,$(subst le-linux,-linux,$(MULTILIB_OSDIRNAMES)))))) 94-MULTILIB_OSDIRNAMES += $(subst $(if $(findstring 64,$(target)),m64,m32).,,$(filter $(if $(findstring 64,$(target)),m64,m32).mbig%,$(MULTILIB_OSDIRNAMES))) 95+MULTILIB_OSDIRNAMES := m64=../lib64 96+MULTILIB_OSDIRNAMES += m32=../lib32 97 MULTILIB_MATCHES := ${MULTILIB_MATCHES_ENDIAN} 98--- gcc/config/s390/t-linux64 99+++ gcc/config/s390/t-linux64 100@@ -7,5 +7,5 @@ 101 102 MULTILIB_OPTIONS = m64/m31 103 MULTILIB_DIRNAMES = 64 32 104-MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:s390x-linux-gnu) 105-MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:s390-linux-gnu) 106+MULTILIB_OSDIRNAMES = m64=../lib64 107+MULTILIB_OSDIRNAMES+= m32=../lib32 108-- 1092.29.2 110