0024-use-pure-64-bit-configuration-where-appropriate.patch (5499B)
1 From c60bb23972769f687dcac689ddf00f88e46b8bb7 Mon Sep 17 00:00:00 2001 2 From: Ariadne Conill <ariadne@dereferenced.org> 3 Date: Fri, 21 Aug 2020 07:04:40 +0000 4 Subject: [PATCH] use pure 64-bit configuration where appropriate 5 6 --- 7 gcc/config/aarch64/t-aarch64-linux | 2 +- 8 gcc/config/i386/t-linux64 | 4 ++-- 9 gcc/config/rs6000/t-linux | 6 ++++-- 10 gcc/config/rs6000/t-linux64 | 4 ++-- 11 gcc/config/rs6000/t-linux64bele | 4 ++-- 12 gcc/config/rs6000/t-linux64lebe | 4 ++-- 13 gcc/config/s390/t-linux64 | 4 ++-- 14 7 files changed, 15 insertions(+), 13 deletions(-) 15 16 diff --git a/gcc/config/aarch64/t-aarch64-linux b/gcc/config/aarch64/t-aarch64-linux 17 index 83e59e33b85..6ec56fdf6a8 100644 18 --- a/gcc/config/aarch64/t-aarch64-linux 19 +++ b/gcc/config/aarch64/t-aarch64-linux 20 @@ -22,7 +22,7 @@ LIB1ASMSRC = aarch64/lib1funcs.asm 21 LIB1ASMFUNCS = _aarch64_sync_cache_range 22 23 AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be) 24 -MULTILIB_OSDIRNAMES = mabi.lp64=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu) 25 +MULTILIB_OSDIRNAMES = mabi.lp64=../lib 26 MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu) 27 28 MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32) 29 diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64 30 index 1171e218578..256f8c079ba 100644 31 --- a/gcc/config/i386/t-linux64 32 +++ b/gcc/config/i386/t-linux64 33 @@ -33,6 +33,6 @@ 34 comma=, 35 MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG)) 36 MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS))) 37 -MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu) 38 -MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu) 39 +MULTILIB_OSDIRNAMES = m64=../lib 40 +MULTILIB_OSDIRNAMES+= m32=../lib32 41 MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32) 42 diff --git a/gcc/config/rs6000/t-linux b/gcc/config/rs6000/t-linux 43 index aeb7440c492..ab14c455d8d 100644 44 --- a/gcc/config/rs6000/t-linux 45 +++ b/gcc/config/rs6000/t-linux 46 @@ -2,7 +2,8 @@ 47 # or soft-float. 48 ifeq (,$(filter $(with_cpu),$(SOFT_FLOAT_CPUS))$(findstring soft,$(with_float))) 49 ifneq (,$(findstring powerpc64,$(target))) 50 -MULTILIB_OSDIRNAMES := .=../lib64$(call if_multiarch,:powerpc64-linux-gnu) 51 +MULTILIB_OSDIRNAMES := m64=../lib 52 +MULTILIB_OSDIRNAMES += m32=../lib32 53 else 54 MULTIARCH_DIRNAME := $(call if_multiarch,powerpc-linux-gnu) 55 endif 56 @@ -10,7 +11,8 @@ ifneq (,$(findstring powerpcle,$(target))) 57 MULTIARCH_DIRNAME := $(subst -linux,le-linux,$(MULTIARCH_DIRNAME)) 58 endif 59 ifneq (,$(findstring powerpc64le,$(target))) 60 -MULTILIB_OSDIRNAMES := $(subst -linux,le-linux,$(MULTILIB_OSDIRNAMES)) 61 +MULTILIB_OSDIRNAMES := m64=../lib 62 +MULTILIB_OSDIRNAMES += m32=../lib32 63 endif 64 endif 65 66 diff --git a/gcc/config/rs6000/t-linux64 b/gcc/config/rs6000/t-linux64 67 index 264a7e27524..d1e460811cc 100644 68 --- a/gcc/config/rs6000/t-linux64 69 +++ b/gcc/config/rs6000/t-linux64 70 @@ -28,8 +28,8 @@ 71 MULTILIB_OPTIONS := m64/m32 72 MULTILIB_DIRNAMES := 64 32 73 MULTILIB_EXTRA_OPTS := 74 -MULTILIB_OSDIRNAMES := m64=../lib64$(call if_multiarch,:powerpc64-linux-gnu) 75 -MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu) 76 +MULTILIB_OSDIRNAMES := m64=../lib 77 +MULTILIB_OSDIRNAMES += m32=../lib32 78 79 rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c 80 $(COMPILE) $< 81 diff --git a/gcc/config/rs6000/t-linux64bele b/gcc/config/rs6000/t-linux64bele 82 index 97c1ee6fb4d..08d72639cb6 100644 83 --- a/gcc/config/rs6000/t-linux64bele 84 +++ b/gcc/config/rs6000/t-linux64bele 85 @@ -2,6 +2,6 @@ 86 87 MULTILIB_OPTIONS += mlittle 88 MULTILIB_DIRNAMES += le 89 -MULTILIB_OSDIRNAMES += $(subst =,.mlittle=,$(subst lible32,lib32le,$(subst lible64,lib64le,$(subst lib,lible,$(subst -linux,le-linux,$(MULTILIB_OSDIRNAMES)))))) 90 -MULTILIB_OSDIRNAMES += $(subst $(if $(findstring 64,$(target)),m64,m32).,,$(filter $(if $(findstring 64,$(target)),m64,m32).mlittle%,$(MULTILIB_OSDIRNAMES))) 91 +MULTILIB_OSDIRNAMES = m64=../lib 92 +MULTILIB_OSDIRNAMES+= m32=../lib32 93 MULTILIB_MATCHES := ${MULTILIB_MATCHES_ENDIAN} 94 diff --git a/gcc/config/rs6000/t-linux64lebe b/gcc/config/rs6000/t-linux64lebe 95 index 2e63bdb9fc9..c6e1c5db65d 100644 96 --- a/gcc/config/rs6000/t-linux64lebe 97 +++ b/gcc/config/rs6000/t-linux64lebe 98 @@ -2,6 +2,6 @@ 99 100 MULTILIB_OPTIONS += mbig 101 MULTILIB_DIRNAMES += be 102 -MULTILIB_OSDIRNAMES += $(subst =,.mbig=,$(subst libbe32,lib32be,$(subst libbe64,lib64be,$(subst lib,libbe,$(subst le-linux,-linux,$(MULTILIB_OSDIRNAMES)))))) 103 -MULTILIB_OSDIRNAMES += $(subst $(if $(findstring 64,$(target)),m64,m32).,,$(filter $(if $(findstring 64,$(target)),m64,m32).mbig%,$(MULTILIB_OSDIRNAMES))) 104 +MULTILIB_OSDIRNAMES := m64=../lib 105 +MULTILIB_OSDIRNAMES += m32=../lib32 106 MULTILIB_MATCHES := ${MULTILIB_MATCHES_ENDIAN} 107 diff --git a/gcc/config/s390/t-linux64 b/gcc/config/s390/t-linux64 108 index cc6ab367072..7f498ee1cdc 100644 109 --- a/gcc/config/s390/t-linux64 110 +++ b/gcc/config/s390/t-linux64 111 @@ -7,5 +7,5 @@ 112 113 MULTILIB_OPTIONS = m64/m31 114 MULTILIB_DIRNAMES = 64 32 115 -MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:s390x-linux-gnu) 116 -MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:s390-linux-gnu) 117 +MULTILIB_OSDIRNAMES = m64=../lib 118 +MULTILIB_OSDIRNAMES+= m32=../lib32 119 -- 120 2.31.1 121