From a38567ccce783cb625ab11c5bf13c7f616a7d82e Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Mon, 2 Sep 2024 19:37:14 +0200 Subject: [PATCH 01/11] Debian Multi-Arch Patch #1 --- gcc/Makefile.in | 2 +- gcc/config.gcc | 8 +++++--- gcc/config/aarch64/t-aarch64-linux | 2 +- gcc/config/arc/t-multilib-linux | 3 +++ gcc/config/i386/t-linux64 | 10 ++++++++++ gcc/config/mips/t-linux64 | 32 +++++++++++++++++++++--------- gcc/config/rs6000/t-linux64 | 2 ++ gcc/config/s390/t-linux64 | 2 ++ gcc/config/sh/t-linux | 8 ++++++++ gcc/config/sparc/t-linux64 | 2 ++ 10 files changed, 57 insertions(+), 14 deletions(-) diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 68fda1a7591..2a1bd5e40fc 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -577,7 +577,7 @@ BUILD_SYSTEM_HEADER_DIR = `echo @BUILD_SYSTEM_HEADER_DIR@ | sed -e :a -e 's,[^/] STMP_FIXINC = @STMP_FIXINC@ # Test to see whether exists in the system header files. -LIMITS_H_TEST = [ -f $(BUILD_SYSTEM_HEADER_DIR)/limits.h ] +LIMITS_H_TEST = [ -f $(BUILD_SYSTEM_HEADER_DIR)/limits.h -o -f $(BUILD_SYSTEM_HEADER_DIR)/$(MULTIARCH_DIRNAME)/limits.h ] # Directory for prefix to system directories, for # each of $(system_prefix)/usr/include, $(system_prefix)/usr/lib, etc. diff --git a/gcc/config.gcc b/gcc/config.gcc index f09ce9f63a0..bab80d2dfbe 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -2644,7 +2644,8 @@ mips*-*-linux*) # Linux MIPS, either endian. extra_options="${extra_options} linux-android.opt" case ${target} in mipsisa32r6*) - default_mips_arch=mips32r6 + with_arch_32="mips32r6" + with_arch_64="mips64r6" ;; mipsisa32r2*) default_mips_arch=mips32r2 @@ -2666,7 +2667,8 @@ mips*-*-linux*) # Linux MIPS, either endian. ;; mipsisa64r6*-*-linux-gnuabi64) default_mips_abi=64 - default_mips_arch=mips64r6 + with_arch_32="mips32r6" + with_arch_64="mips64r6" enable_mips_multilibs="yes" ;; mipsisa64r6*-*-linux*) @@ -5891,7 +5893,7 @@ case ${target} in ;; i[34567]86-*-linux* | x86_64-*-linux*) extra_objs="${extra_objs} gnu-property.o" - tmake_file="$tmake_file i386/t-linux i386/t-gnu-property" + tmake_file="i386/t-linux $tmake_file i386/t-gnu-property" ;; i[34567]86-*-kfreebsd*-gnu | x86_64-*-kfreebsd*-gnu) tmake_file="$tmake_file i386/t-kfreebsd" diff --git a/gcc/config/aarch64/t-aarch64-linux b/gcc/config/aarch64/t-aarch64-linux index 3f7b786ecbb..5a526f60194 100644 --- a/gcc/config/aarch64/t-aarch64-linux +++ b/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=../lib$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu) MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu) MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32) diff --git a/gcc/config/arc/t-multilib-linux b/gcc/config/arc/t-multilib-linux index 07bc77ba34a..1b72174bd73 100644 --- a/gcc/config/arc/t-multilib-linux +++ b/gcc/config/arc/t-multilib-linux @@ -23,3 +23,6 @@ MULTILIB_DIRNAMES = hs archs hs38 hs38_linux arc700 nps400 # Aliases: MULTILIB_MATCHES += mcpu?arc700=mA7 MULTILIB_MATCHES += mcpu?arc700=mARC700 + +MULTILIB_OSDIRNAMES = +MULTIARCH_DIRNAME = $(call if_multiarch,arc-linux-gnu) diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64 index f9edc289e57..8dbd1d792da 100644 --- a/gcc/config/i386/t-linux64 +++ b/gcc/config/i386/t-linux64 @@ -36,3 +36,13 @@ 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+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32) + +ifneq (,$(findstring x86_64,$(target))) + ifneq (,$(findstring biarchx32.h,$(tm_include_list))) + MULTIARCH_DIRNAME = $(call if_multiarch,x86_64-linux-gnux32) + else + MULTIARCH_DIRNAME = $(call if_multiarch,x86_64-linux-gnu) + endif +else + MULTIARCH_DIRNAME = $(call if_multiarch,i386-linux-gnu) +endif diff --git a/gcc/config/mips/t-linux64 b/gcc/config/mips/t-linux64 index e4e2f5eaedb..746159a1196 100644 --- a/gcc/config/mips/t-linux64 +++ b/gcc/config/mips/t-linux64 @@ -18,24 +18,28 @@ MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64 MULTILIB_DIRNAMES = n32 32 64 +MIPS_R6 = $(if $(findstring r6, $(firstword $(subst -, ,$(target)))),r6) +MIPS_32 = $(if $(findstring r6, $(firstword $(subst -, ,$(target)))),32) +MIPS_ISA = $(if $(findstring r6, $(firstword $(subst -, ,$(target)))),isa) 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) + ifeq (yes,$(enable_multiarch)) ifneq (,$(findstring gnuabi64,$(target))) MULTILIB_OSDIRNAMES = \ - ../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \ - ../libo32$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \ - ../lib$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT)) + ../lib32$(call if_multiarch,:mips$(MIPS_ISA)64$(MIPS_R6)$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \ + ../libo32$(call if_multiarch,:mips$(MIPS_ISA)$(MIPS_32)$(MIPS_R6)$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \ + ../lib$(call if_multiarch,:mips$(MIPS_ISA)64$(MIPS_R6)$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT)) else ifneq (,$(findstring gnuabin32,$(target))) MULTILIB_OSDIRNAMES = \ - ../lib$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \ - ../libo32$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \ - ../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT)) + ../lib$(call if_multiarch,:mips$(MIPS_ISA)64$(MIPS_R6)$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \ + ../libo32$(call if_multiarch,:mips$(MIPS_ISA)$(MIPS_32)$(MIPS_R6)$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \ + ../lib64$(call if_multiarch,:mips$(MIPS_ISA)64$(MIPS_R6)$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT)) else 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$(call if_multiarch,:mips$(MIPS_ISA)64$(MIPS_R6)$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \ + ../lib$(call if_multiarch,:mips$(MIPS_ISA)$(MIPS_32)$(MIPS_R6)$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \ + ../lib64$(call if_multiarch,:mips$(MIPS_ISA)64$(MIPS_R6)$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT)) endif else MULTILIB_OSDIRNAMES = \ @@ -43,3 +47,13 @@ else ../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \ ../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT)) endif + +ifneq (,$(findstring abin32,$(target))) +MULTIARCH_DIRNAME = $(call if_multiarch,mips$(MIPS_ISA)64$(MIPS_R6)$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) +else +ifneq (,$(findstring abi64,$(target))) +MULTIARCH_DIRNAME = $(call if_multiarch,mips$(MIPS_ISA)64$(MIPS_R6)$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT)) +else +MULTIARCH_DIRNAME = $(call if_multiarch,mips$(MIPS_ISA)$(MIPS_32)$(MIPS_R6)$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) +endif +endif diff --git a/gcc/config/rs6000/t-linux64 b/gcc/config/rs6000/t-linux64 index 248b5891e36..2c1a5030596 100644 --- a/gcc/config/rs6000/t-linux64 +++ b/gcc/config/rs6000/t-linux64 @@ -31,6 +31,8 @@ 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) +MULTIARCH_DIRNAME = $(call if_multiarch,powerpc$(if $(findstring 64,$(target)),64)-linux-gnu) + rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.cc $(COMPILE) $< $(POSTCOMPILE) diff --git a/gcc/config/s390/t-linux64 b/gcc/config/s390/t-linux64 index cc6ab367072..d4216dc2ece 100644 --- a/gcc/config/s390/t-linux64 +++ b/gcc/config/s390/t-linux64 @@ -9,3 +9,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) + +MULTIARCH_DIRNAME = $(call if_multiarch,s390$(if $(findstring s390x,$(target)),x)-linux-gnu) diff --git a/gcc/config/sh/t-linux b/gcc/config/sh/t-linux index 4866dac5b6e..f9ae81f6d10 100644 --- a/gcc/config/sh/t-linux +++ b/gcc/config/sh/t-linux @@ -1,3 +1,11 @@ MULTILIB_DIRNAMES= MULTILIB_MATCHES= + +ifneq (,$(findstring sh4,$(target))) +MULTILIB_OSDIRNAMES = .:sh4-linux-gnu sh4_nofpu-linux-gnu:sh4-linux-gnu +MULTIARCH_DIRNAME = $(call if_multiarch,sh4-linux-gnu) +else +MULTILIB_OSDIRNAMES = .:sh3-linux-gnu sh3_nofpu-linux-gnu:sh3-linux-gnu +MULTIARCH_DIRNAME = $(call if_multiarch,sh3-linux-gnu) +endif MULTILIB_EXCEPTIONS=m1 mb/m1 m2a diff --git a/gcc/config/sparc/t-linux64 b/gcc/config/sparc/t-linux64 index 0455656a9f0..bad77fea9d7 100644 --- a/gcc/config/sparc/t-linux64 +++ b/gcc/config/sparc/t-linux64 @@ -27,3 +27,5 @@ MULTILIB_OPTIONS = m64/m32 MULTILIB_DIRNAMES = 64 32 MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:sparc64-linux-gnu) MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:sparc-linux-gnu) + +MULTIARCH_DIRNAME = $(call if_multiarch,sparc$(if $(findstring 64,$(target)),64)-linux-gnu) -- 2.45.2