From 71cb2dfcbc698c2afe2b18e029b548f23b56b807 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 17 Jul 2018 23:23:54 +0000
Subject: [PATCH] Remove special cases for armeb in the build.

Differential Revision:  https://reviews.freebsd.org/D16257
---
 lib/Makefile                                | 3 +--
 lib/libclang_rt/Makefile                    | 2 +-
 share/mk/bsd.cpu.mk                         | 2 +-
 share/mk/local.meta.sys.mk                  | 2 +-
 share/mk/src.opts.mk                        | 2 +-
 targets/pseudo/clang/Makefile.depend        | 2 +-
 targets/pseudo/userland/lib/Makefile.depend | 3 +--
 7 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/lib/Makefile b/lib/Makefile
index 506675476078..0efc53b8335b 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -157,8 +157,7 @@ SUBDIR.${MK_LDNS}+=	libldns
 # built for certain architectures.
 .if ${MK_CLANG} != "no" && ${COMPILER_TYPE} == "clang" && \
     (${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \
-    (${MACHINE_CPUARCH} == "arm" && ${MACHINE_ARCH} != "armeb") || \
-    (${MACHINE_CPUARCH} == "i386"))
+    ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "i386")
 _libclang_rt=	libclang_rt
 .endif
 
diff --git a/lib/libclang_rt/Makefile b/lib/libclang_rt/Makefile
index ef8fa1ab7171..6ad465bf0f67 100644
--- a/lib/libclang_rt/Makefile
+++ b/lib/libclang_rt/Makefile
@@ -19,7 +19,7 @@ SUBDIR+=	ubsan_standalone_cxx
 .endif
 
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" || \
-    (${MACHINE_CPUARCH} == "arm" && ${MACHINE_ARCH} != "armeb")
+    ${MACHINE_CPUARCH} == "arm"
 SUBDIR+=	profile
 .endif
 
diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk
index 3ef4a0f4e69e..5d0e69458b4c 100644
--- a/share/mk/bsd.cpu.mk
+++ b/share/mk/bsd.cpu.mk
@@ -346,7 +346,7 @@ MACHINE_CPU += armv7
 . endif
 # armv6 and armv7 are a hybrid. It can use the softfp ABI, but doesn't emulate
 # floating point in the general case, so don't define softfp for it at this
-# time. arm and armeb are pure softfp, so define it for them.
+# time. arm is pure softfp, so define it for them.
 . if ${MACHINE_ARCH:Marmv[67]*} == ""
 MACHINE_CPU += softfp
 . endif
diff --git a/share/mk/local.meta.sys.mk b/share/mk/local.meta.sys.mk
index f5d44e2759a8..97eff0045786 100644
--- a/share/mk/local.meta.sys.mk
+++ b/share/mk/local.meta.sys.mk
@@ -14,7 +14,7 @@ MK_INSTALL_AS_USER= yes
 .endif
 
 # from src/Makefile (for universe)
-TARGET_ARCHES_arm?=     arm armeb armv6 armv7
+TARGET_ARCHES_arm?=     arm armv6 armv7
 TARGET_ARCHES_arm64?=   aarch64
 TARGET_ARCHES_mips?=    mipsel mips mips64el mips64 mipsn32 mipsn32el
 TARGET_ARCHES_powerpc?= powerpc powerpc64 powerpcspe
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index 898104bae803..11935a5e770c 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -321,7 +321,7 @@ __DEFAULT_YES_OPTIONS+=LLDB
 __DEFAULT_NO_OPTIONS+=LLDB
 .endif
 # LLVM lacks support for FreeBSD 64-bit atomic operations for ARMv4/ARMv5
-.if ${__T} == "arm" || ${__T} == "armeb"
+.if ${__T} == "arm"
 BROKEN_OPTIONS+=LLDB
 .endif
 # GDB in base is generally less functional than GDB in ports.  Ports GDB
diff --git a/targets/pseudo/clang/Makefile.depend b/targets/pseudo/clang/Makefile.depend
index 7065a2adc043..4d7b21cf64aa 100644
--- a/targets/pseudo/clang/Makefile.depend
+++ b/targets/pseudo/clang/Makefile.depend
@@ -28,7 +28,7 @@ DIRDEPS+= \
 .endif
 
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" || \
-    (${MACHINE_CPUARCH} == "arm" && ${MACHINE_ARCH} != "armeb")
+    ${MACHINE_CPUARCH} == "arm"
 DIRDEPS+= \
 	lib/libclang_rt/profile \
 
diff --git a/targets/pseudo/userland/lib/Makefile.depend b/targets/pseudo/userland/lib/Makefile.depend
index 381722cb059b..9f702cb53fc3 100644
--- a/targets/pseudo/userland/lib/Makefile.depend
+++ b/targets/pseudo/userland/lib/Makefile.depend
@@ -193,8 +193,7 @@ DIRDEPS = \
 
 .if ${MK_CLANG} != "no" && \
     (${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \
-    (${MACHINE_CPUARCH} == "arm" && ${MACHINE_ARCH} != "armeb") || \
-    (${MACHINE_CPUARCH} == "i386"))
+    ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "i386")
 DIRDEPS+= \
 	lib/libclang_rt/asan-preinit \
 	lib/libclang_rt/asan \