From 40edeccad6c3f70ce27a761fa00bb5afd09c13b5 Mon Sep 17 00:00:00 2001 From: Marco A L Barbosa Date: Tue, 31 Oct 2017 11:25:39 -0200 Subject: [PATCH 1/2] Bump libc to 0.2.33 --- src/liblibc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/liblibc b/src/liblibc index 7e33065ce4975..68f9959e53da6 160000 --- a/src/liblibc +++ b/src/liblibc @@ -1 +1 @@ -Subproject commit 7e33065ce49759958c0d1c04fcadef961032a943 +Subproject commit 68f9959e53da6c70bed7119cd09342859d431266 From 8e962433f989367b555ef23da5c89e2afac81560 Mon Sep 17 00:00:00 2001 From: Marco A L Barbosa Date: Tue, 31 Oct 2017 11:28:44 -0200 Subject: [PATCH 2/2] Fix NR_GETRANDOM for linux x32 --- src/libstd/sys/unix/rand.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libstd/sys/unix/rand.rs b/src/libstd/sys/unix/rand.rs index fd066c9cdbeef..e2d40742c7136 100644 --- a/src/libstd/sys/unix/rand.rs +++ b/src/libstd/sys/unix/rand.rs @@ -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;