summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/gcc
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2021-08-17 16:08:15 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-22 22:21:46 +0100
commitce15691ee91ba3e7deeed2a21df4e0db2bbf0b53 (patch)
tree1ad2de98ebaecd867b57bbf6abddb4c865cf019d /meta/recipes-devtools/gcc
parent13bfab12cc1d24735aece376563b5510bf33fb9d (diff)
downloadpoky-ce15691ee91ba3e7deeed2a21df4e0db2bbf0b53.tar.gz
gcc: also relocate the musl loader
Alongside GLIBC and UCLIBC, also relocate the musl loader. (From OE-Core rev: 24c4e01892df1510e5ba64b89a0060f62f2384e6) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc')
-rw-r--r--meta/recipes-devtools/gcc/gcc-multilib-config.inc8
1 files changed, 8 insertions, 0 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-multilib-config.inc b/meta/recipes-devtools/gcc/gcc-multilib-config.inc
index 33bcbbfa24..26bfed9507 100644
--- a/meta/recipes-devtools/gcc/gcc-multilib-config.inc
+++ b/meta/recipes-devtools/gcc/gcc-multilib-config.inc
@@ -120,6 +120,14 @@ python gcc_multilib_setup() {
120 r'\1' + wrap_libdir(libdirx32) + r'\3'), 120 r'\1' + wrap_libdir(libdirx32) + r'\3'),
121 (r'^(#define\s*UCLIBC_DYNAMIC_LINKER\b\s*)(\S+)(\s*\".*\")$', 121 (r'^(#define\s*UCLIBC_DYNAMIC_LINKER\b\s*)(\S+)(\s*\".*\")$',
122 r'\1' + wrap_libdir(libdir32) + r'\3'), 122 r'\1' + wrap_libdir(libdir32) + r'\3'),
123 (r'^(#define\s*MUSL_DYNAMIC_LINKER32\s*)(\S+)(\s*\".*\")$',
124 r'\1' + wrap_libdir(libdir32) + r'\3'),
125 (r'^(#define\s*MUSL_DYNAMIC_LINKER64\s*)(\S+)(\s*\".*\")$',
126 r'\1' + wrap_libdir(libdir64) + r'\3'),
127 (r'^(#define\s*MUSL_DYNAMIC_LINKERX32\s*)(\S+)(\s*\".*\")$',
128 r'\1' + wrap_libdir(libdirx32) + r'\3'),
129 (r'^(#define\s*MUSL_DYNAMIC_LINKER\b\s*)(\S+)(\s*\".*\")$',
130 r'\1' + wrap_libdir(libdir32) + r'\3'),
123 ] 131 ]
124 132
125 for (i, line) in enumerate(filelines): 133 for (i, line) in enumerate(filelines):