source: patches/gcc-4.8.3-pure64-1.patch@ 9163b06

systemd
Last change on this file since 9163b06 was 390c3ab, checked in by Chris Staub <chris@…>, 10 years ago

Added patches for GCC 4.8.3
  • Property mode set to 100644
File size: 9.5 KB
RevLine 
[390c3ab]1Submitted By: William Harrington <kb0iic at cross-lfs dot org>
2Date: 05-31-2014
3Initial Package Version: 4.8.3
4Origin: Idea originally developed by Ryan Oliver and Greg Schafer for
5 the Pure LFS project with help from
6 Martin Ward <macros_the_black@ntlworld.com>
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.
10
11diff -Naur gcc-4.8.3.orig/gcc/config/i386/linux64.h gcc-4.8.3/gcc/config/i386/linux64.h
12--- gcc-4.8.3.orig/gcc/config/i386/linux64.h 2013-01-10 20:38:27.000000000 +0000
13+++ gcc-4.8.3/gcc/config/i386/linux64.h 2014-06-01 05:03:44.355344528 +0000
14@@ -27,6 +27,6 @@
15 #define GNU_USER_LINK_EMULATION64 "elf_x86_64"
16 #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64"
17
18-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
19-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
20+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
21+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
22 #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
23diff -Naur gcc-4.8.3.orig/gcc/config/i386/t-linux64 gcc-4.8.3/gcc/config/i386/t-linux64
24--- gcc-4.8.3.orig/gcc/config/i386/t-linux64 2013-01-10 20:38:27.000000000 +0000
25+++ gcc-4.8.3/gcc/config/i386/t-linux64 2014-06-01 05:03:44.355344528 +0000
26@@ -33,6 +33,6 @@
27 comma=,
28 MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
29 MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
30-MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
31-MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu)
32+MULTILIB_OSDIRNAMES = m64=../lib$(call if_multiarch,:x86_64-linux-gnu)
33+MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:i386-linux-gnu)
34 MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
35diff -Naur gcc-4.8.3.orig/gcc/config/linux.h gcc-4.8.3/gcc/config/linux.h
36--- gcc-4.8.3.orig/gcc/config/linux.h 2013-01-10 20:38:27.000000000 +0000
37+++ gcc-4.8.3/gcc/config/linux.h 2014-06-01 05:03:44.355344528 +0000
38@@ -74,7 +74,7 @@
39 GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
40 supporting both 32-bit and 64-bit compilation. */
41 #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
42-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
43+#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0"
44 #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
45 #define UCLIBC_DYNAMIC_LINKERX32 "/lib/ldx32-uClibc.so.0"
46 #define BIONIC_DYNAMIC_LINKER "/system/bin/linker"
47diff -Naur gcc-4.8.3.orig/gcc/config/mips/linux64.h gcc-4.8.3/gcc/config/mips/linux64.h
48--- gcc-4.8.3.orig/gcc/config/mips/linux64.h 2013-01-10 20:38:27.000000000 +0000
49+++ gcc-4.8.3/gcc/config/mips/linux64.h 2014-06-01 05:03:44.355344528 +0000
50@@ -22,10 +22,10 @@
51 #define GNU_USER_LINK_EMULATION64 "elf64%{EB:b}%{EL:l}tsmip"
52 #define GNU_USER_LINK_EMULATIONN32 "elf32%{EB:b}%{EL:l}tsmipn32"
53
54-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
55-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1"
56-#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
57-#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
58+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
59+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld.so.1"
60+#define GLIBC_DYNAMIC_LINKERN32 "/lib64/ld.so.1"
61+#define UCLIBC_DYNAMIC_LINKERN32 "/lib64/ld-uClibc.so.0"
62 #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
63 #define GNU_USER_DYNAMIC_LINKERN32 \
64 CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
65diff -Naur gcc-4.8.3.orig/gcc/config/mips/t-linux64 gcc-4.8.3/gcc/config/mips/t-linux64
66--- gcc-4.8.3.orig/gcc/config/mips/t-linux64 2013-01-10 20:38:27.000000000 +0000
67+++ gcc-4.8.3/gcc/config/mips/t-linux64 2014-06-01 05:03:44.355344528 +0000
68@@ -22,5 +22,5 @@
69 MIPS_SOFT = $(if $(strip $(filter MASK_SOFT_FLOAT_ABI, $(target_cpu_default)) $(filter soft, $(with_float))),soft)
70 MULTILIB_OSDIRNAMES = \
71 ../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \
72- ../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \
73- ../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))
74+ ../lib32$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \
75+ ../lib$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))
76diff -Naur gcc-4.8.3.orig/gcc/config/rs6000/linux64.h gcc-4.8.3/gcc/config/rs6000/linux64.h
77--- gcc-4.8.3.orig/gcc/config/rs6000/linux64.h 2014-04-04 15:10:24.000000000 +0000
78+++ gcc-4.8.3/gcc/config/rs6000/linux64.h 2014-06-01 05:05:00.847317093 +0000
79@@ -366,13 +366,13 @@
80 #undef LINK_OS_DEFAULT_SPEC
81 #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
82
83-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
84+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
85 #ifdef LINUX64_DEFAULT_ABI_ELFv2
86-#define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv1:/lib64/ld64.so.1;:/lib64/ld64.so.2}"
87+#define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv1:/lib/ld64.so.1;:/lib/ld64.so.2}"
88 #else
89-#define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv2:/lib64/ld64.so.2;:/lib64/ld64.so.1}"
90+#define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv2:/lib/ld64.so.2;:/lib/ld64.so.1}"
91 #endif
92-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
93+#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0"
94 #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
95 #if DEFAULT_LIBC == LIBC_UCLIBC
96 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
97diff -Naur gcc-4.8.3.orig/gcc/config/rs6000/t-linux64 gcc-4.8.3/gcc/config/rs6000/t-linux64
98--- gcc-4.8.3.orig/gcc/config/rs6000/t-linux64 2014-04-04 14:39:26.000000000 +0000
99+++ gcc-4.8.3/gcc/config/rs6000/t-linux64 2014-06-01 05:06:00.752194628 +0000
100@@ -28,5 +28,5 @@
101 MULTILIB_OPTIONS := m64/m32
102 MULTILIB_DIRNAMES := 64 32
103 MULTILIB_EXTRA_OPTS :=
104-MULTILIB_OSDIRNAMES := m64=../lib64$(call if_multiarch,:powerpc64-linux-gnu)
105-MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu)
106+MULTILIB_OSDIRNAMES := m64=../lib$(call if_multiarch,:powerpc64-linux-gnu)
107+MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:powerpc-linux-gnu)
108diff -Naur gcc-4.8.3.orig/gcc/config/s390/linux.h gcc-4.8.3/gcc/config/s390/linux.h
109--- gcc-4.8.3.orig/gcc/config/s390/linux.h 2013-01-10 20:38:27.000000000 +0000
110+++ gcc-4.8.3/gcc/config/s390/linux.h 2014-06-01 05:03:44.355344528 +0000
111@@ -60,7 +60,7 @@
112 #define MULTILIB_DEFAULTS { "m31" }
113 #endif
114
115-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
116+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
117 #define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
118
119 #undef LINK_SPEC
120diff -Naur gcc-4.8.3.orig/gcc/config/s390/t-linux64 gcc-4.8.3/gcc/config/s390/t-linux64
121--- gcc-4.8.3.orig/gcc/config/s390/t-linux64 2012-11-21 16:13:28.000000000 +0000
122+++ gcc-4.8.3/gcc/config/s390/t-linux64 2014-06-01 05:03:44.355344528 +0000
123@@ -7,5 +7,5 @@
124
125 MULTILIB_OPTIONS = m64/m31
126 MULTILIB_DIRNAMES = 64 32
127-MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:s390x-linux-gnu)
128-MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:s390-linux-gnu)
129+MULTILIB_OSDIRNAMES = ../lib$(call if_multiarch,:s390x-linux-gnu)
130+MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:s390-linux-gnu)
131diff -Naur gcc-4.8.3.orig/gcc/config/sparc/linux.h gcc-4.8.3/gcc/config/sparc/linux.h
132--- gcc-4.8.3.orig/gcc/config/sparc/linux.h 2013-01-10 20:38:27.000000000 +0000
133+++ gcc-4.8.3/gcc/config/sparc/linux.h 2014-06-01 05:03:44.355344528 +0000
134@@ -83,7 +83,7 @@
135 When the -shared link option is used a final link is not being
136 done. */
137
138-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
139+#define GLIBC_DYNAMIC_LINKER "/lib32/ld-linux.so.2"
140
141 #undef LINK_SPEC
142 #define LINK_SPEC "-m elf32_sparc %{shared:-shared} \
143diff -Naur gcc-4.8.3.orig/gcc/config/sparc/linux64.h gcc-4.8.3/gcc/config/sparc/linux64.h
144--- gcc-4.8.3.orig/gcc/config/sparc/linux64.h 2013-01-10 20:38:27.000000000 +0000
145+++ gcc-4.8.3/gcc/config/sparc/linux64.h 2014-06-01 05:03:44.355344528 +0000
146@@ -92,8 +92,8 @@
147 When the -shared link option is used a final link is not being
148 done. */
149
150-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
151-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
152+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
153+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2"
154
155 #ifdef SPARC_BI_ARCH
156
157@@ -201,7 +201,7 @@
158 #else /* !SPARC_BI_ARCH */
159
160 #undef LINK_SPEC
161-#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
162+#define LINK_SPEC "-m elf64_sparc -Y P,%R/lib %{shared:-shared} \
163 %{!shared: \
164 %{!static: \
165 %{rdynamic:-export-dynamic} \
166diff -Naur gcc-4.8.3.orig/gcc/config/sparc/t-linux64 gcc-4.8.3/gcc/config/sparc/t-linux64
167--- gcc-4.8.3.orig/gcc/config/sparc/t-linux64 2013-01-10 20:38:27.000000000 +0000
168+++ gcc-4.8.3/gcc/config/sparc/t-linux64 2014-06-01 05:03:44.358677723 +0000
169@@ -25,5 +25,5 @@
170
171 MULTILIB_OPTIONS = m64/m32
172 MULTILIB_DIRNAMES = 64 32
173-MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:sparc64-linux-gnu)
174-MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:sparc-linux-gnu)
175+MULTILIB_OSDIRNAMES = ../lib$(call if_multiarch,:sparc64-linux-gnu)
176+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.