Skip to content

Commit dfe8930

Browse files
committed
Fix aarch64 test issues (same level to arm32)
1 parent 3e28bc1 commit dfe8930

File tree

4 files changed

+4
-6
lines changed

4 files changed

+4
-6
lines changed

src/liblibc/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4826,7 +4826,6 @@ pub mod funcs {
48264826
mibp: *mut c_int,
48274827
sizep: *mut size_t)
48284828
-> c_int;
4829-
pub fn getdtablesize() -> c_int;
48304829
pub fn madvise(addr: *mut c_void, len: size_t, advice: c_int)
48314830
-> c_int;
48324831
pub fn mincore(addr: *mut c_void, len: size_t, vec: *mut c_uchar)
@@ -4841,7 +4840,6 @@ pub mod funcs {
48414840
use types::os::arch::c95::{c_uchar, c_int, size_t};
48424841

48434842
extern {
4844-
pub fn getdtablesize() -> c_int;
48454843
pub fn ioctl(d: c_int, request: c_int, ...) -> c_int;
48464844
pub fn madvise(addr: *mut c_void, len: size_t, advice: c_int)
48474845
-> c_int;

src/libstd/sys/unix/process.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ 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 {
@@ -224,7 +223,8 @@ impl Process {
224223
if !setup(err_fd, libc::STDERR_FILENO) { fail(&mut output) }
225224

226225
// close all other fds
227-
for fd in range(3, getdtablesize()).rev() {
226+
let open_max = libc::sysconf(libc::consts::os::sysconf::_SC_OPEN_MAX);
227+
for fd in range(3, open_max as c_int).rev() {
228228
if fd != output.fd() {
229229
let _ = close(fd as c_int);
230230
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ mod m {
6565
#[cfg(target_os = "android")]
6666
mod m {
6767
#[main]
68-
#[cfg(target_arch = "arm")]
68+
#[cfg(any(target_arch = "arm", target_arch = "aarch64"))]
6969
pub fn main() {
7070
unsafe {
7171
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
@@ -71,7 +71,7 @@ mod m {
7171

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

0 commit comments

Comments
 (0)