aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2024-03-21 20:44:46 +0000
committerDimitry Andric <dim@FreeBSD.org>2024-03-24 00:37:29 +0000
commit5c588a23c96b88327f87bb8ef6c795c442d56c2a (patch)
treeb55b036e6fe04146eb5ff25744f186d781f35203
parent72d9e1e0ca66ca39ca157731a65be32c63916252 (diff)
downloadsrc-5c588a23c96b88327f87bb8ef6c795c442d56c2a.tar.gz
src-5c588a23c96b88327f87bb8ef6c795c442d56c2a.zip
Slightly reorganize libclang_rt Makefile again
Make a separate .elif section for MACHINE_ARCH==powerpc, and subdivide the MACHINE_CPUARCH values under it. If at some point more sanitizer libraries become available for powerpc CPU architectures, they can be added before the "nothing for other powerpc yet" case. Similar for the MACHINE_ARCH==arm case. PR: 262706 Fixes: e77a1bb27574 MFC after: 3 days (cherry picked from commit 897a485c34464a44b768f13127d94137229eb83d)
-rw-r--r--lib/libclang_rt/Makefile12
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/libclang_rt/Makefile b/lib/libclang_rt/Makefile
index 984da3f34156..79ccd288a845 100644
--- a/lib/libclang_rt/Makefile
+++ b/lib/libclang_rt/Makefile
@@ -60,28 +60,30 @@ SUBDIR+= ${SD_TSAN}
SUBDIR+= ${SD_UBSAN}
SUBDIR+= ${SD_XRAY}
.elif ${MACHINE_CPUARCH} == "arm"
-# nothing for 32-bit arm
+# nothing for 32-bit arm yet
.elif ${MACHINE_CPUARCH} == "i386"
SUBDIR+= ${SD_ASAN}
SUBDIR+= ${SD_CFI}
SUBDIR+= ${SD_SAFESTACK}
SUBDIR+= ${SD_STATS}
SUBDIR+= ${SD_UBSAN}
-.elif ${MACHINE_ARCH} == "powerpc"
-# nothing for 32-bit powerpc
-.elif ${MACHINE_ARCH} == "powerpc64"
+.elif ${MACHINE_CPUARCH} == "powerpc"
+. if ${MACHINE_ARCH} == "powerpc64"
SUBDIR+= ${SD_ASAN}
SUBDIR+= ${SD_MSAN}
SUBDIR+= ${SD_STATS}
SUBDIR+= ${SD_TSAN}
SUBDIR+= ${SD_UBSAN}
-.elif ${MACHINE_ARCH} == "powerpc64le"
+. elif ${MACHINE_ARCH} == "powerpc64le"
SUBDIR+= ${SD_ASAN}
SUBDIR+= ${SD_MSAN}
SUBDIR+= ${SD_STATS}
SUBDIR+= ${SD_TSAN}
SUBDIR+= ${SD_UBSAN}
SUBDIR+= ${SD_XRAY}
+. else
+# nothing for other powerpc yet
+. endif
.elif ${MACHINE_CPUARCH} == "riscv"
SUBDIR+= ${SD_ASAN}
SUBDIR+= ${SD_STATS}