use-pure-64bit-configs.patch (9256B)
1From e0453ba5a738647f84a6dac9d8551fe8dbfdbece Mon Sep 17 00:00:00 2001 2From: Daniel Kolesa <daniel@octaforge.org> 3Date: Sun, 8 Nov 2020 03:58:09 +0100 4Subject: [PATCH] use pure 64-bit config 5 6avoid using lib64 dirs 7 8when adding a new platform, expand this patch 9--- 10 gcc/config/aarch64/t-aarch64-linux | 2 +- 11 gcc/config/i386/linux64.h | 2 +- 12 gcc/config/i386/t-linux64 | 4 ++-- 13 gcc/config/mips/linux.h | 4 ++-- 14 gcc/config/mips/mips.h | 8 ++++---- 15 gcc/config/mips/t-linux64 | 6 +++--- 16 gcc/config/rs6000/linux64.h | 8 ++++---- 17 gcc/config/rs6000/t-linux | 6 ++++-- 18 gcc/config/rs6000/t-linux64 | 4 ++-- 19 gcc/config/rs6000/t-linux64bele | 4 ++-- 20 gcc/config/rs6000/t-linux64lebe | 4 ++-- 21 gcc/config/s390/t-linux64 | 4 ++-- 22 12 files changed, 29 insertions(+), 27 deletions(-) 23 24diff --git gcc/config/aarch64/t-aarch64-linux gcc/config/aarch64/t-aarch64-linux 25index 5ad670ba2..e10d58a6c 100644 26--- gcc/config/aarch64/t-aarch64-linux 27+++ gcc/config/aarch64/t-aarch64-linux 28@@ -22,7 +22,7 @@ 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+MULTILIB_OSDIRNAMES = mabi.lp64=../lib 34 MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu) 35 36 MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32) 37diff --git gcc/config/i386/linux64.h gcc/config/i386/linux64.h 38index c08221c42..6f18c0214 100644 39--- gcc/config/i386/linux64.h 40+++ gcc/config/i386/linux64.h 41@@ -28,7 +28,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see 42 #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64" 43 44 #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" 45-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" 46+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" 47 #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2" 48 49 #undef MUSL_DYNAMIC_LINKER32 50diff --git gcc/config/i386/t-linux64 gcc/config/i386/t-linux64 51index c686ab2f0..89c183019 100644 52--- gcc/config/i386/t-linux64 53+++ gcc/config/i386/t-linux64 54@@ -33,6 +33,6 @@ 55 comma=, 56 MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG)) 57 MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS))) 58-MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu) 59-MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu) 60+MULTILIB_OSDIRNAMES = m64=../lib 61+MULTILIB_OSDIRNAMES+= m32=../lib32 62 MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32) 63diff --git gcc/config/mips/linux.h gcc/config/mips/linux.h 64index 6f79ac9c0..bddfacd84 100644 65--- gcc/config/mips/linux.h 66+++ gcc/config/mips/linux.h 67@@ -24,9 +24,9 @@ along with GCC; see the file COPYING3. If not see 68 #define GLIBC_DYNAMIC_LINKER32 \ 69 "%{mnan=2008:/lib/ld-linux-mipsn8.so.1;:/lib/ld.so.1}" 70 #define GLIBC_DYNAMIC_LINKER64 \ 71- "%{mnan=2008:/lib64/ld-linux-mipsn8.so.1;:/lib64/ld.so.1}" 72+ "%{mnan=2008:/lib/ld-linux-mipsn8.so.1;:/lib/ld.so.1}" 73 #define GLIBC_DYNAMIC_LINKERN32 \ 74- "%{mnan=2008:/lib32/ld-linux-mipsn8.so.1;:/lib32/ld.so.1}" 75+ "%{mnan=2008:/lib/ld-linux-mipsn8.so.1;:/lib/ld.so.1}" 76 77 #undef UCLIBC_DYNAMIC_LINKER32 78 #define UCLIBC_DYNAMIC_LINKER32 \ 79diff --git gcc/config/mips/mips.h gcc/config/mips/mips.h 80index 953d82e85..3f09f21bc 100644 81--- gcc/config/mips/mips.h 82+++ gcc/config/mips/mips.h 83@@ -3447,11 +3447,11 @@ struct GTY(()) machine_function { 84 /* If we are *not* using multilibs and the default ABI is not ABI_32 we 85 need to change these from /lib and /usr/lib. */ 86 #if MIPS_ABI_DEFAULT == ABI_N32 87-#define STANDARD_STARTFILE_PREFIX_1 "/lib32/" 88-#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib32/" 89+#define STANDARD_STARTFILE_PREFIX_1 "/lib/" 90+#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" 91 #elif MIPS_ABI_DEFAULT == ABI_64 92-#define STANDARD_STARTFILE_PREFIX_1 "/lib64/" 93-#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib64/" 94+#define STANDARD_STARTFILE_PREFIX_1 "/lib/" 95+#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" 96 #endif 97 98 /* Load store bonding is not supported by micromips and fix_24k. The 99diff --git gcc/config/mips/t-linux64 gcc/config/mips/t-linux64 100index 3a2ff700d..3b253aeb9 100644 101--- gcc/config/mips/t-linux64 102+++ gcc/config/mips/t-linux64 103@@ -21,6 +21,6 @@ MULTILIB_DIRNAMES = n32 32 64 104 MIPS_EL = $(if $(filter %el, $(firstword $(subst -, ,$(target)))),el) 105 MIPS_SOFT = $(if $(strip $(filter MASK_SOFT_FLOAT_ABI, $(target_cpu_default)) $(filter soft, $(with_float))),soft) 106 MULTILIB_OSDIRNAMES = \ 107- ../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \ 108- ../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \ 109- ../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT)) 110+ ../lib \ 111+ ../lib32 \ 112+ ../lib 113diff --git gcc/config/rs6000/linux64.h gcc/config/rs6000/linux64.h 114index 9946d3fed..fcdf0d265 100644 115--- gcc/config/rs6000/linux64.h 116+++ gcc/config/rs6000/linux64.h 117@@ -427,12 +427,12 @@ extern int dot_symbols; 118 119 #ifdef LINUX64_DEFAULT_ABI_ELFv2 120 #define GLIBC_DYNAMIC_LINKER64 \ 121-"%{mabi=elfv1:%(dynamic_linker_prefix)/lib64/ld64.so.1;" \ 122-":%(dynamic_linker_prefix)/lib64/ld64.so.2}" 123+"%{mabi=elfv1:%(dynamic_linker_prefix)/lib/ld64.so.1;" \ 124+":%(dynamic_linker_prefix)/lib/ld64.so.2}" 125 #else 126 #define GLIBC_DYNAMIC_LINKER64 \ 127-"%{mabi=elfv2:%(dynamic_linker_prefix)/lib64/ld64.so.2;" \ 128-":%(dynamic_linker_prefix)/lib64/ld64.so.1}" 129+"%{mabi=elfv2:%(dynamic_linker_prefix)/lib/ld64.so.2;" \ 130+":%(dynamic_linker_prefix)/lib/ld64.so.1}" 131 #endif 132 133 #undef MUSL_DYNAMIC_LINKER32 134diff --git gcc/config/rs6000/t-linux gcc/config/rs6000/t-linux 135index aeb7440c4..ab14c455d 100644 136--- gcc/config/rs6000/t-linux 137+++ gcc/config/rs6000/t-linux 138@@ -2,7 +2,8 @@ 139 # or soft-float. 140 ifeq (,$(filter $(with_cpu),$(SOFT_FLOAT_CPUS))$(findstring soft,$(with_float))) 141 ifneq (,$(findstring powerpc64,$(target))) 142-MULTILIB_OSDIRNAMES := .=../lib64$(call if_multiarch,:powerpc64-linux-gnu) 143+MULTILIB_OSDIRNAMES := m64=../lib 144+MULTILIB_OSDIRNAMES += m32=../lib32 145 else 146 MULTIARCH_DIRNAME := $(call if_multiarch,powerpc-linux-gnu) 147 endif 148@@ -10,7 +11,8 @@ ifneq (,$(findstring powerpcle,$(target))) 149 MULTIARCH_DIRNAME := $(subst -linux,le-linux,$(MULTIARCH_DIRNAME)) 150 endif 151 ifneq (,$(findstring powerpc64le,$(target))) 152-MULTILIB_OSDIRNAMES := $(subst -linux,le-linux,$(MULTILIB_OSDIRNAMES)) 153+MULTILIB_OSDIRNAMES := m64=../lib 154+MULTILIB_OSDIRNAMES += m32=../lib32 155 endif 156 endif 157 158diff --git gcc/config/rs6000/t-linux64 gcc/config/rs6000/t-linux64 159index f3c6e2be1..f4df2377d 100644 160--- gcc/config/rs6000/t-linux64 161+++ gcc/config/rs6000/t-linux64 162@@ -28,8 +28,8 @@ 163 MULTILIB_OPTIONS := m64/m32 164 MULTILIB_DIRNAMES := 64 32 165 MULTILIB_EXTRA_OPTS := 166-MULTILIB_OSDIRNAMES := m64=../lib64$(call if_multiarch,:powerpc64-linux-gnu) 167-MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu) 168+MULTILIB_OSDIRNAMES := m64=../lib 169+MULTILIB_OSDIRNAMES += m32=../lib32 170 171 rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c 172 $(COMPILE) $< 173diff --git gcc/config/rs6000/t-linux64bele gcc/config/rs6000/t-linux64bele 174index 97c1ee6fb..08d72639c 100644 175--- gcc/config/rs6000/t-linux64bele 176+++ gcc/config/rs6000/t-linux64bele 177@@ -2,6 +2,6 @@ 178 179 MULTILIB_OPTIONS += mlittle 180 MULTILIB_DIRNAMES += le 181-MULTILIB_OSDIRNAMES += $(subst =,.mlittle=,$(subst lible32,lib32le,$(subst lible64,lib64le,$(subst lib,lible,$(subst -linux,le-linux,$(MULTILIB_OSDIRNAMES)))))) 182-MULTILIB_OSDIRNAMES += $(subst $(if $(findstring 64,$(target)),m64,m32).,,$(filter $(if $(findstring 64,$(target)),m64,m32).mlittle%,$(MULTILIB_OSDIRNAMES))) 183+MULTILIB_OSDIRNAMES = m64=../lib 184+MULTILIB_OSDIRNAMES+= m32=../lib32 185 MULTILIB_MATCHES := ${MULTILIB_MATCHES_ENDIAN} 186diff --git gcc/config/rs6000/t-linux64lebe gcc/config/rs6000/t-linux64lebe 187index 2e63bdb9f..c6e1c5db6 100644 188--- gcc/config/rs6000/t-linux64lebe 189+++ gcc/config/rs6000/t-linux64lebe 190@@ -2,6 +2,6 @@ 191 192 MULTILIB_OPTIONS += mbig 193 MULTILIB_DIRNAMES += be 194-MULTILIB_OSDIRNAMES += $(subst =,.mbig=,$(subst libbe32,lib32be,$(subst libbe64,lib64be,$(subst lib,libbe,$(subst le-linux,-linux,$(MULTILIB_OSDIRNAMES)))))) 195-MULTILIB_OSDIRNAMES += $(subst $(if $(findstring 64,$(target)),m64,m32).,,$(filter $(if $(findstring 64,$(target)),m64,m32).mbig%,$(MULTILIB_OSDIRNAMES))) 196+MULTILIB_OSDIRNAMES := m64=../lib 197+MULTILIB_OSDIRNAMES += m32=../lib32 198 MULTILIB_MATCHES := ${MULTILIB_MATCHES_ENDIAN} 199diff --git gcc/config/s390/t-linux64 gcc/config/s390/t-linux64 200index cc6ab3670..7f498ee1c 100644 201--- gcc/config/s390/t-linux64 202+++ gcc/config/s390/t-linux64 203@@ -7,5 +7,5 @@ 204 205 MULTILIB_OPTIONS = m64/m31 206 MULTILIB_DIRNAMES = 64 32 207-MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:s390x-linux-gnu) 208-MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:s390-linux-gnu) 209+MULTILIB_OSDIRNAMES = m64=../lib 210+MULTILIB_OSDIRNAMES+= m32=../lib32 211-- 2122.29.2 213