00da0a2232
Void used to mess with the dynamic linker paths, which is very wrong, so it's time to change that. The reason this was done was because the lib32/64 symlinks were not available in unconfigured chroots (since base-files used to create them during configuration) and this has not been the case for a while, so there is nothing blocking this. While at it, change the library paths to lib64 for 64-bit systems and lib32 for 32-bit systems. This merely changes the toolchain and usually does not have much of an effect; dynamic libraries do not contain the paths (the search paths are controlled by the dynamic linker). The lib32/64 symlinks are contained in base-files, so there is no harm in having this be consistent.
110 lines
4.7 KiB
Diff
110 lines
4.7 KiB
Diff
Always use lib64 for 64-bit and lib32 for 32-bit.
|
|
|
|
Do not change the dynamic linkers in any way, though.
|
|
|
|
When adding a new platform, fix this up too.
|
|
|
|
--- gcc/config/aarch64/t-aarch64-linux
|
|
+++ gcc/config/aarch64/t-aarch64-linux
|
|
@@ -22,7 +22,7 @@ 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)
|
|
+MULTILIB_OSDIRNAMES = mabi.lp64=../lib64
|
|
MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu)
|
|
|
|
MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32)
|
|
--- gcc/config/i386/t-linux64
|
|
+++ gcc/config/i386/t-linux64
|
|
@@ -33,6 +33,6 @@
|
|
comma=,
|
|
MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
|
|
MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
|
|
-MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
|
|
-MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu)
|
|
+MULTILIB_OSDIRNAMES = m64=../lib64
|
|
+MULTILIB_OSDIRNAMES+= m32=../lib32
|
|
MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
|
|
--- gcc/config/mips/t-linux64
|
|
+++ gcc/config/mips/t-linux64
|
|
@@ -21,6 +21,6 @@ MULTILIB_DIRNAMES = n32 32 64
|
|
MIPS_EL = $(if $(filter %el, $(firstword $(subst -, ,$(target)))),el)
|
|
MIPS_SOFT = $(if $(strip $(filter MASK_SOFT_FLOAT_ABI, $(target_cpu_default)) $(filter soft, $(with_float))),soft)
|
|
MULTILIB_OSDIRNAMES = \
|
|
- ../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \
|
|
- ../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \
|
|
- ../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))
|
|
+ ../lib32 \
|
|
+ ../lib \
|
|
+ ../lib64
|
|
--- gcc/config/rs6000/t-linux
|
|
+++ gcc/config/rs6000/t-linux
|
|
@@ -2,7 +2,8 @@
|
|
# or soft-float.
|
|
ifeq (,$(filter $(with_cpu),$(SOFT_FLOAT_CPUS))$(findstring soft,$(with_float)))
|
|
ifneq (,$(findstring powerpc64,$(target)))
|
|
-MULTILIB_OSDIRNAMES := .=../lib64$(call if_multiarch,:powerpc64-linux-gnu)
|
|
+MULTILIB_OSDIRNAMES := m64=../lib64
|
|
+MULTILIB_OSDIRNAMES += m32=../lib32
|
|
else
|
|
MULTIARCH_DIRNAME := $(call if_multiarch,powerpc-linux-gnu)
|
|
endif
|
|
@@ -10,7 +11,8 @@ ifneq (,$(findstring powerpcle,$(target)))
|
|
MULTIARCH_DIRNAME := $(subst -linux,le-linux,$(MULTIARCH_DIRNAME))
|
|
endif
|
|
ifneq (,$(findstring powerpc64le,$(target)))
|
|
-MULTILIB_OSDIRNAMES := $(subst -linux,le-linux,$(MULTILIB_OSDIRNAMES))
|
|
+MULTILIB_OSDIRNAMES := m64=../lib64
|
|
+MULTILIB_OSDIRNAMES += m32=../lib32
|
|
endif
|
|
endif
|
|
|
|
--- gcc/config/rs6000/t-linux64
|
|
+++ gcc/config/rs6000/t-linux64
|
|
@@ -28,8 +28,8 @@
|
|
MULTILIB_OPTIONS := m64/m32
|
|
MULTILIB_DIRNAMES := 64 32
|
|
MULTILIB_EXTRA_OPTS :=
|
|
-MULTILIB_OSDIRNAMES := m64=../lib64$(call if_multiarch,:powerpc64-linux-gnu)
|
|
-MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu)
|
|
+MULTILIB_OSDIRNAMES := m64=../lib64
|
|
+MULTILIB_OSDIRNAMES += m32=../lib32
|
|
|
|
rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c
|
|
$(COMPILE) $<
|
|
--- gcc/config/rs6000/t-linux64bele
|
|
+++ gcc/config/rs6000/t-linux64bele
|
|
@@ -2,6 +2,6 @@
|
|
|
|
MULTILIB_OPTIONS += mlittle
|
|
MULTILIB_DIRNAMES += le
|
|
-MULTILIB_OSDIRNAMES += $(subst =,.mlittle=,$(subst lible32,lib32le,$(subst lible64,lib64le,$(subst lib,lible,$(subst -linux,le-linux,$(MULTILIB_OSDIRNAMES))))))
|
|
-MULTILIB_OSDIRNAMES += $(subst $(if $(findstring 64,$(target)),m64,m32).,,$(filter $(if $(findstring 64,$(target)),m64,m32).mlittle%,$(MULTILIB_OSDIRNAMES)))
|
|
+MULTILIB_OSDIRNAMES = m64=../lib64
|
|
+MULTILIB_OSDIRNAMES+= m32=../lib32
|
|
MULTILIB_MATCHES := ${MULTILIB_MATCHES_ENDIAN}
|
|
--- gcc/config/rs6000/t-linux64lebe
|
|
+++ gcc/config/rs6000/t-linux64lebe
|
|
@@ -2,6 +2,6 @@
|
|
|
|
MULTILIB_OPTIONS += mbig
|
|
MULTILIB_DIRNAMES += be
|
|
-MULTILIB_OSDIRNAMES += $(subst =,.mbig=,$(subst libbe32,lib32be,$(subst libbe64,lib64be,$(subst lib,libbe,$(subst le-linux,-linux,$(MULTILIB_OSDIRNAMES))))))
|
|
-MULTILIB_OSDIRNAMES += $(subst $(if $(findstring 64,$(target)),m64,m32).,,$(filter $(if $(findstring 64,$(target)),m64,m32).mbig%,$(MULTILIB_OSDIRNAMES)))
|
|
+MULTILIB_OSDIRNAMES := m64=../lib64
|
|
+MULTILIB_OSDIRNAMES += m32=../lib32
|
|
MULTILIB_MATCHES := ${MULTILIB_MATCHES_ENDIAN}
|
|
--- gcc/config/s390/t-linux64
|
|
+++ gcc/config/s390/t-linux64
|
|
@@ -7,5 +7,5 @@
|
|
|
|
MULTILIB_OPTIONS = m64/m31
|
|
MULTILIB_DIRNAMES = 64 32
|
|
-MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:s390x-linux-gnu)
|
|
-MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:s390-linux-gnu)
|
|
+MULTILIB_OSDIRNAMES = m64=../lib64
|
|
+MULTILIB_OSDIRNAMES+= m32=../lib32
|
|
--
|
|
2.29.2
|
|
|