]> git.lizzy.rs Git - rust.git/commitdiff
Support AArch64 big-endian and ILP32 in compiletest
authorAmanieu d'Antras <amanieu.dantras@huawei.com>
Wed, 20 Jan 2021 17:11:21 +0000 (17:11 +0000)
committerAmanieu d'Antras <amanieu@gmail.com>
Wed, 27 Jan 2021 22:47:57 +0000 (22:47 +0000)
src/tools/compiletest/src/util.rs

index 1647df8044ccc37cb138c13499853ce43daf340b..292850bd9e277f55771afbe6e90428ac42ffd437 100644 (file)
@@ -38,6 +38,7 @@
 
 const ARCH_TABLE: &[(&str, &str)] = &[
     ("aarch64", "aarch64"),
+    ("aarch64_be", "aarch64"),
     ("amd64", "x86_64"),
     ("arm", "arm"),
     ("arm64", "aarch64"),
 ];
 
 const BIG_ENDIAN: &[&str] = &[
+    "aarch64_be",
     "armebv7r",
     "mips",
     "mips64",
@@ -160,7 +162,9 @@ pub fn matches_env(triple: &str, name: &str) -> bool {
 }
 
 pub fn get_pointer_width(triple: &str) -> &'static str {
-    if (triple.contains("64") && !triple.ends_with("gnux32")) || triple.starts_with("s390x") {
+    if (triple.contains("64") && !triple.ends_with("gnux32") && !triple.ends_with("gnu_ilp32"))
+        || triple.starts_with("s390x")
+    {
         "64bit"
     } else if triple.starts_with("avr") {
         "16bit"