Fix aarch64 test issues (same level to arm32)
This commit is contained in:
parent
5cbdf1db9b
commit
d1e9a76326
4 changed files with 12 additions and 3 deletions
|
|
@ -5469,6 +5469,7 @@ pub mod funcs {
|
|||
use types::os::arch::c95::{c_uchar, c_int, size_t};
|
||||
|
||||
extern {
|
||||
#[cfg(not(all(target_os = "android", target_arch = "aarch64")))]
|
||||
pub fn getdtablesize() -> c_int;
|
||||
pub fn ioctl(d: c_int, request: c_int, ...) -> c_int;
|
||||
pub fn madvise(addr: *mut c_void, len: size_t, advice: c_int)
|
||||
|
|
|
|||
|
|
@ -64,7 +64,6 @@ impl Process {
|
|||
K: BytesContainer + Eq + Hash<Hasher>, V: BytesContainer
|
||||
{
|
||||
use libc::funcs::posix88::unistd::{fork, dup2, close, chdir, execvp};
|
||||
use libc::funcs::bsd44::getdtablesize;
|
||||
|
||||
mod rustrt {
|
||||
extern {
|
||||
|
|
@ -72,6 +71,15 @@ impl Process {
|
|||
}
|
||||
}
|
||||
|
||||
#[cfg(all(target_os = "android", target_arch = "aarch64"))]
|
||||
unsafe fn getdtablesize() -> c_int {
|
||||
libc::sysconf(libc::consts::os::sysconf::_SC_OPEN_MAX) as c_int
|
||||
}
|
||||
#[cfg(not(all(target_os = "android", target_arch = "aarch64")))]
|
||||
unsafe fn getdtablesize() -> c_int {
|
||||
libc::funcs::bsd44::getdtablesize()
|
||||
}
|
||||
|
||||
unsafe fn set_cloexec(fd: c_int) {
|
||||
let ret = c::ioctl(fd, c::FIOCLEX);
|
||||
assert_eq!(ret, 0);
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ mod m {
|
|||
#[cfg(target_os = "android")]
|
||||
mod m {
|
||||
#[main]
|
||||
#[cfg(target_arch = "arm")]
|
||||
#[cfg(any(target_arch = "arm", target_arch = "aarch64"))]
|
||||
pub fn main() {
|
||||
unsafe {
|
||||
assert_eq!(::rusti::pref_align_of::<u64>(), 8u);
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ mod m {
|
|||
|
||||
#[cfg(target_os = "android")]
|
||||
mod m {
|
||||
#[cfg(target_arch = "arm")]
|
||||
#[cfg(any(target_arch = "arm", target_arch = "aarch64"))]
|
||||
pub mod m {
|
||||
pub fn align() -> uint { 8u }
|
||||
pub fn size() -> uint { 16u }
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue