squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Rollup merge of #45652 - malbarbo:x32-2, r=alexcrichton

Browse source 
More fixes for x86_64-unknown-linux-gnux32

This update libc (all libc testing are passing) and fixes NR_GETRANDOM.

Fix all but one run-pass test (lto-unwind.rs, see https://github.com/rust-lang/rust/issues/45416)
This commit is contained in:
kennytm 2017-11-01 13:32:18 +08:00 committed by GitHub
commit 63ad1293cc
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/liblibc

@ -1 +1 @@
Subproject commit 7e33065ce49759958c0d1c04fcadef961032a943
Subproject commit 68f9959e53da6c70bed7119cd09342859d431266

4
src/libstd/sys/unix/rand.rs
View file

@ -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;