OpenWrt/xiaomi-ax3600
1
0
Fork 0
mirror of https://github.com/immortalwrt/immortalwrt.git synced 2025-08-14 14:19:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

toolchain/musl: fix build regression on x86_64

Browse Source 
Fix whitespace mangling which broke matching opcodes in the CFI patch

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau
2025-05-06 14:28:51 +02:00
parent be7ab6893a
commit 0b1e1943d5
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
toolchain/musl/patches/100-tools-Rework-adding-of-CFI-annotations.patch
View File

@ -1173,7 +1173,7 @@ Signed-off-by: Ignacy Gawędzki <ignacy.gawedzki@green-communications.fr>
if (in_function) if (in_function)
--- a/tools/add-cfi.x86_64.awk --- a/tools/add-cfi.x86_64.awk
+++ b/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
+# 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@green-communications.fr>
+ # Canonicalize whitespace. + # Canonicalize whitespace.
+ gsub(/[ \t]+/, " ") # Mawk doesn't understand \s. + gsub(/[ \t]+/, " ") # Mawk doesn't understand \s.
gsub(/ *, */, ",") gsub(/ *, */, ",")
gsub(/ *: */, ": ") - gsub(/ *: */, ": ")
+ if (match(":", $1))
+ sub(/ *: */, ": ")
gsub(/ $/, "") gsub(/ $/, "")
gsub(/^ /, "") gsub(/^ /, "")
} }
@ -1507,7 +1509,7 @@ Signed-off-by: Ignacy Gawędzki <ignacy.gawedzki@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 # IF REGISTER VALUES ARE UNCEREMONIOUSLY TRASHED
# ...then we want to know about it. # ...then we want to know about it.
# #