naked_asm: add cfi_startproc/cfi_endproc to all platforms

Since 2024-12-12 the Rust compiler now requires all naked ASM functions to include `.cfi_startproc` and `.cfi_endproc`. Without these directives, the build will fail. Add these directives to all supported platforms. This also works around #80608 by forcing LLVM to consider that code with the "d" extension has an FPU. Signed-off-by: Sean Cross <[email protected]>
nbdd0121 · Dec 26, 2024 · c6f2860 · c6f2860
1 parent ff0e91b
commit c6f2860
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 1 deletion.
diff --git a/src/unwinder/arch/aarch64.rs b/src/unwinder/arch/aarch64.rs
@@ -63,6 +63,7 @@ macro_rules! save {
     (gp$(, $fp:ident)?) => {
         // No need to save caller-saved registers here.
         core::arch::naked_asm!(
+            maybe_cfi!(".cfi_startproc"),
             "stp x29, x30, [sp, -16]!",
             maybe_cfi!("
             .cfi_def_cfa_offset 16
@@ -98,6 +99,7 @@ macro_rules! save {
             .cfi_restore x30
             "),
             "ret",
+            maybe_cfi!(".cfi_endproc"),
         );
     };
     (maybesavefp(fp)) => {

diff --git a/src/unwinder/arch/riscv32.rs b/src/unwinder/arch/riscv32.rs
@@ -83,6 +83,8 @@ macro_rules! code {
     };
     (save_fp) => {
         "
+        .option push     // Work around Rust issue #80608
+        .option arch, +d // Work around Rust issue #80608
         fsd fs0, 0xC0(sp)
         fsd fs1, 0xC8(sp)
         fsd fs2, 0x110(sp)
@@ -95,6 +97,7 @@ macro_rules! code {
         fsd fs9, 0x148(sp)
         fsd fs10, 0x150(sp)
         fsd fs11, 0x158(sp)
+        .option pop      // Work around Rust issue #80608
         "
     };
     (restore_gp) => {
@@ -175,6 +178,7 @@ pub extern "C-unwind" fn save_context(f: extern "C" fn(&mut Context, *mut ()), p
     #[cfg(target_feature = "d")]
     unsafe {
         core::arch::naked_asm!(
+            maybe_cfi!(".cfi_startproc"),
             "
             mv t0, sp
             add sp, sp, -0x190
@@ -194,11 +198,13 @@ pub extern "C-unwind" fn save_context(f: extern "C" fn(&mut Context, *mut ()), p
             maybe_cfi!(".cfi_def_cfa_offset 0"),
             maybe_cfi!(".cfi_restore ra"),
             "ret",
+            maybe_cfi!(".cfi_endproc"),
         );
     }
     #[cfg(not(target_feature = "d"))]
     unsafe {
         core::arch::naked_asm!(
+            maybe_cfi!(".cfi_startproc"),
             "
             mv t0, sp
             add sp, sp, -0x90
@@ -217,6 +223,7 @@ pub extern "C-unwind" fn save_context(f: extern "C" fn(&mut Context, *mut ()), p
             maybe_cfi!(".cfi_def_cfa_offset 0"),
             maybe_cfi!(".cfi_restore ra"),
             "ret",
+            maybe_cfi!(".cfi_endproc")
         );
     }
 }

diff --git a/src/unwinder/arch/riscv64.rs b/src/unwinder/arch/riscv64.rs
@@ -83,6 +83,8 @@ macro_rules! code {
     };
     (save_fp) => {
         "
+        .option push     // Work around Rust issue #80608
+        .option arch, +d // Work around Rust issue #80608
         fsd fs0, 0x140(sp)
         fsd fs1, 0x148(sp)
         fsd fs2, 0x190(sp)
@@ -95,6 +97,7 @@ macro_rules! code {
         fsd fs9, 0x1C8(sp)
         fsd fs10, 0x1D0(sp)
         fsd fs11, 0x1D8(sp)
+        .option pop      // Work around Rust issue #80608
         "
     };
     (restore_gp) => {
@@ -175,6 +178,7 @@ pub extern "C-unwind" fn save_context(f: extern "C" fn(&mut Context, *mut ()), p
     #[cfg(target_feature = "d")]
     unsafe {
         core::arch::naked_asm!(
+            maybe_cfi!(".cfi_startproc"),
             "
             mv t0, sp
             add sp, sp, -0x210
@@ -194,11 +198,13 @@ pub extern "C-unwind" fn save_context(f: extern "C" fn(&mut Context, *mut ()), p
             maybe_cfi!(".cfi_def_cfa_offset 0"),
             maybe_cfi!(".cfi_restore ra"),
             "ret",
+            maybe_cfi!(".cfi_endproc"),
         );
     }
     #[cfg(not(target_feature = "d"))]
     unsafe {
         core::arch::naked_asm!(
+            maybe_cfi!(".cfi_startproc"),
             "
             mv t0, sp
             add sp, sp, -0x110
@@ -217,6 +223,7 @@ pub extern "C-unwind" fn save_context(f: extern "C" fn(&mut Context, *mut ()), p
             maybe_cfi!(".cfi_def_cfa_offset 0"),
             maybe_cfi!(".cfi_restore ra"),
             "ret",
+            maybe_cfi!(".cfi_endproc"),
         );
     }
 }

diff --git a/src/unwinder/arch/x86.rs b/src/unwinder/arch/x86.rs
@@ -61,6 +61,7 @@ pub extern "C-unwind" fn save_context(f: extern "C" fn(&mut Context, *mut ()), p
     // No need to save caller-saved registers here.
     unsafe {
         core::arch::naked_asm!(
+            maybe_cfi!(".cfi_startproc"),
             "sub esp, 52",
             maybe_cfi!(".cfi_def_cfa_offset 56"),
             "
@@ -97,6 +98,7 @@ pub extern "C-unwind" fn save_context(f: extern "C" fn(&mut Context, *mut ()), p
             ",
             maybe_cfi!(".cfi_def_cfa_offset 4"),
             "ret",
+            maybe_cfi!(".cfi_endproc"),
         );
     }
 }

diff --git a/src/unwinder/arch/x86_64.rs b/src/unwinder/arch/x86_64.rs
@@ -63,6 +63,7 @@ pub extern "C-unwind" fn save_context(f: extern "C" fn(&mut Context, *mut ()), p
     // No need to save caller-saved registers here.
     unsafe {
         core::arch::naked_asm!(
+            maybe_cfi!(".cfi_startproc"),
             "sub rsp, 0x98",
             maybe_cfi!(".cfi_def_cfa_offset 0xA0"),
             "
@@ -91,7 +92,8 @@ pub extern "C-unwind" fn save_context(f: extern "C" fn(&mut Context, *mut ()), p
             add rsp, 0x98
             ",
             maybe_cfi!(".cfi_def_cfa_offset 8"),
-            "ret"
+            "ret",
+            maybe_cfi!(".cfi_endproc"),
         );
     }
 }