Skip to content

Commit 340fe36

Browse files
committed
Fix incorrect names used / generated on ARM
1 parent 263a703 commit 340fe36

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

src/arm.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ pub unsafe fn __aeabi_uidivmod() {
88
asm!("push {lr}
99
sub sp, sp, #4
1010
mov r2, sp
11-
bl __udivmodsi4
11+
bl ___udivmodsi4
1212
ldr r1, [sp]
1313
add sp, sp, #4
1414
pop {pc}" ::: "memory" : "volatile");
@@ -22,7 +22,7 @@ pub unsafe fn __aeabi_uldivmod() {
2222
sub sp, sp, #16
2323
add r4, sp, #8
2424
str r4, [sp]
25-
bl __udivmoddi4
25+
bl ___udivmoddi4
2626
ldr r2, [sp, #8]
2727
ldr r3, [sp, #12]
2828
add sp, sp, #16
@@ -34,7 +34,7 @@ pub unsafe fn __aeabi_uldivmod() {
3434
#[cfg_attr(not(feature = "mangled-names"), no_mangle)]
3535
pub unsafe fn __aeabi_idivmod() {
3636
asm!("push {r0, r1, r4, lr}
37-
bl __aeabi_idiv
37+
bl ___aeabi_idiv
3838
pop {r1, r2}
3939
muls r2, r2, r0
4040
subs r1, r1, r2
@@ -49,7 +49,7 @@ pub unsafe fn __aeabi_ldivmod() {
4949
sub sp, sp, #16
5050
add r4, sp, #8
5151
str r4, [sp]
52-
bl __divmoddi4
52+
bl ___divmoddi4
5353
ldr r2, [sp, #8]
5454
ldr r3, [sp, #12]
5555
add sp, sp, #16

src/macros.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ macro_rules! intrinsics {
210210
$($rest:tt)*
211211
) => (
212212
#[cfg(target_arch = "arm")]
213+
#[cfg_attr(not(feature = "mangled-names"), no_mangle)]
213214
pub extern $abi fn $name( $($argname: $ty),* ) -> $ret {
214215
$($body)*
215216
}

0 commit comments

Comments
 (0)