summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/gcc/gcc-4.8/0029-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-4.8/0029-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch')
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.8/0029-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch101
1 files changed, 52 insertions, 49 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0029-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch b/meta/recipes-devtools/gcc/gcc-4.8/0029-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
index 5755da8254..0aa6d926ba 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0029-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.8/0029-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
@@ -29,11 +29,11 @@ Upstream-Status: Inappropriate [OE configuration]
29 gcc/config/sparc/linux64.h | 4 ++-- 29 gcc/config/sparc/linux64.h | 4 ++--
30 11 files changed, 22 insertions(+), 22 deletions(-) 30 11 files changed, 22 insertions(+), 22 deletions(-)
31 31
32Index: gcc-4.8.2/gcc/config/alpha/linux-elf.h 32Index: gcc-4.8.4/gcc/config/alpha/linux-elf.h
33=================================================================== 33===================================================================
34--- gcc-4.8.2.orig/gcc/config/alpha/linux-elf.h 2014-05-06 10:34:51.081657377 +0000 34--- gcc-4.8.4.orig/gcc/config/alpha/linux-elf.h
35+++ gcc-4.8.2/gcc/config/alpha/linux-elf.h 2014-05-06 10:34:51.073657377 +0000 35+++ gcc-4.8.4/gcc/config/alpha/linux-elf.h
36@@ -23,8 +23,8 @@ 36@@ -23,8 +23,8 @@ along with GCC; see the file COPYING3.
37 #define EXTRA_SPECS \ 37 #define EXTRA_SPECS \
38 { "elf_dynamic_linker", ELF_DYNAMIC_LINKER }, 38 { "elf_dynamic_linker", ELF_DYNAMIC_LINKER },
39 39
@@ -44,10 +44,10 @@ Index: gcc-4.8.2/gcc/config/alpha/linux-elf.h
44 #if DEFAULT_LIBC == LIBC_UCLIBC 44 #if DEFAULT_LIBC == LIBC_UCLIBC
45 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" 45 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
46 #elif DEFAULT_LIBC == LIBC_GLIBC 46 #elif DEFAULT_LIBC == LIBC_GLIBC
47Index: gcc-4.8.2/gcc/config/arm/linux-eabi.h 47Index: gcc-4.8.4/gcc/config/arm/linux-eabi.h
48=================================================================== 48===================================================================
49--- gcc-4.8.2.orig/gcc/config/arm/linux-eabi.h 2014-05-06 10:34:51.081657377 +0000 49--- gcc-4.8.4.orig/gcc/config/arm/linux-eabi.h
50+++ gcc-4.8.2/gcc/config/arm/linux-eabi.h 2014-05-06 10:34:51.077657377 +0000 50+++ gcc-4.8.4/gcc/config/arm/linux-eabi.h
51@@ -68,8 +68,8 @@ 51@@ -68,8 +68,8 @@
52 GLIBC_DYNAMIC_LINKER_DEFAULT and TARGET_DEFAULT_FLOAT_ABI. */ 52 GLIBC_DYNAMIC_LINKER_DEFAULT and TARGET_DEFAULT_FLOAT_ABI. */
53 53
@@ -59,10 +59,10 @@ Index: gcc-4.8.2/gcc/config/arm/linux-eabi.h
59 #define GLIBC_DYNAMIC_LINKER_DEFAULT GLIBC_DYNAMIC_LINKER_SOFT_FLOAT 59 #define GLIBC_DYNAMIC_LINKER_DEFAULT GLIBC_DYNAMIC_LINKER_SOFT_FLOAT
60 60
61 #define GLIBC_DYNAMIC_LINKER \ 61 #define GLIBC_DYNAMIC_LINKER \
62Index: gcc-4.8.2/gcc/config/arm/linux-elf.h 62Index: gcc-4.8.4/gcc/config/arm/linux-elf.h
63=================================================================== 63===================================================================
64--- gcc-4.8.2.orig/gcc/config/arm/linux-elf.h 2014-05-06 10:34:51.081657377 +0000 64--- gcc-4.8.4.orig/gcc/config/arm/linux-elf.h
65+++ gcc-4.8.2/gcc/config/arm/linux-elf.h 2014-05-06 10:34:51.077657377 +0000 65+++ gcc-4.8.4/gcc/config/arm/linux-elf.h
66@@ -57,7 +57,7 @@ 66@@ -57,7 +57,7 @@
67 67
68 #define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc" 68 #define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
@@ -72,21 +72,21 @@ Index: gcc-4.8.2/gcc/config/arm/linux-elf.h
72 72
73 #define LINUX_TARGET_LINK_SPEC "%{h*} \ 73 #define LINUX_TARGET_LINK_SPEC "%{h*} \
74 %{static:-Bstatic} \ 74 %{static:-Bstatic} \
75Index: gcc-4.8.2/gcc/config/i386/linux.h 75Index: gcc-4.8.4/gcc/config/i386/linux.h
76=================================================================== 76===================================================================
77--- gcc-4.8.2.orig/gcc/config/i386/linux.h 2014-05-06 10:34:51.081657377 +0000 77--- gcc-4.8.4.orig/gcc/config/i386/linux.h
78+++ gcc-4.8.2/gcc/config/i386/linux.h 2014-05-06 10:34:51.077657377 +0000 78+++ gcc-4.8.4/gcc/config/i386/linux.h
79@@ -20,4 +20,4 @@ 79@@ -20,4 +20,4 @@ along with GCC; see the file COPYING3.
80 <http://www.gnu.org/licenses/>. */ 80 <http://www.gnu.org/licenses/>. */
81 81
82 #define GNU_USER_LINK_EMULATION "elf_i386" 82 #define GNU_USER_LINK_EMULATION "elf_i386"
83-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" 83-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
84+#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2" 84+#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2"
85Index: gcc-4.8.2/gcc/config/i386/linux64.h 85Index: gcc-4.8.4/gcc/config/i386/linux64.h
86=================================================================== 86===================================================================
87--- gcc-4.8.2.orig/gcc/config/i386/linux64.h 2014-05-06 10:34:51.081657377 +0000 87--- gcc-4.8.4.orig/gcc/config/i386/linux64.h
88+++ gcc-4.8.2/gcc/config/i386/linux64.h 2014-05-06 10:34:51.077657377 +0000 88+++ gcc-4.8.4/gcc/config/i386/linux64.h
89@@ -27,6 +27,6 @@ 89@@ -27,6 +27,6 @@ see the files COPYING3 and COPYING.RUNTI
90 #define GNU_USER_LINK_EMULATION64 "elf_x86_64" 90 #define GNU_USER_LINK_EMULATION64 "elf_x86_64"
91 #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64" 91 #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64"
92 92
@@ -96,21 +96,21 @@ Index: gcc-4.8.2/gcc/config/i386/linux64.h
96+#define GLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-linux.so.2" 96+#define GLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-linux.so.2"
97+#define GLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-linux-x86-64.so.2" 97+#define GLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-linux-x86-64.so.2"
98+#define GLIBC_DYNAMIC_LINKERX32 SYSTEMLIBS_DIR "ld-linux-x32.so.2" 98+#define GLIBC_DYNAMIC_LINKERX32 SYSTEMLIBS_DIR "ld-linux-x32.so.2"
99Index: gcc-4.8.2/gcc/config/mips/linux.h 99Index: gcc-4.8.4/gcc/config/mips/linux.h
100=================================================================== 100===================================================================
101--- gcc-4.8.2.orig/gcc/config/mips/linux.h 2014-05-06 10:34:51.081657377 +0000 101--- gcc-4.8.4.orig/gcc/config/mips/linux.h
102+++ gcc-4.8.2/gcc/config/mips/linux.h 2014-05-06 10:34:51.077657377 +0000 102+++ gcc-4.8.4/gcc/config/mips/linux.h
103@@ -17,4 +17,4 @@ 103@@ -17,4 +17,4 @@ You should have received a copy of the G
104 along with GCC; see the file COPYING3. If not see 104 along with GCC; see the file COPYING3. If not see
105 <http://www.gnu.org/licenses/>. */ 105 <http://www.gnu.org/licenses/>. */
106 106
107-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" 107-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
108+#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld.so.1" 108+#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld.so.1"
109Index: gcc-4.8.2/gcc/config/mips/linux64.h 109Index: gcc-4.8.4/gcc/config/mips/linux64.h
110=================================================================== 110===================================================================
111--- gcc-4.8.2.orig/gcc/config/mips/linux64.h 2014-05-06 10:34:51.081657377 +0000 111--- gcc-4.8.4.orig/gcc/config/mips/linux64.h
112+++ gcc-4.8.2/gcc/config/mips/linux64.h 2014-05-06 10:34:51.077657377 +0000 112+++ gcc-4.8.4/gcc/config/mips/linux64.h
113@@ -22,10 +22,10 @@ 113@@ -22,10 +22,10 @@ along with GCC; see the file COPYING3.
114 #define GNU_USER_LINK_EMULATION64 "elf64%{EB:b}%{EL:l}tsmip" 114 #define GNU_USER_LINK_EMULATION64 "elf64%{EB:b}%{EL:l}tsmip"
115 #define GNU_USER_LINK_EMULATIONN32 "elf32%{EB:b}%{EL:l}tsmipn32" 115 #define GNU_USER_LINK_EMULATIONN32 "elf32%{EB:b}%{EL:l}tsmipn32"
116 116
@@ -125,30 +125,33 @@ Index: gcc-4.8.2/gcc/config/mips/linux64.h
125 #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" 125 #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
126 #define GNU_USER_DYNAMIC_LINKERN32 \ 126 #define GNU_USER_DYNAMIC_LINKERN32 \
127 CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ 127 CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
128Index: gcc-4.8.2/gcc/config/rs6000/linux64.h 128Index: gcc-4.8.4/gcc/config/rs6000/linux64.h
129=================================================================== 129===================================================================
130--- gcc-4.8.2.orig/gcc/config/rs6000/linux64.h 2014-05-06 10:34:51.081657377 +0000 130--- gcc-4.8.4.orig/gcc/config/rs6000/linux64.h
131+++ gcc-4.8.2/gcc/config/rs6000/linux64.h 2014-05-06 10:34:51.077657377 +0000 131+++ gcc-4.8.4/gcc/config/rs6000/linux64.h
132@@ -350,10 +350,10 @@ 132@@ -366,14 +366,14 @@ extern int dot_symbols;
133 #undef LINK_OS_DEFAULT_SPEC 133 #undef LINK_OS_DEFAULT_SPEC
134 #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)" 134 #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
135 135
136-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" 136-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
137-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1" 137+#define GLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld.so.1"
138 #ifdef LINUX64_DEFAULT_ABI_ELFv2
139 #define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv1:/lib64/ld64.so.1;:/lib64/ld64.so.2}"
140 #else
141 #define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv2:/lib64/ld64.so.2;:/lib64/ld64.so.1}"
142 #endif
138-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" 143-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
139-#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" 144-#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
140+#define GLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld.so.1"
141+#define GLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld64.so.1"
142+#define UCLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-uClibc.so.0" 145+#define UCLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-uClibc.so.0"
143+#define UCLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld64-uClibc.so.0" 146+#define UCLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld64-uClibc.so.0"
144 #if DEFAULT_LIBC == LIBC_UCLIBC 147 #if DEFAULT_LIBC == LIBC_UCLIBC
145 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" 148 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
146 #elif DEFAULT_LIBC == LIBC_GLIBC 149 #elif DEFAULT_LIBC == LIBC_GLIBC
147Index: gcc-4.8.2/gcc/config/sh/linux.h 150Index: gcc-4.8.4/gcc/config/sh/linux.h
148=================================================================== 151===================================================================
149--- gcc-4.8.2.orig/gcc/config/sh/linux.h 2014-05-06 10:34:51.081657377 +0000 152--- gcc-4.8.4.orig/gcc/config/sh/linux.h
150+++ gcc-4.8.2/gcc/config/sh/linux.h 2014-05-06 10:34:51.077657377 +0000 153+++ gcc-4.8.4/gcc/config/sh/linux.h
151@@ -43,7 +43,7 @@ 154@@ -43,7 +43,7 @@ along with GCC; see the file COPYING3.
152 155
153 #define TARGET_ASM_FILE_END file_end_indicate_exec_stack 156 #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
154 157
@@ -157,11 +160,11 @@ Index: gcc-4.8.2/gcc/config/sh/linux.h
157 160
158 #undef SUBTARGET_LINK_EMUL_SUFFIX 161 #undef SUBTARGET_LINK_EMUL_SUFFIX
159 #define SUBTARGET_LINK_EMUL_SUFFIX "_linux" 162 #define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
160Index: gcc-4.8.2/gcc/config/sparc/linux.h 163Index: gcc-4.8.4/gcc/config/sparc/linux.h
161=================================================================== 164===================================================================
162--- gcc-4.8.2.orig/gcc/config/sparc/linux.h 2014-05-06 10:34:51.081657377 +0000 165--- gcc-4.8.4.orig/gcc/config/sparc/linux.h
163+++ gcc-4.8.2/gcc/config/sparc/linux.h 2014-05-06 10:34:51.077657377 +0000 166+++ gcc-4.8.4/gcc/config/sparc/linux.h
164@@ -83,7 +83,7 @@ 167@@ -83,7 +83,7 @@ extern const char *host_detect_local_cpu
165 When the -shared link option is used a final link is not being 168 When the -shared link option is used a final link is not being
166 done. */ 169 done. */
167 170
@@ -170,11 +173,11 @@ Index: gcc-4.8.2/gcc/config/sparc/linux.h
170 173
171 #undef LINK_SPEC 174 #undef LINK_SPEC
172 #define LINK_SPEC "-m elf32_sparc %{shared:-shared} \ 175 #define LINK_SPEC "-m elf32_sparc %{shared:-shared} \
173Index: gcc-4.8.2/gcc/config/sparc/linux64.h 176Index: gcc-4.8.4/gcc/config/sparc/linux64.h
174=================================================================== 177===================================================================
175--- gcc-4.8.2.orig/gcc/config/sparc/linux64.h 2014-05-06 10:34:51.081657377 +0000 178--- gcc-4.8.4.orig/gcc/config/sparc/linux64.h
176+++ gcc-4.8.2/gcc/config/sparc/linux64.h 2014-05-06 10:34:51.077657377 +0000 179+++ gcc-4.8.4/gcc/config/sparc/linux64.h
177@@ -92,8 +92,8 @@ 180@@ -92,8 +92,8 @@ along with GCC; see the file COPYING3.
178 When the -shared link option is used a final link is not being 181 When the -shared link option is used a final link is not being
179 done. */ 182 done. */
180 183
@@ -185,11 +188,11 @@ Index: gcc-4.8.2/gcc/config/sparc/linux64.h
185 188
186 #ifdef SPARC_BI_ARCH 189 #ifdef SPARC_BI_ARCH
187 190
188Index: gcc-4.8.2/gcc/config/linux.h 191Index: gcc-4.8.4/gcc/config/linux.h
189=================================================================== 192===================================================================
190--- gcc-4.8.2.orig/gcc/config/linux.h 2013-01-10 20:38:27.000000000 +0000 193--- gcc-4.8.4.orig/gcc/config/linux.h
191+++ gcc-4.8.2/gcc/config/linux.h 2014-05-06 10:36:26.549656893 +0000 194+++ gcc-4.8.4/gcc/config/linux.h
192@@ -73,10 +73,10 @@ 195@@ -73,10 +73,10 @@ see the files COPYING3 and COPYING.RUNTI
193 GLIBC_DYNAMIC_LINKER must be defined for each target using them, or 196 GLIBC_DYNAMIC_LINKER must be defined for each target using them, or
194 GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets 197 GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
195 supporting both 32-bit and 64-bit compilation. */ 198 supporting both 32-bit and 64-bit compilation. */
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-01 11:48:13 +0000