wok-next view gcc/stuff/patches/gcc-pure64.patch @ rev 21726
updated firefox-official (77.0 -> 81.0)
| author | Hans-G?nter Theisgen |
|---|---|
| date | Sun Sep 27 14:34:31 2020 +0100 (2020-09-27) |
| parents | |
| children |
line source
1 --- ./gcc/config/i386/t-linux64.orig 2013-01-14 16:32:37.000000000 +0000
2 +++ ./gcc/config/i386/t-linux64 2013-04-22 06:12:32.984439677 +0000
3 @@ -34,6 +34,6 @@
4 comma=,
5 MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
6 MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
7 -MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
8 -MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu)
9 +MULTILIB_OSDIRNAMES = m64=../lib
10 +MULTILIB_OSDIRNAMES+= m32=../lib32
11 MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
12 --- ./gcc/config/aarch64/t-aarch64-linux.orig
13 +++ ./gcc/config/aarch64/t-aarch64-linux
14 @@ -22,7 +22,7 @@
15 LIB1ASMFUNCS = _aarch64_sync_cache_range
17 AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be)
18 -MULTILIB_OSDIRNAMES = mabi.lp64=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)
19 +MULTILIB_OSDIRNAMES = mabi.lp64=../lib
20 MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu)
22 MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32
23 --- ./gcc/config/s390/t-linux64.orig
24 +++ ./gcc/config/s390/t-linux64
25 @@ -7,5 +7,5 @@
26 MULTILIB_OPTIONS = m64/m31
27 MULTILIB_DIRNAMES = 64 32
28 -MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:s390x-linux-gnu)
29 -MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:s390-linux-gnu)
30 +MULTILIB_OSDIRNAMES = m64=../lib
31 +MULTILIB_OSDIRNAMES+= m32=../lib32
33 --- ./gcc/config/rs6000/t-linux.orig
34 +++ ./gcc/config/rs6000/t-linux
35 @@ -2,7 +2,8 @@
36 # or soft-float.
37 ifeq (,$(filter $(with_cpu),$(SOFT_FLOAT_CPUS))$(findstring soft,$(with_float)))
38 ifneq (,$(findstring powerpc64,$(target)))
39 -MULTILIB_OSDIRNAMES := .=../lib64$(call if_multiarch,:powerpc64-linux-gnu)
40 +MULTILIB_OSDIRNAMES := m64=../lib
41 +MULTILIB_OSDIRNAMES += m32=../lib32
42 else
43 ifneq (,$(findstring spe,$(target)))
44 MULTIARCH_DIRNAME := powerpc-linux-gnuspe$(if $(findstring 8548,$(with_cpu)),,v1)
45 @@ -14,7 +15,8 @@
46 MULTIARCH_DIRNAME := $(subst -linux,le-linux,$(MULTIARCH_DIRNAME))
47 endif
48 ifneq (,$(findstring powerpc64le,$(target)))
49 -MULTILIB_OSDIRNAMES := $(subst -linux,le-linux,$(MULTILIB_OSDIRNAMES))
50 +MULTILIB_OSDIRNAMES := m64=../lib
51 +MULTILIB_OSDIRNAMES += m32=../lib32
52 endif
53 endif
55 --- ./gcc/config/rs6000/t-linux64.orig
56 +++ ./gcc/config/rs6000/t-linux64
57 @@ -28,8 +28,8 @@
58 MULTILIB_OPTIONS := m64/m32
59 MULTILIB_DIRNAMES := 64 32
60 MULTILIB_EXTRA_OPTS :=
61 -MULTILIB_OSDIRNAMES := m64=../lib64$(call if_multiarch,:powerpc64-linux-gnu)
62 -MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu)
63 +MULTILIB_OSDIRNAMES := m64=../lib
64 +MULTILIB_OSDIRNAMES += m32=../lib32
66 rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c
67 $(COMPILE) $<
68 --- ./gcc/config/rs6000/t-linux64bele.orig
69 +++ ./gcc/config/rs6000/t-linux64bele
70 @@ -2,6 +2,6 @@
72 MULTILIB_OPTIONS += mlittle
73 MULTILIB_DIRNAMES += le
74 -MULTILIB_OSDIRNAMES += $(subst =,.mlittle=,$(subst lible32,lib32le,$(subst lible64,lib64le,$(subst lib,lible,$(subst -linux,le-linux,$(MULTILIB_OSDIRNAMES))))))
75 -MULTILIB_OSDIRNAMES += $(subst $(if $(findstring 64,$(target)),m64,m32).,,$(filter $(if $(findstring 64,$(target)),m64,m32).mlittle%,$(MULTILIB_OSDIRNAMES)))
76 +MULTILIB_OSDIRNAMES = m64=../lib
77 +MULTILIB_OSDIRNAMES+= m32=../lib32
78 MULTILIB_MATCHES := ${MULTILIB_MATCHES_ENDIAN}
79 --- ./gcc/config/rs6000/t-linux64lebe.orig
80 +++ ./gcc/config/rs6000/t-linux64lebe
81 @@ -2,6 +2,6 @@
83 MULTILIB_OPTIONS += mbig
84 MULTILIB_DIRNAMES += be
85 -MULTILIB_OSDIRNAMES += $(subst =,.mbig=,$(subst libbe32,lib32be,$(subst libbe64,lib64be,$(subst lib,libbe,$(subst le-linux,-linux,$(MULTILIB_OSDIRNAMES))))))
86 -MULTILIB_OSDIRNAMES += $(subst $(if $(findstring 64,$(target)),m64,m32).,,$(filter $(if $(findstring 64,$(target)),m64,m32).mbig%,$(MULTILIB_OSDIRNAMES)))
87 +MULTILIB_OSDIRNAMES := m64=../lib
88 +MULTILIB_OSDIRNAMES += m32=../lib32
89 MULTILIB_MATCHES := ${MULTILIB_MATCHES_ENDIAN}