source: patches/gcc-7.1.0-pure64-1.patch@ a74a2be

systemd
Last change on this file since a74a2be was 67068ff, checked in by William Harrington <kb0iic@…>, 8 years ago

Update patches with the proper data.
  • Property mode set to 100644
File size: 8.9 KB
RevLine 
[67068ff]1Submitted By: William Harrington <kb0iic at cross-lfs dot org>
2Date: 05-13-2017
3Initial Package Version: 6.1.0
[11cc980]4Origin: Idea originally developed by Ryan Oliver and Greg Schafer for
5 the Pure LFS project with help from
[67068ff]6 Martin Ward and Chris Staub
[11cc980]7Upstream Status: Not Applied - CLFS Specific
8Description: This patch makes changes to the paths for pure64, eg 64bit libs
9 in /usr/lib, 32bit in /usr/lib32.
[67068ff]10Comment: Rediffed for 7.1.0
[11cc980]11
[67068ff]12diff -Naur gcc-7.1.0.orig/gcc/config/i386/linux64.h gcc-7.1.0/gcc/config/i386/linux64.h
13--- gcc-7.1.0.orig/gcc/config/i386/linux64.h 2017-01-01 12:07:43.000000000 +0000
14+++ gcc-7.1.0/gcc/config/i386/linux64.h 2017-05-14 03:33:00.632243461 +0000
15@@ -27,8 +27,8 @@
16 #define GNU_USER_LINK_EMULATION64 "elf_x86_64"
17 #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64"
18
19-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
20-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
21+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
22+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
23 #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
24
25 #undef MUSL_DYNAMIC_LINKER32
26diff -Naur gcc-7.1.0.orig/gcc/config/i386/t-linux64 gcc-7.1.0/gcc/config/i386/t-linux64
27--- gcc-7.1.0.orig/gcc/config/i386/t-linux64 2017-01-01 12:07:43.000000000 +0000
28+++ gcc-7.1.0/gcc/config/i386/t-linux64 2017-05-14 03:33:00.632243461 +0000
29@@ -33,6 +33,6 @@
30 comma=,
31 MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
32 MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
33-MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
34-MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu)
35+MULTILIB_OSDIRNAMES = m64=../lib$(call if_multiarch,:x86_64-linux-gnu)
36+MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:i386-linux-gnu)
37 MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
38diff -Naur gcc-7.1.0.orig/gcc/config/linux.h gcc-7.1.0/gcc/config/linux.h
39--- gcc-7.1.0.orig/gcc/config/linux.h 2017-01-01 12:07:43.000000000 +0000
40+++ gcc-7.1.0/gcc/config/linux.h 2017-05-14 03:33:00.632243461 +0000
41@@ -82,7 +82,7 @@
42 GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
43 supporting both 32-bit and 64-bit compilation. */
44 #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
45-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
46+#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0"
47 #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
48 #define UCLIBC_DYNAMIC_LINKERX32 "/lib/ldx32-uClibc.so.0"
49 #define BIONIC_DYNAMIC_LINKER "/system/bin/linker"
50diff -Naur gcc-7.1.0.orig/gcc/config/mips/t-linux64 gcc-7.1.0/gcc/config/mips/t-linux64
51--- gcc-7.1.0.orig/gcc/config/mips/t-linux64 2017-01-01 12:07:43.000000000 +0000
52+++ gcc-7.1.0/gcc/config/mips/t-linux64 2017-05-14 03:33:00.632243461 +0000
53@@ -22,5 +22,5 @@
54 MIPS_SOFT = $(if $(strip $(filter MASK_SOFT_FLOAT_ABI, $(target_cpu_default)) $(filter soft, $(with_float))),soft)
55 MULTILIB_OSDIRNAMES = \
56 ../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \
57- ../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \
58- ../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))
59+ ../lib32$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \
60+ ../lib$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))
61diff -Naur gcc-7.1.0.orig/gcc/config/rs6000/linux64.h gcc-7.1.0/gcc/config/rs6000/linux64.h
62--- gcc-7.1.0.orig/gcc/config/rs6000/linux64.h 2017-02-07 11:29:06.000000000 +0000
63+++ gcc-7.1.0/gcc/config/rs6000/linux64.h 2017-05-14 03:33:00.632243461 +0000
64@@ -412,16 +412,16 @@
65 #undef LINK_OS_DEFAULT_SPEC
66 #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
67
68-#define GLIBC_DYNAMIC_LINKER32 "%(dynamic_linker_prefix)/lib/ld.so.1"
69+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
70
71 #ifdef LINUX64_DEFAULT_ABI_ELFv2
72 #define GLIBC_DYNAMIC_LINKER64 \
73-"%{mabi=elfv1:%(dynamic_linker_prefix)/lib64/ld64.so.1;" \
74-":%(dynamic_linker_prefix)/lib64/ld64.so.2}"
75+"%{mabi=elfv1:/lib/ld64.so.1;" \
76+":/lib/ld64.so.2}"
77 #else
78 #define GLIBC_DYNAMIC_LINKER64 \
79-"%{mabi=elfv2:%(dynamic_linker_prefix)/lib64/ld64.so.2;" \
80-":%(dynamic_linker_prefix)/lib64/ld64.so.1}"
81+"%{mabi=elfv2:/lib/ld64.so.2;" \
82+":/lib/ld64.so.1}"
83 #endif
84
85 #define MUSL_DYNAMIC_LINKER32 \
86@@ -429,7 +429,7 @@
87 #define MUSL_DYNAMIC_LINKER64 \
88 "/lib/ld-musl-powerpc64" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
89
90-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
91+#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0"
92 #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
93 #if DEFAULT_LIBC == LIBC_UCLIBC
94 #define CHOOSE_DYNAMIC_LINKER(G, U, M) \
95diff -Naur gcc-7.1.0.orig/gcc/config/rs6000/t-linux64 gcc-7.1.0/gcc/config/rs6000/t-linux64
96--- gcc-7.1.0.orig/gcc/config/rs6000/t-linux64 2017-01-01 12:07:43.000000000 +0000
97+++ gcc-7.1.0/gcc/config/rs6000/t-linux64 2017-05-14 03:33:00.633243476 +0000
98@@ -28,8 +28,8 @@
99 MULTILIB_OPTIONS := m64/m32
100 MULTILIB_DIRNAMES := 64 32
101 MULTILIB_EXTRA_OPTS :=
102-MULTILIB_OSDIRNAMES := m64=../lib64$(call if_multiarch,:powerpc64-linux-gnu)
103-MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu)
104+MULTILIB_OSDIRNAMES := m64=../lib$(call if_multiarch,:powerpc64-linux-gnu)
105+MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:powerpc-linux-gnu)
106
107 rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c
108 $(COMPILE) $<
109diff -Naur gcc-7.1.0.orig/gcc/config/s390/linux.h gcc-7.1.0/gcc/config/s390/linux.h
110--- gcc-7.1.0.orig/gcc/config/s390/linux.h 2017-02-06 10:25:05.000000000 +0000
111+++ gcc-7.1.0/gcc/config/s390/linux.h 2017-05-14 03:33:00.633243476 +0000
112@@ -73,7 +73,7 @@
113 #define MULTILIB_DEFAULTS { "m31" }
114 #endif
115
116-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
117+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
118 #define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
119
120 #undef LINK_SPEC
121diff -Naur gcc-7.1.0.orig/gcc/config/s390/t-linux64 gcc-7.1.0/gcc/config/s390/t-linux64
122--- gcc-7.1.0.orig/gcc/config/s390/t-linux64 2012-11-21 16:13:28.000000000 +0000
123+++ gcc-7.1.0/gcc/config/s390/t-linux64 2017-05-14 03:33:00.633243476 +0000
124@@ -7,5 +7,5 @@
125
126 MULTILIB_OPTIONS = m64/m31
127 MULTILIB_DIRNAMES = 64 32
128-MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:s390x-linux-gnu)
129-MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:s390-linux-gnu)
130+MULTILIB_OSDIRNAMES = ../lib$(call if_multiarch,:s390x-linux-gnu)
131+MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:s390-linux-gnu)
132diff -Naur gcc-7.1.0.orig/gcc/config/sparc/linux.h gcc-7.1.0/gcc/config/sparc/linux.h
133--- gcc-7.1.0.orig/gcc/config/sparc/linux.h 2017-01-01 12:07:43.000000000 +0000
134+++ gcc-7.1.0/gcc/config/sparc/linux.h 2017-05-14 03:33:00.633243476 +0000
135@@ -83,7 +83,7 @@
136 When the -shared link option is used a final link is not being
137 done. */
138
139-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
140+#define GLIBC_DYNAMIC_LINKER "/lib32/ld-linux.so.2"
141
142 #undef LINK_SPEC
143 #define LINK_SPEC "-m elf32_sparc %{shared:-shared} \
144diff -Naur gcc-7.1.0.orig/gcc/config/sparc/linux64.h gcc-7.1.0/gcc/config/sparc/linux64.h
145--- gcc-7.1.0.orig/gcc/config/sparc/linux64.h 2017-01-01 12:07:43.000000000 +0000
146+++ gcc-7.1.0/gcc/config/sparc/linux64.h 2017-05-14 03:33:00.634243490 +0000
147@@ -84,8 +84,8 @@
148 When the -shared link option is used a final link is not being
149 done. */
150
151-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
152-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
153+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
154+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2"
155
156 #ifdef SPARC_BI_ARCH
157
158@@ -213,7 +213,7 @@
159 #else /* !SPARC_BI_ARCH */
160
161 #undef LINK_SPEC
162-#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
163+#define LINK_SPEC "-m elf64_sparc -Y P,%R/lib %{shared:-shared} \
164 %{!shared: \
165 %{!static: \
166 %{rdynamic:-export-dynamic} \
167diff -Naur gcc-7.1.0.orig/gcc/config/sparc/t-linux64 gcc-7.1.0/gcc/config/sparc/t-linux64
168--- gcc-7.1.0.orig/gcc/config/sparc/t-linux64 2017-01-01 12:07:43.000000000 +0000
169+++ gcc-7.1.0/gcc/config/sparc/t-linux64 2017-05-14 03:33:00.634243490 +0000
170@@ -25,5 +25,5 @@
171
172 MULTILIB_OPTIONS = m64/m32
173 MULTILIB_DIRNAMES = 64 32
174-MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:sparc64-linux-gnu)
175-MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:sparc-linux-gnu)
176+MULTILIB_OSDIRNAMES = ../lib$(call if_multiarch,:sparc64-linux-gnu)
177+MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:sparc-linux-gnu)
Note: See TracBrowser for help on using the repository browser.