Skip to content

Commit d1e9a76

Browse files
committed
Fix aarch64 test issues (same level to arm32)
1 parent 5cbdf1d commit d1e9a76

File tree

4 files changed

+12
-3
lines changed

4 files changed

+12
-3
lines changed

src/liblibc/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5469,6 +5469,7 @@ pub mod funcs {
54695469
use types::os::arch::c95::{c_uchar, c_int, size_t};
54705470

54715471
extern {
5472+
#[cfg(not(all(target_os = "android", target_arch = "aarch64")))]
54725473
pub fn getdtablesize() -> c_int;
54735474
pub fn ioctl(d: c_int, request: c_int, ...) -> c_int;
54745475
pub fn madvise(addr: *mut c_void, len: size_t, advice: c_int)

src/libstd/sys/unix/process.rs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,22 @@ impl Process {
6464
K: BytesContainer + Eq + Hash<Hasher>, V: BytesContainer
6565
{
6666
use libc::funcs::posix88::unistd::{fork, dup2, close, chdir, execvp};
67-
use libc::funcs::bsd44::getdtablesize;
6867

6968
mod rustrt {
7069
extern {
7170
pub fn rust_unset_sigprocmask();
7271
}
7372
}
7473

74+
#[cfg(all(target_os = "android", target_arch = "aarch64"))]
75+
unsafe fn getdtablesize() -> c_int {
76+
libc::sysconf(libc::consts::os::sysconf::_SC_OPEN_MAX) as c_int
77+
}
78+
#[cfg(not(all(target_os = "android", target_arch = "aarch64")))]
79+
unsafe fn getdtablesize() -> c_int {
80+
libc::funcs::bsd44::getdtablesize()
81+
}
82+
7583
unsafe fn set_cloexec(fd: c_int) {
7684
let ret = c::ioctl(fd, c::FIOCLEX);
7785
assert_eq!(ret, 0);

src/test/run-pass/intrinsic-alignment.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ mod m {
6666
#[cfg(target_os = "android")]
6767
mod m {
6868
#[main]
69-
#[cfg(target_arch = "arm")]
69+
#[cfg(any(target_arch = "arm", target_arch = "aarch64"))]
7070
pub fn main() {
7171
unsafe {
7272
assert_eq!(::rusti::pref_align_of::<u64>(), 8u);

src/test/run-pass/rec-align-u64.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ mod m {
7272

7373
#[cfg(target_os = "android")]
7474
mod m {
75-
#[cfg(target_arch = "arm")]
75+
#[cfg(any(target_arch = "arm", target_arch = "aarch64"))]
7676
pub mod m {
7777
pub fn align() -> uint { 8u }
7878
pub fn size() -> uint { 16u }

0 commit comments

Comments
 (0)