From 25f2e4167b0be7221023ad7876129c81eda52b48 Mon Sep 17 00:00:00 2001
From: Taiki Endo <te316e89@gmail.com>
Date: Mon, 10 Jul 2023 21:59:24 +0900
Subject: [PATCH] ci: Test armeb-unknown-linux-gnueabi

---
 .github/workflows/ci.yml |  2 ++
 src/arch/armv8.rs        |  2 +-
 src/arch/mod.rs          | 26 ++++++++++----------------
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0a5d39f7..aa0fd7b8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -91,6 +91,8 @@ jobs:
             target: armv7-unknown-linux-gnueabihf
           - rust: nightly
             target: armv7-unknown-linux-gnueabihf
+          - rust: nightly
+            target: armeb-unknown-linux-gnueabi
           - rust: '1.59'
             target: i586-unknown-linux-gnu
           - rust: stable
diff --git a/src/arch/armv8.rs b/src/arch/armv8.rs
index 1d24088e..8a4345d0 100644
--- a/src/arch/armv8.rs
+++ b/src/arch/armv8.rs
@@ -1,4 +1,4 @@
-// ARMv8 AArch32 (little endian)
+// ARMv8 AArch32
 //
 // LLVM doesn't generate CLREX for ARMv8-M Baseline, but it actually supports CLREX.
 // https://developer.arm.com/documentation/dui1095/a/The-Cortex-M23-Instruction-Set/Memory-access-instructions?lang=en
diff --git a/src/arch/mod.rs b/src/arch/mod.rs
index c5c36a69..cbd3005c 100644
--- a/src/arch/mod.rs
+++ b/src/arch/mod.rs
@@ -31,26 +31,20 @@ mod aarch64;
 #[cfg(target_arch = "arm")]
 #[cfg(all(
     any(target_feature = "v6", atomic_maybe_uninit_target_feature = "v6"),
-    not(all(
-        any(
-            target_feature = "v8",
-            atomic_maybe_uninit_target_feature = "v8",
-            target_feature = "v8m",
-            atomic_maybe_uninit_target_feature = "v8m",
-        ),
-        target_endian = "little",
-    )),
-))]
-mod arm;
-#[cfg(target_arch = "arm")]
-#[cfg(all(
-    any(
+    not(any(
         target_feature = "v8",
         atomic_maybe_uninit_target_feature = "v8",
         target_feature = "v8m",
         atomic_maybe_uninit_target_feature = "v8m",
-    ),
-    target_endian = "little",
+    )),
+))]
+mod arm;
+#[cfg(target_arch = "arm")]
+#[cfg(any(
+    target_feature = "v8",
+    atomic_maybe_uninit_target_feature = "v8",
+    target_feature = "v8m",
+    atomic_maybe_uninit_target_feature = "v8m",
 ))]
 mod armv8;
 #[cfg(any(target_arch = "mips", target_arch = "mips64"))]