[openwrt/openwrt] toolchain/musl: fix build regression on x86_64
LEDE Commits
lede-commits at lists.infradead.org
Tue May 6 05:29:31 PDT 2025
nbd pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/0b1e1943d524afe9a039ef84330a2c1d42819d41
commit 0b1e1943d524afe9a039ef84330a2c1d42819d41
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Tue May 6 14:28:51 2025 +0200
toolchain/musl: fix build regression on x86_64
Fix whitespace mangling which broke matching opcodes in the CFI patch
Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
.../musl/patches/100-tools-Rework-adding-of-CFI-annotations.patch | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/toolchain/musl/patches/100-tools-Rework-adding-of-CFI-annotations.patch b/toolchain/musl/patches/100-tools-Rework-adding-of-CFI-annotations.patch
index de45743caf..833eb659dd 100644
--- a/toolchain/musl/patches/100-tools-Rework-adding-of-CFI-annotations.patch
+++ b/toolchain/musl/patches/100-tools-Rework-adding-of-CFI-annotations.patch
@@ -1173,7 +1173,7 @@ Signed-off-by: Ignacy GawÄdzki <ignacy.gawedzki at green-communications.fr>
if (in_function)
--- a/tools/add-cfi.x86_64.awk
+++ b/tools/add-cfi.x86_64.awk
-@@ -1,169 +1,246 @@
+@@ -1,169 +1,247 @@
-# Insert GAS CFI directives ("control frame information") into x86-64 asm input
+# Insert GAS CFI directives ("control frame information") into x86-64 asm input.
@@ -1291,7 +1291,9 @@ Signed-off-by: Ignacy GawÄdzki <ignacy.gawedzki at green-communications.fr>
+ # Canonicalize whitespace.
+ gsub(/[ \t]+/, " ") # Mawk doesn't understand \s.
gsub(/ *, */, ",")
- gsub(/ *: */, ": ")
+- gsub(/ *: */, ": ")
++ if (match(":", $1))
++ sub(/ *: */, ": ")
gsub(/ $/, "")
gsub(/^ /, "")
}
@@ -1507,7 +1509,7 @@ Signed-off-by: Ignacy GawÄdzki <ignacy.gawedzki at green-communications.fr>
}
}
}
-@@ -171,24 +248,41 @@ function adjust_sp_offset(delta) {
+@@ -171,24 +249,41 @@ function adjust_sp_offset(delta) {
# IF REGISTER VALUES ARE UNCEREMONIOUSLY TRASHED
# ...then we want to know about it.
#
More information about the lede-commits
mailing list