Skip to content

Fix incorrect names used / generated on ARM #238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Mar 27, 2018
Merged

Fix incorrect names used / generated on ARM #238

merged 1 commit into from
Mar 27, 2018

Conversation

TimNN
Copy link
Contributor

@TimNN TimNN commented Mar 27, 2018

Fixes #237.

@TimNN TimNN mentioned this pull request Mar 27, 2018
Closed
@TimNN
Copy link
Contributor Author

TimNN commented Mar 27, 2018

So, while this fixes 32bit iOS, it apparently breaks arm-unknown-linux-gnueabi...

TimNN
TimNN commented Mar 27, 2018
View reviewed changes
src/arm.rs Outdated
@@ -8,7 +8,7 @@ pub unsafe fn __aeabi_uidivmod() {
asm!("push {lr}
sub sp, sp, #4
mov r2, sp
bl __udivmodsi4
bl ___udivmodsi4
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apparently the gnueabi targets don't need the extra underscore... (while the iOS versions of those targets do).

@alexcrichton
Copy link
Member

Thanks! Looks like CI may be failing for ARM though?

(the windows failure can be ignored)

@TimNN
Copy link
Contributor Author

TimNN commented Mar 27, 2018

Thanks! Looks like CI may be failing for ARM though?

Yes, see the inline comment (#238 (comment)).

I don't know how to best fix this. Should I just duplicate the entire functions, one version for gnueabi and one for iOS? Do you have any idea what the actual rules are, when to use two and when three underscores?

@alexcrichton
Copy link
Member

Oh oops sorry I misinterpreted that comment, but yeah I think duplication here should be fine. Unfortunately I personally have no idea about the underscore business :(

@alexcrichton alexcrichton merged commit 2a2f6d9 into rust-lang:master Mar 27, 2018
@alexcrichton
Copy link
Member

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@TimNN @alexcrichton