aboutsummaryrefslogtreecommitdiffstats
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-18 17:01:29 +0100
commit5cad1a2ed5c5b3541022f6a4ff8ff6b2b7256ec7 (patch)
tree6bd7a99c7dcdd49cc7561bb85dc6030d7f394dd5
parenta42a047b3887942a76303bfc27fe0f8ea6726942 (diff)
downloadopenembedded-core-contrib-5cad1a2ed5c5b3541022f6a4ff8ff6b2b7256ec7.tar.gz
openembedded-core-contrib-5cad1a2ed5c5b3541022f6a4ff8ff6b2b7256ec7.tar.bz2
openembedded-core-contrib-5cad1a2ed5c5b3541022f6a4ff8ff6b2b7256ec7.zip
gcc: also relocate the musl loader
Alongside GLIBC and UCLIBC, also relocate the musl loader. Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 33bcbbfa246..26bfed9507b 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() {
r'\1' + wrap_libdir(libdirx32) + r'\3'),
(r'^(#define\s*UCLIBC_DYNAMIC_LINKER\b\s*)(\S+)(\s*\".*\")$',
r'\1' + wrap_libdir(libdir32) + r'\3'),
+ (r'^(#define\s*MUSL_DYNAMIC_LINKER32\s*)(\S+)(\s*\".*\")$',
+ r'\1' + wrap_libdir(libdir32) + r'\3'),
+ (r'^(#define\s*MUSL_DYNAMIC_LINKER64\s*)(\S+)(\s*\".*\")$',
+ r'\1' + wrap_libdir(libdir64) + r'\3'),
+ (r'^(#define\s*MUSL_DYNAMIC_LINKERX32\s*)(\S+)(\s*\".*\")$',
+ r'\1' + wrap_libdir(libdirx32) + r'\3'),
+ (r'^(#define\s*MUSL_DYNAMIC_LINKER\b\s*)(\S+)(\s*\".*\")$',
+ r'\1' + wrap_libdir(libdir32) + r'\3'),
]
for (i, line) in enumerate(filelines):