From 726e002a3d618ae9e663a390973ee0d8519c9afd Mon Sep 17 00:00:00 2001
From: Gabriel Baraldi <baraldigabriel@gmail.com>
Date: Thu, 30 May 2024 16:25:00 -0300
Subject: [PATCH] Fix trampoline assembly for build on clang 18 on apple
 silicon (#54634)

This avoids a: `error: non-private labels cannot appear between
.cfi_startproc / .cfi_endproc pairs` error.
That error was introduced in https://reviews.llvm.org/D155245#4657075
see also https://github.com/llvm/llvm-project/issues/72802

(cherry picked from commit a4e793ee31612625d9c48ebd89a53c3a5c0f6eb6)
(cherry picked from commit 3f35094d298b41d57f3f3a8c5a9abd52bcf47b30)
---
 cli/trampolines/trampolines_aarch64.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cli/trampolines/trampolines_aarch64.S b/cli/trampolines/trampolines_aarch64.S
index 2d87ae6dcdb1c..ccb9a647ac6c3 100644
--- a/cli/trampolines/trampolines_aarch64.S
+++ b/cli/trampolines/trampolines_aarch64.S
@@ -5,9 +5,9 @@
 
 #define XX(name) \
 .global CNAME(name) SEP \
+CNAME(name)##: SEP \
 .cfi_startproc SEP \
 .p2align    2 SEP \
-CNAME(name)##: SEP \
     adrp x16, PAGE(CNAME(name##_addr)) SEP \
     ldr x16, [x16, PAGEOFF(CNAME(name##_addr))] SEP \
     br x16 SEP \