Revert r325443

Despite the fact that it's a working solution, it doesn't follow the design
philosophy of only doing TARGET_* in Makefile.inc1 and special locations in
the source tree.

PR:		222925
Requested by:	imp

ObsoleteFiles.inc

@@ -38,21 +38,6 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
-# 20171105: fixing lib/libclang_rt CRTARCH for arm:armv[67].
-.if ${MACHINE} == "arm"
-.if ${MACHINE_ARCH:Marmv[67]*} != "" && ${CPUTYPE:M*soft*} == ""
-OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-preinit-arm.a
-OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-arm.a
-OLD_LIBS+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-arm.so
-OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan_cxx-arm.a
-OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.profile-arm.a
-OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.safestack-arm.a
-OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.stats-arm.a
-OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.stats_client-arm.a
-OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
-OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
-.endif
-.endif
 # 20171104: libcap_random should be in /lib not in /usr/lib
 OLD_LIBS+=usr/lib/libcap_random.so.0
 # 20171104: Casper can work only as shared library

lib/libclang_rt/Makefile.inc

@@ -2,14 +2,7 @@
 
 .include <src.opts.mk>
 
-# NOTE: based on TARGET_ABI/TARGET_CPUTYPE, set in Makefile.inc1 .
-.if ${MACHINE} == "arm"
-.if ${MACHINE_ARCH:Marmv[67]*} != "" && ${CPUTYPE:M*soft*} == ""
-CRTARCH=	armhf
-.endif
-.endif
-
-CRTARCH?=	${TARGET_CPUARCH:C/amd64/x86_64/}
+CRTARCH=	${MACHINE_CPUARCH:C/amd64/x86_64/}
 CRTSRC=		${SRCTOP}/contrib/compiler-rt
 
 .PATH:		${CRTSRC}/lib

share/mk/sys.mk

@@ -15,11 +15,6 @@ unix		?=	We run FreeBSD, not UNIX.
 #
 __TO_CPUARCH=C/mips(n32|64)?(el)?(hf)?/mips/:C/arm(v[67])?(eb)?/arm/:C/powerpc(64|spe)/powerpc/:C/riscv64(sf)?/riscv/
 MACHINE_CPUARCH=${MACHINE_ARCH:${__TO_CPUARCH}}
-.ifdef TARGET_ARCH
-TARGET_CPUARCH=${TARGET_ARCH:${__TO_CPUARCH}}
-.else
-TARGET_CPUARCH=${MACHINE_CPUARCH}
-.endif
 .endif
 
 __DEFAULT_YES_OPTIONS+= \