diff --git a/.github/workflows/bors.yml b/.github/workflows/bors.yml index 7af9f60eed583..77f236c033e07 100644 --- a/.github/workflows/bors.yml +++ b/.github/workflows/bors.yml @@ -125,9 +125,7 @@ jobs: max-parallel: 12 matrix: target: [ - # FIXME: Mysterious failures in CI, see - # https://github.com/rust-lang/libc/issues/2081 - # aarch64-linux-android, + aarch64-linux-android, aarch64-unknown-linux-gnu, aarch64-unknown-linux-musl, arm-linux-androideabi, diff --git a/libc-test/build.rs b/libc-test/build.rs index 0b912c94d1b4b..6fbaa5b6b1f63 100644 --- a/libc-test/build.rs +++ b/libc-test/build.rs @@ -1545,6 +1545,7 @@ fn test_android(target: &str) { t => panic!("unsupported target: {}", t), }; let x86 = target.contains("i686") || target.contains("x86_64"); + let aarch64 = target.contains("aarch64"); let mut cfg = ctest_cfg(); cfg.define("_GNU_SOURCE", None); @@ -1880,6 +1881,12 @@ fn test_android(target: &str) { | "SW_MAX" | "SW_CNT" => true, + // FIXME: aarch64 env cannot find it: + | "PTRACE_GETREGS" + | "PTRACE_SETREGS" if aarch64 => true, + // FIXME: The value has been changed on r26b: + | "SYS_syscalls" if aarch64 => true, + _ => false, } });