From b32758cdc2be7fbcb1e692738d821310ff866c0c Mon Sep 17 00:00:00 2001
From: Trevor Gross <tmgross@umich.edu>
Date: Fri, 2 Aug 2024 17:42:36 -0400
Subject: [PATCH] Add back remaining config on `arm_aeabi_alias`

Intrinsics marked with `arm_aeabi_alias = ...` were having the rest of
their attributes eaten. Add them back.
---
 library/compiler-builtins/src/macros.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/library/compiler-builtins/src/macros.rs b/library/compiler-builtins/src/macros.rs
index fb14660af987..42c83ee55fb9 100644
--- a/library/compiler-builtins/src/macros.rs
+++ b/library/compiler-builtins/src/macros.rs
@@ -290,6 +290,7 @@ macro_rules! intrinsics {
         $($rest:tt)*
     ) => (
         #[cfg(target_arch = "arm")]
+        $(#[$($attr)*])*
         pub extern $abi fn $name( $($argname: $ty),* ) $(-> $ret)? {
             $($body)*
         }
@@ -298,6 +299,7 @@ macro_rules! intrinsics {
         mod $name {
             #[no_mangle]
             #[cfg_attr(all(not(windows), not(target_vendor = "apple")), linkage = "weak")]
+            $(#[$($attr)*])*
             extern $abi fn $name( $($argname: $ty),* ) $(-> $ret)? {
                 super::$name($($argname),*)
             }
@@ -307,6 +309,7 @@ macro_rules! intrinsics {
         mod $alias {
             #[no_mangle]
             #[cfg_attr(all(not(windows), not(target_vendor="apple")), linkage = "weak")]
+            $(#[$($attr)*])*
             extern "aapcs" fn $alias( $($argname: $ty),* ) $(-> $ret)? {
                 super::$name($($argname),*)
             }