Replace the \01__gnu_mcount_nc to LLVM intrinsic for additional ARM targets

Björn Barwinski · Björn Barwinski · commit 6aea9f40ce21 · 2025-04-29T08:15:23.000+02:00
diff --git a/compiler/rustc_target/src/spec/targets/armv5te_unknown_linux_gnueabi.rs b/compiler/rustc_target/src/spec/targets/armv5te_unknown_linux_gnueabi.rs
@@ -20,6 +20,7 @@ pub(crate) fn target() -> Target {
             max_atomic_width: Some(32),
             mcount: "\u{1}__gnu_mcount_nc".into(),
             has_thumb_interworking: true,
+            llvm_mcount_intrinsic: Some("llvm.arm.gnu.eabi.mcount".into()),
             ..base::linux_gnu::opts()
         },
     }
diff --git a/compiler/rustc_target/src/spec/targets/armv7_unknown_linux_gnueabihf.rs b/compiler/rustc_target/src/spec/targets/armv7_unknown_linux_gnueabihf.rs
@@ -22,6 +22,7 @@ pub(crate) fn target() -> Target {
             features: "+v7,+vfp3,-d32,+thumb2,-neon".into(),
             max_atomic_width: Some(64),
             mcount: "\u{1}__gnu_mcount_nc".into(),
+            llvm_mcount_intrinsic: Some("llvm.arm.gnu.eabi.mcount".into()),
             ..base::linux_gnu::opts()
         },
     }

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ pub(crate) fn target() -> Target {`
`20`	`20`	`max_atomic_width: Some(32),`
`21`	`21`	`mcount: "\u{1}__gnu_mcount_nc".into(),`
`22`	`22`	`has_thumb_interworking: true,`
	`23`	`+ llvm_mcount_intrinsic: Some("llvm.arm.gnu.eabi.mcount".into()),`
`23`	`24`	`..base::linux_gnu::opts()`
`24`	`25`	`},`
`25`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ pub(crate) fn target() -> Target {`
`22`	`22`	`features: "+v7,+vfp3,-d32,+thumb2,-neon".into(),`
`23`	`23`	`max_atomic_width: Some(64),`
`24`	`24`	`mcount: "\u{1}__gnu_mcount_nc".into(),`
	`25`	`+ llvm_mcount_intrinsic: Some("llvm.arm.gnu.eabi.mcount".into()),`
`25`	`26`	`..base::linux_gnu::opts()`
`26`	`27`	`},`
`27`	`28`	`}`