Remove erroneous aapcs_on_arm and add maybe_use_optimized_c_shim

library/compiler-builtins/src/int/sdiv.rs

@@ -92,7 +92,7 @@ intrinsics! {
         i64_div_rem(a, b).1
     }
 
-    #[aapcs_on_arm]
+    #[maybe_use_optimized_c_shim]
     /// Returns `n / d` and sets `*rem = n % d`
     pub extern "C" fn __divmoddi4(a: i64, b: i64, rem: &mut i64) -> i64 {
         let quo_rem = i64_div_rem(a, b);

library/compiler-builtins/src/int/udiv.rs

@@ -187,6 +187,7 @@ intrinsics! {
         u64_div_rem(n, d).1
     }
 
+    #[maybe_use_optimized_c_shim]
     /// Returns `n / d` and sets `*rem = n % d`
     pub extern "C" fn __udivmoddi4(n: u64, d: u64, rem: Option<&mut u64>) -> u64 {
         let quo_rem = u64_div_rem(n, d);