source: patches/gcc-4.8.2-pure64-1.patch@ 5648552

clfs-3.0.0-sysvinit sysvinit
Last change on this file since 5648552 was 2e59d11, checked in by William Harrington <kb0iic@…>, 11 years ago

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