diff options
author | Tudor Florea <tudor.florea@enea.com> | 2015-10-09 22:59:03 +0200 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2015-10-09 22:59:03 +0200 |
commit | 972dcfcdbfe75dcfeb777150c136576cf1a71e99 (patch) | |
tree | 97a61cd7e293d7ae9d56ef7ed0f81253365bb026 /meta/recipes-devtools/gcc/gcc-4.8/0029-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch | |
download | poky-972dcfcdbfe75dcfeb777150c136576cf1a71e99.tar.gz |
initial commit for Enea Linux 5.0 arm
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
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.patch | 206 |
1 files changed, 206 insertions, 0 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 new file mode 100644 index 0000000000..5755da8254 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.8/0029-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch | |||
@@ -0,0 +1,206 @@ | |||
1 | From 29d12344fb682a053de53eb08b95704cf3b67af2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 29 Mar 2013 09:24:50 +0400 | ||
4 | Subject: [PATCH 29/35] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER | ||
5 | relative to SYSTEMLIBS_DIR | ||
6 | |||
7 | This patch defines GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER | ||
8 | relative to SYSTEMLIBS_DIR which can be set in generated headers | ||
9 | This breaks the assumption of hardcoded multilib in gcc | ||
10 | Change is only for the supported architectures in OE including | ||
11 | SH, sparc, alpha for possible future support (if any) | ||
12 | |||
13 | Removes the do_headerfix task in metadata | ||
14 | |||
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
16 | |||
17 | Upstream-Status: Inappropriate [OE configuration] | ||
18 | --- | ||
19 | gcc/config/alpha/linux-elf.h | 4 ++-- | ||
20 | gcc/config/arm/linux-eabi.h | 4 ++-- | ||
21 | gcc/config/arm/linux-elf.h | 2 +- | ||
22 | gcc/config/i386/linux.h | 2 +- | ||
23 | gcc/config/i386/linux64.h | 6 +++--- | ||
24 | gcc/config/mips/linux.h | 2 +- | ||
25 | gcc/config/mips/linux64.h | 8 ++++---- | ||
26 | gcc/config/rs6000/linux64.h | 8 ++++---- | ||
27 | gcc/config/sh/linux.h | 2 +- | ||
28 | gcc/config/sparc/linux.h | 2 +- | ||
29 | gcc/config/sparc/linux64.h | 4 ++-- | ||
30 | 11 files changed, 22 insertions(+), 22 deletions(-) | ||
31 | |||
32 | Index: gcc-4.8.2/gcc/config/alpha/linux-elf.h | ||
33 | =================================================================== | ||
34 | --- gcc-4.8.2.orig/gcc/config/alpha/linux-elf.h 2014-05-06 10:34:51.081657377 +0000 | ||
35 | +++ gcc-4.8.2/gcc/config/alpha/linux-elf.h 2014-05-06 10:34:51.073657377 +0000 | ||
36 | @@ -23,8 +23,8 @@ | ||
37 | #define EXTRA_SPECS \ | ||
38 | { "elf_dynamic_linker", ELF_DYNAMIC_LINKER }, | ||
39 | |||
40 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" | ||
41 | -#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" | ||
42 | +#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2" | ||
43 | +#define UCLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-uClibc.so.0" | ||
44 | #if DEFAULT_LIBC == LIBC_UCLIBC | ||
45 | #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" | ||
46 | #elif DEFAULT_LIBC == LIBC_GLIBC | ||
47 | Index: gcc-4.8.2/gcc/config/arm/linux-eabi.h | ||
48 | =================================================================== | ||
49 | --- gcc-4.8.2.orig/gcc/config/arm/linux-eabi.h 2014-05-06 10:34:51.081657377 +0000 | ||
50 | +++ gcc-4.8.2/gcc/config/arm/linux-eabi.h 2014-05-06 10:34:51.077657377 +0000 | ||
51 | @@ -68,8 +68,8 @@ | ||
52 | GLIBC_DYNAMIC_LINKER_DEFAULT and TARGET_DEFAULT_FLOAT_ABI. */ | ||
53 | |||
54 | #undef GLIBC_DYNAMIC_LINKER | ||
55 | -#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "/lib/ld-linux.so.3" | ||
56 | -#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT "/lib/ld-linux-armhf.so.3" | ||
57 | +#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT SYSTEMLIBS_DIR "ld-linux.so.3" | ||
58 | +#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT SYSTEMLIBS_DIR "ld-linux-armhf.so.3" | ||
59 | #define GLIBC_DYNAMIC_LINKER_DEFAULT GLIBC_DYNAMIC_LINKER_SOFT_FLOAT | ||
60 | |||
61 | #define GLIBC_DYNAMIC_LINKER \ | ||
62 | Index: gcc-4.8.2/gcc/config/arm/linux-elf.h | ||
63 | =================================================================== | ||
64 | --- gcc-4.8.2.orig/gcc/config/arm/linux-elf.h 2014-05-06 10:34:51.081657377 +0000 | ||
65 | +++ gcc-4.8.2/gcc/config/arm/linux-elf.h 2014-05-06 10:34:51.077657377 +0000 | ||
66 | @@ -57,7 +57,7 @@ | ||
67 | |||
68 | #define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc" | ||
69 | |||
70 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" | ||
71 | +#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2" | ||
72 | |||
73 | #define LINUX_TARGET_LINK_SPEC "%{h*} \ | ||
74 | %{static:-Bstatic} \ | ||
75 | Index: gcc-4.8.2/gcc/config/i386/linux.h | ||
76 | =================================================================== | ||
77 | --- gcc-4.8.2.orig/gcc/config/i386/linux.h 2014-05-06 10:34:51.081657377 +0000 | ||
78 | +++ gcc-4.8.2/gcc/config/i386/linux.h 2014-05-06 10:34:51.077657377 +0000 | ||
79 | @@ -20,4 +20,4 @@ | ||
80 | <http://www.gnu.org/licenses/>. */ | ||
81 | |||
82 | #define GNU_USER_LINK_EMULATION "elf_i386" | ||
83 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" | ||
84 | +#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2" | ||
85 | Index: gcc-4.8.2/gcc/config/i386/linux64.h | ||
86 | =================================================================== | ||
87 | --- gcc-4.8.2.orig/gcc/config/i386/linux64.h 2014-05-06 10:34:51.081657377 +0000 | ||
88 | +++ gcc-4.8.2/gcc/config/i386/linux64.h 2014-05-06 10:34:51.077657377 +0000 | ||
89 | @@ -27,6 +27,6 @@ | ||
90 | #define GNU_USER_LINK_EMULATION64 "elf_x86_64" | ||
91 | #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64" | ||
92 | |||
93 | -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" | ||
94 | -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" | ||
95 | -#define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.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" | ||
98 | +#define GLIBC_DYNAMIC_LINKERX32 SYSTEMLIBS_DIR "ld-linux-x32.so.2" | ||
99 | Index: gcc-4.8.2/gcc/config/mips/linux.h | ||
100 | =================================================================== | ||
101 | --- gcc-4.8.2.orig/gcc/config/mips/linux.h 2014-05-06 10:34:51.081657377 +0000 | ||
102 | +++ gcc-4.8.2/gcc/config/mips/linux.h 2014-05-06 10:34:51.077657377 +0000 | ||
103 | @@ -17,4 +17,4 @@ | ||
104 | along with GCC; see the file COPYING3. If not see | ||
105 | <http://www.gnu.org/licenses/>. */ | ||
106 | |||
107 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" | ||
108 | +#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld.so.1" | ||
109 | Index: gcc-4.8.2/gcc/config/mips/linux64.h | ||
110 | =================================================================== | ||
111 | --- gcc-4.8.2.orig/gcc/config/mips/linux64.h 2014-05-06 10:34:51.081657377 +0000 | ||
112 | +++ gcc-4.8.2/gcc/config/mips/linux64.h 2014-05-06 10:34:51.077657377 +0000 | ||
113 | @@ -22,10 +22,10 @@ | ||
114 | #define GNU_USER_LINK_EMULATION64 "elf64%{EB:b}%{EL:l}tsmip" | ||
115 | #define GNU_USER_LINK_EMULATIONN32 "elf32%{EB:b}%{EL:l}tsmipn32" | ||
116 | |||
117 | -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" | ||
118 | -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1" | ||
119 | -#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1" | ||
120 | -#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" | ||
121 | +#define GLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld.so.1" | ||
122 | +#define GLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld.so.1" | ||
123 | +#define GLIBC_DYNAMIC_LINKERN32 SYSTEMLIBS_DIR "ld.so.1" | ||
124 | +#define UCLIBC_DYNAMIC_LINKERN32 SYSTEMLIBS_DIR "ld-uClibc.so.0" | ||
125 | #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" | ||
126 | #define GNU_USER_DYNAMIC_LINKERN32 \ | ||
127 | CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ | ||
128 | Index: gcc-4.8.2/gcc/config/rs6000/linux64.h | ||
129 | =================================================================== | ||
130 | --- gcc-4.8.2.orig/gcc/config/rs6000/linux64.h 2014-05-06 10:34:51.081657377 +0000 | ||
131 | +++ gcc-4.8.2/gcc/config/rs6000/linux64.h 2014-05-06 10:34:51.077657377 +0000 | ||
132 | @@ -350,10 +350,10 @@ | ||
133 | #undef LINK_OS_DEFAULT_SPEC | ||
134 | #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)" | ||
135 | |||
136 | -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" | ||
137 | -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1" | ||
138 | -#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" | ||
139 | -#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" | ||
143 | +#define UCLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld64-uClibc.so.0" | ||
144 | #if DEFAULT_LIBC == LIBC_UCLIBC | ||
145 | #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" | ||
146 | #elif DEFAULT_LIBC == LIBC_GLIBC | ||
147 | Index: gcc-4.8.2/gcc/config/sh/linux.h | ||
148 | =================================================================== | ||
149 | --- gcc-4.8.2.orig/gcc/config/sh/linux.h 2014-05-06 10:34:51.081657377 +0000 | ||
150 | +++ gcc-4.8.2/gcc/config/sh/linux.h 2014-05-06 10:34:51.077657377 +0000 | ||
151 | @@ -43,7 +43,7 @@ | ||
152 | |||
153 | #define TARGET_ASM_FILE_END file_end_indicate_exec_stack | ||
154 | |||
155 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" | ||
156 | +#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2" | ||
157 | |||
158 | #undef SUBTARGET_LINK_EMUL_SUFFIX | ||
159 | #define SUBTARGET_LINK_EMUL_SUFFIX "_linux" | ||
160 | Index: gcc-4.8.2/gcc/config/sparc/linux.h | ||
161 | =================================================================== | ||
162 | --- gcc-4.8.2.orig/gcc/config/sparc/linux.h 2014-05-06 10:34:51.081657377 +0000 | ||
163 | +++ gcc-4.8.2/gcc/config/sparc/linux.h 2014-05-06 10:34:51.077657377 +0000 | ||
164 | @@ -83,7 +83,7 @@ | ||
165 | When the -shared link option is used a final link is not being | ||
166 | done. */ | ||
167 | |||
168 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" | ||
169 | +#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2" | ||
170 | |||
171 | #undef LINK_SPEC | ||
172 | #define LINK_SPEC "-m elf32_sparc %{shared:-shared} \ | ||
173 | Index: gcc-4.8.2/gcc/config/sparc/linux64.h | ||
174 | =================================================================== | ||
175 | --- gcc-4.8.2.orig/gcc/config/sparc/linux64.h 2014-05-06 10:34:51.081657377 +0000 | ||
176 | +++ gcc-4.8.2/gcc/config/sparc/linux64.h 2014-05-06 10:34:51.077657377 +0000 | ||
177 | @@ -92,8 +92,8 @@ | ||
178 | When the -shared link option is used a final link is not being | ||
179 | done. */ | ||
180 | |||
181 | -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" | ||
182 | -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2" | ||
183 | +#define GLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-linux.so.2" | ||
184 | +#define GLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-linux.so.2" | ||
185 | |||
186 | #ifdef SPARC_BI_ARCH | ||
187 | |||
188 | Index: gcc-4.8.2/gcc/config/linux.h | ||
189 | =================================================================== | ||
190 | --- gcc-4.8.2.orig/gcc/config/linux.h 2013-01-10 20:38:27.000000000 +0000 | ||
191 | +++ gcc-4.8.2/gcc/config/linux.h 2014-05-06 10:36:26.549656893 +0000 | ||
192 | @@ -73,10 +73,10 @@ | ||
193 | GLIBC_DYNAMIC_LINKER must be defined for each target using them, or | ||
194 | GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets | ||
195 | supporting both 32-bit and 64-bit compilation. */ | ||
196 | -#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" | ||
197 | -#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" | ||
198 | -#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" | ||
199 | -#define UCLIBC_DYNAMIC_LINKERX32 "/lib/ldx32-uClibc.so.0" | ||
200 | +#define UCLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-uClibc.so.0" | ||
201 | +#define UCLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-uClibc.so.0" | ||
202 | +#define UCLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld64-uClibc.so.0" | ||
203 | +#define UCLIBC_DYNAMIC_LINKERX32 SYSTEMLIBS_DIR "ldx32-uClibc.so.0" | ||
204 | #define BIONIC_DYNAMIC_LINKER "/system/bin/linker" | ||
205 | #define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker" | ||
206 | #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64" | ||