Skip to content
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

bootstrap.py: fix armv7 detection #41152

Merged
merged 1 commit into from
Apr 8, 2017
Merged

bootstrap.py: fix armv7 detection #41152

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/bootstrap/bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,10 +463,10 @@ def build_triple(self):
cputype = 'i686'
elif cputype in {'xscale', 'arm'}:
cputype = 'arm'
elif cputype in {'armv6l', 'armv7l', 'armv8l'}:
elif cputype == 'armv6l':
cputype = 'arm'
ostype += 'eabihf'
elif cputype == 'armv7l':
elif cputype in {'armv7l', 'armv8l'}:
Copy link
Contributor

Choose a reason for hiding this comment

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

I think that cputype for armv8l should be aarch64. See https://www.reddit.com/r/rust/comments/631bl2/exciting_rust_coming_to_android_and_chromebooks/dfrvl0j/

Copy link
Member Author

Choose a reason for hiding this comment

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

armv8l is still running in 32-bit mode. If you're running 64-bit, uname -m should say aarch64.

I just verified this on my Galaxy S7. When I run uname -m via adb shell, I get aarch64. When I run under JuiceSSH localhost, I get armv8l. Last time I checked, Termux only installed a 32-bit environment, which might explain why you don't see aarch64.

Copy link
Member Author

Choose a reason for hiding this comment

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

That said, I just tried Termux myself, and I do see aarch64. From their changelog it seems they started installing 64-bit about a year ago. Perhaps your installation predates this?

Start using 64-bit arm packages for capable devices. Up until now Termux used 32-bit arm binaries even on 64-bit devices. This change will affect only new installations - existing users may reinstall the app to get a 64-bit environment (making sure to save relevant material from the home folder first).

Copy link
Contributor

Choose a reason for hiding this comment

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

That is not my device... Do you have any idea of why does JuiceSSH differs from termux?

Copy link
Member Author

Choose a reason for hiding this comment

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

I didn't mean that it was your device, just that it's the 64-bit Android I have at hand. I think the difference is simply that JuiceSSH is a 32-bit app, and my Termux installation got 64-bit.

Copy link
Contributor

@malbarbo malbarbo Apr 8, 2017 •
edited
Loading

Choose a reason for hiding this comment

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

I misunderstood you. My english is not very good, sorry. Thank you once again.

cputype = 'armv7'
ostype += 'eabihf'
elif cputype == 'aarch64':
Expand Down