All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Richard Purdie" <richard.purdie@linuxfoundation.org>
To: openembedded-core@lists.openembedded.org
Cc: Ross Burton <ross.burton@arm.com>
Subject: [PATCH 3/5] gcc: also relocate the musl loader
Date: Wed, 18 Aug 2021 17:50:31 +0100	[thread overview]
Message-ID: <20210818165033.3935964-3-richard.purdie@linuxfoundation.org> (raw)
In-Reply-To: <20210818165033.3935964-1-richard.purdie@linuxfoundation.org>

From: Ross Burton <ross.burton@arm.com>

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>
---
 meta/recipes-devtools/gcc/gcc-multilib-config.inc | 8 ++++++++
 1 file changed, 8 insertions(+)

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):
-- 
2.30.2


  parent reply	other threads:[~2021-08-18 16:50 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-18 16:50 [PATCH 1/5] glibc-package.inc: Fix builds of pseudo with glibc 2.34 Richard Purdie
2021-08-18 16:50 ` [PATCH 2/5] gcc: Fix nativesdk builds and multilib fixes with gcc 11 Richard Purdie
2021-08-18 16:50 ` Richard Purdie [this message]
2021-08-18 16:50 ` [PATCH 4/5] pseudo: Fix to work with glibc 2.34 systems Richard Purdie
2021-08-20  0:05   ` [OE-core] " Khem Raj
2021-08-18 16:50 ` [PATCH 5/5] elfutils: Fix ptest dependencies Richard Purdie
2021-08-20 13:48   ` [OE-core] " Alexander Kanavin
2021-08-21 11:13     ` Richard Purdie
2021-08-21 12:17       ` Alexander Kanavin
2021-08-21 14:46         ` Richard Purdie
2021-08-21 18:10           ` Martin Jansa
2021-08-21 18:23           ` Alexander Kanavin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210818165033.3935964-3-richard.purdie@linuxfoundation.org \
    --to=richard.purdie@linuxfoundation.org \
    --cc=openembedded-core@lists.openembedded.org \
    --cc=ross.burton@arm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.