Date: Tue, 17 Jul 2018 23:23:54 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336437 - in head: lib lib/libclang_rt share/mk targets/pseudo/clang targets/pseudo/userland/lib Message-ID: <201807172323.w6HNNs61054798@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Tue Jul 17 23:23:54 2018 New Revision: 336437 URL: https://svnweb.freebsd.org/changeset/base/336437 Log: Remove special cases for armeb in the build. Differential Revision: https://reviews.freebsd.org/D16257 Modified: head/lib/Makefile head/lib/libclang_rt/Makefile head/share/mk/bsd.cpu.mk head/share/mk/local.meta.sys.mk head/share/mk/src.opts.mk head/targets/pseudo/clang/Makefile.depend head/targets/pseudo/userland/lib/Makefile.depend Modified: head/lib/Makefile ============================================================================== --- head/lib/Makefile Tue Jul 17 23:23:45 2018 (r336436) +++ head/lib/Makefile Tue Jul 17 23:23:54 2018 (r336437) @@ -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 Modified: head/lib/libclang_rt/Makefile ============================================================================== --- head/lib/libclang_rt/Makefile Tue Jul 17 23:23:45 2018 (r336436) +++ head/lib/libclang_rt/Makefile Tue Jul 17 23:23:54 2018 (r336437) @@ -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 Modified: head/share/mk/bsd.cpu.mk ============================================================================== --- head/share/mk/bsd.cpu.mk Tue Jul 17 23:23:45 2018 (r336436) +++ head/share/mk/bsd.cpu.mk Tue Jul 17 23:23:54 2018 (r336437) @@ -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 Modified: head/share/mk/local.meta.sys.mk ============================================================================== --- head/share/mk/local.meta.sys.mk Tue Jul 17 23:23:45 2018 (r336436) +++ head/share/mk/local.meta.sys.mk Tue Jul 17 23:23:54 2018 (r336437) @@ -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 Modified: head/share/mk/src.opts.mk ============================================================================== --- head/share/mk/src.opts.mk Tue Jul 17 23:23:45 2018 (r336436) +++ head/share/mk/src.opts.mk Tue Jul 17 23:23:54 2018 (r336437) @@ -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 Modified: head/targets/pseudo/clang/Makefile.depend ============================================================================== --- head/targets/pseudo/clang/Makefile.depend Tue Jul 17 23:23:45 2018 (r336436) +++ head/targets/pseudo/clang/Makefile.depend Tue Jul 17 23:23:54 2018 (r336437) @@ -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 \ Modified: head/targets/pseudo/userland/lib/Makefile.depend ============================================================================== --- head/targets/pseudo/userland/lib/Makefile.depend Tue Jul 17 23:23:45 2018 (r336436) +++ head/targets/pseudo/userland/lib/Makefile.depend Tue Jul 17 23:23:54 2018 (r336437) @@ -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 \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807172323.w6HNNs61054798>