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-21 20:44:46 +0000
commit897a485c34464a44b768f13127d94137229eb83d (patch)
tree0387751253cb562cd1fbea90584d3dec7324a0d9
parent4ea295aba2b6472f86d5f668371d9b4c89d2b462 (diff)
downloadsrc-897a485c34464a44b768f13127d94137229eb83d.tar.gz
src-897a485c34464a44b768f13127d94137229eb83d.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
-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}