Skip to content

Port #672 and #686 to Android. #710

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 4 commits into from
Aug 4, 2017
Merged

Port #672 and #686 to Android. #710

merged 4 commits into from
Aug 4, 2017

Conversation

marmistrz
Copy link
Contributor

I'd rather avoid the duplication, but this is discussed in #707.

@marmistrz
Port rust-lang#672 and rust-lang#686 to Android.
20591a3 
I'd rather avoid the duplication, this is discussed in rust-lang#707.
@alexcrichton
Copy link
Member

Looks like CI may be failing?

@alexcrichton
Copy link
Member

Still failing :(

@marmistrz
Copy link
Contributor Author

It looks like some syscalls: SYS__llseek, SYS__sysctl and SYS__newselect are not present in CI. But they seem to be present in the Android sources:

sysroot/usr/include/mips64el-linux-android/asm/unistd.h:#define __NR__llseek (__NR_Linux + 140)
sysroot/usr/include/arm-linux-androideabi/asm/unistd-common.h:#define __NR__llseek (__NR_SYSCALL_BASE + 140)
sysroot/usr/include/mipsel-linux-android/asm/unistd.h:#define __NR__llseek (__NR_Linux + 140)
sysroot/usr/include/x86_64-linux-android/asm/unistd_32.h:#define __NR__llseek 140
sysroot/usr/include/i686-linux-android/asm/unistd_32.h:#define __NR__llseek 140
platforms/android-9/arch-mips/usr/include/sys/linux-syscalls.h:#define __NR__llseek                      (__NR_SYSCALL_BASE + 140)
platforms/android-9/arch-mips/usr/include/asm/unistd.h:#define __NR__llseek (__NR_Linux + 140)
platforms/android-9/arch-arm/usr/include/sys/linux-syscalls.h:#define __NR__llseek                      (__NR_SYSCALL_BASE + 140)
platforms/android-9/arch-arm/usr/include/asm/unistd.h:#define __NR__llseek (__NR_SYSCALL_BASE+140)
platforms/android-9/arch-x86/usr/include/sys/linux-syscalls.h:#define __NR__llseek                      (__NR_SYSCALL_BASE + 140)
platforms/android-9/arch-x86/usr/include/asm/unistd_32.h:#define __NR__llseek 140
platforms/android-13/arch-mips/usr/include/sys/linux-syscalls.h:#define __NR__llseek                      (__NR_SYSCALL_BASE + 140)
platforms/android-13/arch-mips/usr/include/asm/unistd.h:#define __NR__llseek (__NR_Linux + 140)
platforms/android-13/arch-arm/usr/include/sys/linux-syscalls.h:#define __NR__llseek                      (__NR_SYSCALL_BASE + 140)
platforms/android-13/arch-arm/usr/include/asm/unistd.h:#define __NR__llseek (__NR_SYSCALL_BASE+140)
platforms/android-13/arch-x86/usr/include/sys/linux-syscalls.h:#define __NR__llseek                      (__NR_SYSCALL_BASE + 140)
platforms/android-13/arch-x86/usr/include/asm/unistd_32.h:#define __NR__llseek 140
platforms/android-26/arch-mips/usr/include/asm/unistd.h:#define __NR__llseek (__NR_Linux + 140)
platforms/android-26/arch-arm/usr/include/asm/unistd.h:#define __NR__llseek (__NR_SYSCALL_BASE+140)
platforms/android-26/arch-x86_64/usr/include/asm/unistd_32.h:#define __NR__llseek 140
platforms/android-26/arch-x86/usr/include/asm/unistd_32.h:#define __NR__llseek 140
platforms/android-26/arch-mips64/usr/include/asm/unistd.h:#define __NR__llseek (__NR_Linux + 140)
platforms/android-22/arch-mips/usr/include/asm/unistd.h:#define __NR__llseek (__NR_Linux + 140)
platforms/android-22/arch-arm/usr/include/asm/unistd.h:#define __NR__llseek (__NR_SYSCALL_BASE+140)
platforms/android-22/arch-x86_64/usr/include/asm/unistd_32.h:#define __NR__llseek 140
platforms/android-22/arch-x86/usr/include/asm/unistd_32.h:#define __NR__llseek 140
platforms/android-22/arch-mips64/usr/include/asm/unistd.h:#define __NR__llseek (__NR_Linux + 140)
platforms/android-15/arch-mips/usr/include/sys/linux-syscalls.h:#define __NR__llseek                      (__NR_SYSCALL_BASE + 140)
platforms/android-15/arch-mips/usr/include/asm/unistd.h:#define __NR__llseek (__NR_Linux + 140)
platforms/android-15/arch-arm/usr/include/sys/linux-syscalls.h:#define __NR__llseek                      (__NR_SYSCALL_BASE + 140)
platforms/android-15/arch-arm/usr/include/asm/unistd.h:#define __NR__llseek (__NR_SYSCALL_BASE+140)
platforms/android-15/arch-x86/usr/include/sys/linux-syscalls.h:#define __NR__llseek                      (__NR_SYSCALL_BASE + 140)
platforms/android-15/arch-x86/usr/include/asm/unistd_32.h:#define __NR__llseek 140
platforms/android-16/arch-mips/usr/include/sys/linux-syscalls.h:#define __NR__llseek                      (__NR_SYSCALL_BASE + 140)
platforms/android-16/arch-mips/usr/include/asm/unistd.h:#define __NR__llseek (__NR_Linux + 140)
platforms/android-16/arch-arm/usr/include/sys/linux-syscalls.h:#define __NR__llseek                      (__NR_SYSCALL_BASE + 140)
platforms/android-16/arch-arm/usr/include/asm/unistd.h:#define __NR__llseek (__NR_SYSCALL_BASE+140)
platforms/android-16/arch-x86/usr/include/sys/linux-syscalls.h:#define __NR__llseek                      (__NR_SYSCALL_BASE + 140)
platforms/android-16/arch-x86/usr/include/asm/unistd_32.h:#define __NR__llseek 140
platforms/android-23/arch-mips/usr/include/asm/unistd.h:#define __NR__llseek (__NR_Linux + 140)
platforms/android-23/arch-arm/usr/include/asm/unistd.h:#define __NR__llseek (__NR_SYSCALL_BASE+140)
platforms/android-23/arch-x86_64/usr/include/asm/unistd_32.h:#define __NR__llseek 140
platforms/android-23/arch-x86/usr/include/asm/unistd_32.h:#define __NR__llseek 140
platforms/android-23/arch-mips64/usr/include/asm/unistd.h:#define __NR__llseek (__NR_Linux + 140)
platforms/android-17/arch-mips/usr/include/sys/linux-syscalls.h:#define __NR__llseek                      (__NR_SYSCALL_BASE + 140)
platforms/android-17/arch-mips/usr/include/asm/unistd.h:#define __NR__llseek (__NR_Linux + 140)
platforms/android-17/arch-arm/usr/include/sys/linux-syscalls.h:#define __NR__llseek                      (__NR_SYSCALL_BASE + 140)
platforms/android-17/arch-arm/usr/include/asm/unistd.h:#define __NR__llseek (__NR_SYSCALL_BASE+140)
platforms/android-17/arch-x86/usr/include/sys/linux-syscalls.h:#define __NR__llseek                      (__NR_SYSCALL_BASE + 140)
platforms/android-17/arch-x86/usr/include/asm/unistd_32.h:#define __NR__llseek 140
platforms/android-14/arch-mips/usr/include/sys/linux-syscalls.h:#define __NR__llseek                      (__NR_SYSCALL_BASE + 140)
platforms/android-14/arch-mips/usr/include/asm/unistd.h:#define __NR__llseek (__NR_Linux + 140)
platforms/android-14/arch-arm/usr/include/sys/linux-syscalls.h:#define __NR__llseek                      (__NR_SYSCALL_BASE + 140)
platforms/android-14/arch-arm/usr/include/asm/unistd.h:#define __NR__llseek (__NR_SYSCALL_BASE+140)
platforms/android-14/arch-x86/usr/include/sys/linux-syscalls.h:#define __NR__llseek                      (__NR_SYSCALL_BASE + 140)
platforms/android-14/arch-x86/usr/include/asm/unistd_32.h:#define __NR__llseek 140
platforms/android-21/arch-mips/usr/include/asm/unistd.h:#define __NR__llseek (__NR_Linux + 140)
platforms/android-21/arch-arm/usr/include/asm/unistd.h:#define __NR__llseek (__NR_SYSCALL_BASE+140)
platforms/android-21/arch-x86_64/usr/include/asm/unistd_32.h:#define __NR__llseek 140
platforms/android-21/arch-x86/usr/include/asm/unistd_32.h:#define __NR__llseek 140
platforms/android-21/arch-mips64/usr/include/asm/unistd.h:#define __NR__llseek (__NR_Linux + 140)
platforms/android-18/arch-mips/usr/include/sys/linux-syscalls.h:#define __NR__llseek                      (__NR_SYSCALL_BASE + 140)
platforms/android-18/arch-mips/usr/include/asm/unistd.h:#define __NR__llseek (__NR_Linux + 140)
platforms/android-18/arch-arm/usr/include/sys/linux-syscalls.h:#define __NR__llseek                      (__NR_SYSCALL_BASE + 140)
platforms/android-18/arch-arm/usr/include/asm/unistd.h:#define __NR__llseek (__NR_SYSCALL_BASE+140)
platforms/android-18/arch-x86/usr/include/sys/linux-syscalls.h:#define __NR__llseek                      (__NR_SYSCALL_BASE + 140)
platforms/android-18/arch-x86/usr/include/asm/unistd_32.h:#define __NR__llseek 140
platforms/android-24/arch-mips/usr/include/asm/unistd.h:#define __NR__llseek (__NR_Linux + 140)
platforms/android-24/arch-arm/usr/include/asm/unistd.h:#define __NR__llseek (__NR_SYSCALL_BASE+140)
platforms/android-24/arch-x86_64/usr/include/asm/unistd_32.h:#define __NR__llseek 140
platforms/android-24/arch-x86/usr/include/asm/unistd_32.h:#define __NR__llseek 140
platforms/android-24/arch-mips64/usr/include/asm/unistd.h:#define __NR__llseek (__NR_Linux + 140)
platforms/android-19/arch-mips/usr/include/sys/linux-syscalls.h:#define __NR__llseek                      (__NR_SYSCALL_BASE + 140)
platforms/android-19/arch-mips/usr/include/asm/unistd.h:#define __NR__llseek (__NR_Linux + 140)
platforms/android-19/arch-arm/usr/include/sys/linux-syscalls.h:#define __NR__llseek                      (__NR_SYSCALL_BASE + 140)
platforms/android-19/arch-arm/usr/include/asm/unistd.h:#define __NR__llseek (__NR_SYSCALL_BASE+140)
platforms/android-19/arch-x86/usr/include/sys/linux-syscalls.h:#define __NR__llseek                      (__NR_SYSCALL_BASE + 140)
platforms/android-19/arch-x86/usr/include/asm/unistd_32.h:#define __NR__llseek 140
platforms/android-12/arch-mips/usr/include/sys/linux-syscalls.h:#define __NR__llseek                      (__NR_SYSCALL_BASE + 140)
platforms/android-12/arch-mips/usr/include/asm/unistd.h:#define __NR__llseek (__NR_Linux + 140)
platforms/android-12/arch-arm/usr/include/sys/linux-syscalls.h:#define __NR__llseek                      (__NR_SYSCALL_BASE + 140)
platforms/android-12/arch-arm/usr/include/asm/unistd.h:#define __NR__llseek (__NR_SYSCALL_BASE+140)
platforms/android-12/arch-x86/usr/include/sys/linux-syscalls.h:#define __NR__llseek                      (__NR_SYSCALL_BASE + 140)
platforms/android-12/arch-x86/usr/include/asm/unistd_32.h:#define __NR__llseek 140

@alexcrichton
Copy link
Member

This'll just need to go green to land!

@marmistrz
Copy link
Contributor Author

@alexcrichton
I simply have no idea why the #defines are not recognized. They should be, since they are here in asm/unistd_32.h, the headers look perfectly alright.

Is there any Android expert here?

@marmistrz
Comment out some of the syscalls for Android.
4702102 
For some reason, they are in the NDK sources but
they are not available in the tests. I don't know what
Android does here, but nothing that makes sense.
@marmistrz
Copy link
Contributor Author

Here you are, I just commented these out. I don't have the time to cope with Android's weirdness.

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Aug 4, 2017

📌 Commit 4702102 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Aug 4, 2017

⌛ Testing commit 4702102 with merge ecd468e...

bors added a commit that referenced this pull request Aug 4, 2017
@bors
Auto merge of #710 - marmistrz:android, r=alexcrichton
ecd468e 
Port #672 and #686 to Android.

I'd rather avoid the duplication, but this is discussed in #707.
@bors
Copy link
Contributor

bors commented Aug 4, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing ecd468e to master...

@bors bors merged commit 4702102 into rust-lang:master Aug 4, 2017
marmistrz added a commit to marmistrz/libc that referenced this pull request Aug 4, 2017
@marmistrz
Bring back SYS_gettid on Android/ARM which was accidentally removed by …
81eb094 
…rust-lang#710.
bors added a commit that referenced this pull request Aug 5, 2017
@bors
Auto merge of #713 - marmistrz:fix-gettid, r=alexcrichton
6c0ff9e 
Bring back SYS_gettid on Android/ARM which was accidentally removed by #710.
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.
3 participants
@marmistrz @alexcrichton @bors