aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrooks Davis <brooks@FreeBSD.org>2022-09-21 21:03:01 +0000
committerBrooks Davis <brooks@FreeBSD.org>2022-09-21 21:03:01 +0000
commit70ba510bcb2ac63503c258e2a946456e76dd25b1 (patch)
tree5d8531a9427df369130fac72584fcc5a62a51c93
parent862f4564bd018bc741560cf3dbc77db29043a265 (diff)
downloadports-70ba510bcb2ac63503c258e2a946456e76dd25b1.tar.gz
ports-70ba510bcb2ac63503c258e2a946456e76dd25b1.zip
devel/llvm-devel: enable COMPILER_RT on aarch64
-rw-r--r--devel/llvm-devel/Makefile13
-rw-r--r--devel/llvm-devel/Makefile.RUNTIMES42
2 files changed, 51 insertions, 4 deletions
diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index e9ae8881b277..80bba0580429 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -1,6 +1,6 @@
PORTNAME= llvm
PORTVERSION= ${LLVM_MAJOR}.0.d${SNAPDATE}
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= ${LLVM_SUFFIX}
@@ -82,7 +82,7 @@ GH_TAGNAME= ${LLVM_PROJECT_COMMIT}
OPTIONS_DEFINE= CLANG DOCS LLD STATIC_LIBS
OPTIONS_DEFAULT= CLANG LLD
.if !${FLAVOR:Mlite}
-OPTIONS_DEFINE_aarch64= OPENMP
+OPTIONS_DEFINE_aarch64= COMPILER_RT OPENMP
OPTIONS_DEFINE+= EXTRAS FLANG LIT LLDB MLIR
OPTIONS_DEFINE_amd64= COMPILER_RT GOLD OPENMP
OPTIONS_DEFINE_i386= COMPILER_RT
@@ -91,7 +91,7 @@ OPTIONS_DEFINE_powerpc64= COMPILER_RT GOLD OPENMP
OPTIONS_DEFINE_powerpc64le= COMPILER_RT GOLD OPENMP
OPTIONS_DEFINE_riscv64= COMPILER_RT OPENMP
OPTIONS_DEFAULT+= EXTRAS FLANG LIT LLDB STATIC_LIBS
-OPTIONS_DEFAULT_aarch64= OPENMP
+OPTIONS_DEFAULT_aarch64= COMPILER_RT OPENMP
OPTIONS_DEFAULT_amd64= COMPILER_RT GOLD OPENMP
OPTIONS_DEFAULT_i386= COMPILER_RT
OPTIONS_DEFAULT_powerpc= COMPILER_RT GOLD
@@ -304,7 +304,12 @@ CMAKE_BUILD_TYPE= RelWithDebInfo
STRIP=
.endif
-.if ${ARCH} == "amd64"
+.if ${ARCH} == "aarch64"
+COMPILER_RT_ARCHS= aarch64
+COMPILER_RT_IGNORELISTS= asan_ignorelist.txt
+COMPILER_RT_IGNORELISTS+= cfi_ignorelist.txt
+COMPILER_RT_IGNORELISTS+= msan_ignorelist.txt
+.elif ${ARCH} == "amd64"
COMPILER_RT_ARCHS= x86_64
COMPILER_RT_IGNORELISTS= asan_ignorelist.txt
COMPILER_RT_IGNORELISTS+= cfi_ignorelist.txt
diff --git a/devel/llvm-devel/Makefile.RUNTIMES b/devel/llvm-devel/Makefile.RUNTIMES
index fb5360dd6f1c..ec7bf937f294 100644
--- a/devel/llvm-devel/Makefile.RUNTIMES
+++ b/devel/llvm-devel/Makefile.RUNTIMES
@@ -7,6 +7,48 @@
RT_ARCHES=
+RT_ARCHES+=aarch64
+LIBCLANG_RT_LIBS_aarch64= \
+ asan-preinit.a \
+ asan.a \
+ asan.a.syms \
+ asan.so \
+ asan_cxx.a \
+ asan_cxx.a.syms \
+ asan_static.a \
+ builtins.a \
+ cfi.a \
+ cfi_diag.a \
+ fuzzer.a \
+ fuzzer_interceptors.a \
+ fuzzer_no_main.a \
+ msan.a \
+ msan.a.syms \
+ msan_cxx.a \
+ msan_cxx.a.syms \
+ profile.a \
+ safestack.a \
+ stats.a \
+ stats_client.a \
+ tsan.a \
+ tsan.a.syms \
+ tsan.so \
+ tsan_cxx.a \
+ tsan_cxx.a.syms \
+ ubsan_minimal.a \
+ ubsan_minimal.a.syms \
+ ubsan_minimal.so \
+ ubsan_standalone.a \
+ ubsan_standalone.a.syms \
+ ubsan_standalone.so \
+ ubsan_standalone_cxx.a \
+ ubsan_standalone_cxx.a.syms \
+ xray-basic.a \
+ xray-fdr.a \
+ xray-profiling.a \
+ xray.a
+RT_LIBS_aarch64= liborc_rt.a
+
RT_ARCHES+=i386
LIBCLANG_RT_LIBS_i386= \
asan.a \