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

More fixes for x86_64-unknown-linux-gnux32 #45652

Merged
merged 2 commits into from
Nov 1, 2017
Merged

More fixes for x86_64-unknown-linux-gnux32 #45652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40edecc
Bump libc to 0.2.33
malbarbo Oct 31, 2017
8e96243
Fix NR_GETRANDOM for linux x32
malbarbo Oct 31, 2017
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
2 changes: 1 addition & 1 deletion src/liblibc
Open in desktop
Submodule liblibc updated 36 files
+12 −3 .travis.yml
+22 −22 Cargo.lock
+1 −1 Cargo.toml
+0 −15 ci/android-accept-licenses.sh
+15 −12 ci/android-install-sdk.sh
+2 −2 ci/docker/aarch64-linux-android/Dockerfile
+2 −2 ci/docker/arm-linux-androideabi/Dockerfile
+2 −2 ci/docker/i686-linux-android/Dockerfile
+11 −0 ci/docker/mips64el-unknown-linux-gnuabi64/Dockerfile
+11 −0 ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile
+14 −0 ci/docker/sparc64-unknown-linux-gnu/Dockerfile
+5 −0 ci/docker/x86_64-unknown-linux-gnux32/Dockerfile
+8 −1 ci/run.sh
+1 −1 libc-test/Cargo.toml
+7 −7 src/unix/bsd/netbsdlike/netbsd/mod.rs
+28 −0 src/unix/mod.rs
+366 −366 src/unix/notbsd/linux/mips/mips32.rs
+326 −326 src/unix/notbsd/linux/mips/mips64.rs
+3 −0 src/unix/notbsd/linux/mips/mod.rs
+25 −14 src/unix/notbsd/linux/mod.rs
+350 −350 src/unix/notbsd/linux/musl/b32/arm.rs
+358 −358 src/unix/notbsd/linux/musl/b32/mips.rs
+264 −264 src/unix/notbsd/linux/musl/b64/aarch64.rs
+3 −0 src/unix/notbsd/linux/musl/mod.rs
+352 −352 src/unix/notbsd/linux/other/b32/arm.rs
+6 −0 src/unix/notbsd/linux/other/b32/mod.rs
+369 −369 src/unix/notbsd/linux/other/b32/powerpc.rs
+268 −266 src/unix/notbsd/linux/other/b64/aarch64.rs
+14 −6 src/unix/notbsd/linux/other/b64/mod.rs
+326 −0 src/unix/notbsd/linux/other/b64/not_x32.rs
+361 −359 src/unix/notbsd/linux/other/b64/powerpc64.rs
+2 −0 src/unix/notbsd/linux/other/b64/sparc64.rs
+329 −0 src/unix/notbsd/linux/other/b64/x32.rs
+13 −331 src/unix/notbsd/linux/other/b64/x86_64.rs
+8 −6 src/unix/notbsd/linux/other/mod.rs
+325 −322 src/unix/notbsd/linux/s390x.rs
4 changes: 3 additions & 1 deletion src/libstd/sys/unix/rand.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ mod imp {
target_arch = "powerpc64",
target_arch = "s390x")))]
fn getrandom(buf: &mut [u8]) -> libc::c_long {
#[cfg(target_arch = "x86_64")]
#[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))]
const NR_GETRANDOM: libc::c_long = 0x40000000 + 318;
#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
const NR_GETRANDOM: libc::c_long = 318;
#[cfg(target_arch = "x86")]
const NR_GETRANDOM: libc::c_long = 355;
Expand Down