From: Felix Fietkau <nbd@nbd.name>
Date: Tue, 6 May 2025 12:28:51 +0000 (+0200)
Subject: toolchain/musl: fix build regression on x86_64
X-Git-Tag: v25.12.0-rc1~2872
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b1e1943d524afe9a039ef84330a2c1d42819d41;p=thirdparty%2Fopenwrt.git

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@nbd.name>
---

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 de45743caf5..833eb659dda 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@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@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@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.
  #