From 4789686d67aff2b7f0ed589bd72313a45682d580 Mon Sep 17 00:00:00 2001
From: Dimitry Andric <dim@FreeBSD.org>
Date: Fri, 13 Sep 2019 21:03:43 +0000
Subject: [PATCH] Rearrange libclang_rt Makefile again, and attempt to simplify
 it.

It turns out that parts of the common sanitizer code still do not
compile for arm and aarch64, at least not on FreeBSD, so for now those
are all limited to amd64, and sometimes i386.
---
 lib/libclang_rt/Makefile | 70 +++++++++++++++++-----------------------
 1 file changed, 29 insertions(+), 41 deletions(-)

diff --git a/lib/libclang_rt/Makefile b/lib/libclang_rt/Makefile
index 1b6d03ba9904..d80c9876aee0 100644
--- a/lib/libclang_rt/Makefile
+++ b/lib/libclang_rt/Makefile
@@ -1,47 +1,35 @@
 # $FreeBSD$
 
-SUBDIR_ALL+=	include
-SUBDIR_ALL+=	profile
-SUBDIR_ALL+=	stats
-SUBDIR_ALL+=	stats_client
-SUBDIR_ALL+=	ubsan_minimal
-SUBDIR_ALL+=	ubsan_standalone
-SUBDIR_ALL+=	ubsan_standalone_cxx
+.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
+SUBDIR+=	include
+SUBDIR+=	asan
+SUBDIR+=	asan-preinit
+SUBDIR+=	asan_cxx
+SUBDIR+=	asan_dynamic
+SUBDIR+=	cfi
+SUBDIR+=	cfi_diag
+SUBDIR+=	safestack
+SUBDIR+=	stats
+SUBDIR+=	stats_client
+SUBDIR+=	ubsan_minimal
+SUBDIR+=	ubsan_standalone
+SUBDIR+=	ubsan_standalone_cxx
+.endif # amd64 || i386
 
-.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \
-    ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "i386"
-SUBDIR_ALL+=	asan
-SUBDIR_ALL+=	asan-preinit
-SUBDIR_ALL+=	asan_cxx
-SUBDIR_ALL+=	asan_dynamic
-SUBDIR_ALL+=	cfi
-SUBDIR_ALL+=	cfi_diag
-.endif # aarch64 || amd64 || arm || i386
+.if ${MACHINE_CPUARCH} == "amd64"
+SUBDIR+=	dd
+SUBDIR+=	fuzzer
+SUBDIR+=	fuzzer_no_main
+SUBDIR+=	msan
+SUBDIR+=	msan_cxx
+SUBDIR+=	tsan
+SUBDIR+=	tsan_cxx
+SUBDIR+=	xray
+SUBDIR+=	xray-basic
+SUBDIR+=	xray-fdr
+SUBDIR+=	xray-profiling
+.endif # amd64
 
-.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64"
-SUBDIR_ALL+=	dd
-SUBDIR_ALL+=	fuzzer
-SUBDIR_ALL+=	fuzzer_no_main
-SUBDIR_ALL+=	msan
-SUBDIR_ALL+=	msan_cxx
-SUBDIR_ALL+=	tsan
-SUBDIR_ALL+=	tsan_cxx
-.endif # aarch64 || amd64
-
-.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \
-    ${MACHINE_CPUARCH} == "i386"
-SUBDIR_ALL+=	safestack
-.endif # aarch64 || amd64 || i386
-
-.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \
-    ${MACHINE_CPUARCH} == "arm"
-SUBDIR_ALL+=	xray
-SUBDIR_ALL+=	xray-basic
-SUBDIR_ALL+=	xray-fdr
-SUBDIR_ALL+=	xray-profiling
-.endif # aarch64 || amd64 || arm
-
-SUBDIR+=	${SUBDIR_ALL:O}
+SUBDIR+=	profile
 
 .include <bsd.subdir.mk>
-# DO NOT DELETE