Skip to content

Commit 2dd3478

Browse files
committed
test
1 parent 14e6ea7 commit 2dd3478

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

.github/workflows/ldc-release.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -181,21 +181,23 @@ jobs:
181181
-DLLVM_ENABLE_PLUGINS=OFF
182182
#-DCOMPILER_RT_BUILD_SANITIZERS=OFF # various build errors unfortunately
183183
#-DSANITIZER_CXX_ABI=libc++
184-
#-DCOMPILER_RT_USE_BUILTINS_LIBRARY=ON
185-
#-DCOMPILER_RT_USE_LLVM_UNWINDER=ON
186184
)
187185
if [[ "$arch" == armv7a ]]; then
188186
flags+=(
189187
-DANDROID_ABI=armeabi-v7a
190188
-DLLVM_TARGET_ARCH=ARM
191189
-DLLVM_DEFAULT_TARGET_TRIPLE=armv7a-none-linux-androideabi29
192-
#-DCOMPILER_RT_BUILD_MEMPROF=OFF # compile error for libinterception
190+
-DCOMPILER_RT_BUILD_MEMPROF=OFF # compiler-rt/lib/interception/interception_type_test.cpp:45:16: error: static assertion failed due to requirement 'sizeof(unsigned int) == sizeof(long long)'
193191
)
194192
elif [[ "$arch" == aarch64 ]]; then
195193
flags+=(
196194
-DANDROID_ABI=arm64-v8a
197195
-DLLVM_TARGET_ARCH=AArch64
198196
-DLLVM_DEFAULT_TARGET_TRIPLE=aarch64-none-linux-android29
197+
# work around undefined symbols when linking shared asan/tsan/ubsan libraries:
198+
-DCOMPILER_RT_USE_BUILTINS_LIBRARY=ON
199+
-DCOMPILER_RT_USE_ATOMIC_LIBRARY=ON
200+
-DCOMPILER_RT_USE_LLVM_UNWINDER=ON
199201
)
200202
fi
201203
fi

compiler-rt/lib/builtins/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ endif()
574574

575575
if (ANDROID)
576576
# FIXME: clear_cache.c:87:20: error: write to reserved register 'R7'
577-
#list(REMOVE_ITEM arm_SOURCES clear_cache.c)
577+
list(REMOVE_ITEM arm_SOURCES clear_cache.c)
578578
endif()
579579

580580
set(aarch64_SOURCES

compiler-rt/lib/hwasan/hwasan_linux.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@
2626
# include <sys/prctl.h>
2727
# include <sys/resource.h>
2828
# include <sys/time.h>
29-
# include <limits.h> // for SSIZE_MAX on Android, required by unistd.h
29+
# if SANITIZER_ANDROID
30+
# include <limits.h> // for SSIZE_MAX, required by unistd.h
31+
# endif
3032
# include <unistd.h>
3133
# include <unwind.h>
3234

0 commit comments

Comments
 (0)