Merge pull request #552 from elbe0046/fix-aeabi-multi-def

Amanieu · web-flow · commit 8c6c66d16227 · 2023-10-31T20:15:42.000+01:00
diff --git a/src/macros.rs b/src/macros.rs
@@ -369,7 +369,7 @@ macro_rules! intrinsics {
         #[cfg(target_arch = "arm")]
         pub mod $alias {
             #[cfg_attr(not(feature = "mangled-names"), no_mangle)]
-            #[cfg_attr(any(all(not(windows), not(target_vendor="apple"), feature = "weak-intrinsics")), linkage = "weak")]
+            #[cfg_attr(any(all(not(windows), not(target_vendor="apple")), feature = "weak-intrinsics"), linkage = "weak")]
             pub extern "aapcs" fn $alias( $($argname: $ty),* ) $(-> $ret)? {
                 super::$name($($argname),*)
             }

Original file line number	Diff line number	Diff line change
`@@ -369,7 +369,7 @@ macro_rules! intrinsics {`
`369`	`369`	`#[cfg(target_arch = "arm")]`
`370`	`370`	`pub mod $alias {`
`371`	`371`	`#[cfg_attr(not(feature = "mangled-names"), no_mangle)]`
`372`		`- #[cfg_attr(any(all(not(windows), not(target_vendor="apple"), feature = "weak-intrinsics")), linkage = "weak")]`
	`372`	`+ #[cfg_attr(any(all(not(windows), not(target_vendor="apple")), feature = "weak-intrinsics"), linkage = "weak")]`
`373`	`373`	`pub extern "aapcs" fn $alias( $($argname: $ty),* ) $(-> $ret)? {`
`374`	`374`	`super::$name($($argname),*)`
`375`	`375`	`}`