d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove special cases for armeb in the build.

Browse Source 
Differential Revision:  https://reviews.freebsd.org/D16257
This commit is contained in:
Warner Losh 2018-07-17 23:23:54 +00:00
parent ff9452772d
commit 71cb2dfcbc
7 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Makefile
View File

@ -157,8 +157,7 @@ SUBDIR.${MK_LDNS}+= libldns
# built for certain architectures. # built for certain architectures.
.if ${MK_CLANG} != "no" && ${COMPILER_TYPE} == "clang" && \ .if ${MK_CLANG} != "no" && ${COMPILER_TYPE} == "clang" && \
(${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \ (${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \
(${MACHINE_CPUARCH} == "arm" && ${MACHINE_ARCH} != "armeb") || \ ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "i386")
(${MACHINE_CPUARCH} == "i386"))
_libclang_rt= libclang_rt _libclang_rt= libclang_rt
.endif .endif

2
lib/libclang_rt/Makefile
View File

@ -19,7 +19,7 @@ SUBDIR+= ubsan_standalone_cxx
.endif .endif
.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" || \ .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" || \
(${MACHINE_CPUARCH} == "arm" && ${MACHINE_ARCH} != "armeb") ${MACHINE_CPUARCH} == "arm"
SUBDIR+= profile SUBDIR+= profile
.endif .endif

2
share/mk/bsd.cpu.mk
View File

@ -346,7 +346,7 @@ MACHINE_CPU += armv7
. endif . endif
# armv6 and armv7 are a hybrid. It can use the softfp ABI, but doesn't emulate # 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 # 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]*} == "" . if ${MACHINE_ARCH:Marmv[67]*} == ""
MACHINE_CPU += softfp MACHINE_CPU += softfp
. endif . endif

2
share/mk/local.meta.sys.mk
View File

@ -14,7 +14,7 @@ MK_INSTALL_AS_USER= yes
.endif .endif
# from src/Makefile (for universe) # from src/Makefile (for universe)
TARGET_ARCHES_arm?= arm armeb armv6 armv7 TARGET_ARCHES_arm?= arm armv6 armv7
TARGET_ARCHES_arm64?= aarch64 TARGET_ARCHES_arm64?= aarch64
TARGET_ARCHES_mips?= mipsel mips mips64el mips64 mipsn32 mipsn32el TARGET_ARCHES_mips?= mipsel mips mips64el mips64 mipsn32 mipsn32el
TARGET_ARCHES_powerpc?= powerpc powerpc64 powerpcspe TARGET_ARCHES_powerpc?= powerpc powerpc64 powerpcspe

2
share/mk/src.opts.mk
View File

@ -321,7 +321,7 @@ __DEFAULT_YES_OPTIONS+=LLDB
__DEFAULT_NO_OPTIONS+=LLDB __DEFAULT_NO_OPTIONS+=LLDB
.endif .endif
# LLVM lacks support for FreeBSD 64-bit atomic operations for ARMv4/ARMv5 # LLVM lacks support for FreeBSD 64-bit atomic operations for ARMv4/ARMv5
.if ${__T} == "arm" || ${__T} == "armeb" .if ${__T} == "arm"
BROKEN_OPTIONS+=LLDB BROKEN_OPTIONS+=LLDB
.endif .endif
# GDB in base is generally less functional than GDB in ports. Ports GDB # GDB in base is generally less functional than GDB in ports. Ports GDB

2
targets/pseudo/clang/Makefile.depend
View File

@ -28,7 +28,7 @@ DIRDEPS+= \
.endif .endif
.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" || \ .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" || \
(${MACHINE_CPUARCH} == "arm" && ${MACHINE_ARCH} != "armeb") ${MACHINE_CPUARCH} == "arm"
DIRDEPS+= \ DIRDEPS+= \
lib/libclang_rt/profile \ lib/libclang_rt/profile \

3
targets/pseudo/userland/lib/Makefile.depend
View File

@ -193,8 +193,7 @@ DIRDEPS = \
.if ${MK_CLANG} != "no" && \ .if ${MK_CLANG} != "no" && \
(${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \ (${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \
(${MACHINE_CPUARCH} == "arm" && ${MACHINE_ARCH} != "armeb") || \ ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "i386")
(${MACHINE_CPUARCH} == "i386"))
DIRDEPS+= \ DIRDEPS+= \
lib/libclang_rt/asan-preinit \ lib/libclang_rt/asan-preinit \
lib/libclang_rt/asan \ lib/libclang_rt/asan \