diff options
| author | kennytm <kennytm@gmail.com> | 2017-11-01 13:32:18 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-01 13:32:18 +0800 |
| commit | 63ad1293cc806e941d00fc356200a6bb43621312 (patch) | |
| tree | 879fa540a0836134e1e8c81b219a41a5d1d4ef99 /src/libstd | |
| parent | 2d53d94c3b6db09d6f930f5bb23c929c96d24f95 (diff) | |
| parent | 8e962433f989367b555ef23da5c89e2afac81560 (diff) | |
| download | rust-63ad1293cc806e941d00fc356200a6bb43621312.tar.gz rust-63ad1293cc806e941d00fc356200a6bb43621312.zip | |
Rollup merge of #45652 - malbarbo:x32-2, r=alexcrichton
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)
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/sys/unix/rand.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libstd/sys/unix/rand.rs b/src/libstd/sys/unix/rand.rs index fd066c9cdbe..e2d40742c71 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; |