Skip to content

Commit 63ad129

Browse files
authored
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 #45416)
2 parents 2d53d94 + 8e96243 commit 63ad129

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/libstd/sys/unix/rand.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,9 @@ mod imp {
4949
target_arch = "powerpc64",
5050
target_arch = "s390x")))]
5151
fn getrandom(buf: &mut [u8]) -> libc::c_long {
52-
#[cfg(target_arch = "x86_64")]
52+
#[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))]
53+
const NR_GETRANDOM: libc::c_long = 0x40000000 + 318;
54+
#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
5355
const NR_GETRANDOM: libc::c_long = 318;
5456
#[cfg(target_arch = "x86")]
5557
const NR_GETRANDOM: libc::c_long = 355;

0 commit comments

Comments
 (0)