File tree 3 files changed +9
-5
lines changed
3 files changed +9
-5
lines changed Original file line number Diff line number Diff line change @@ -181,21 +181,23 @@ jobs:
181
181
-DLLVM_ENABLE_PLUGINS=OFF
182
182
#-DCOMPILER_RT_BUILD_SANITIZERS=OFF # various build errors unfortunately
183
183
#-DSANITIZER_CXX_ABI=libc++
184
- #-DCOMPILER_RT_USE_BUILTINS_LIBRARY=ON
185
- #-DCOMPILER_RT_USE_LLVM_UNWINDER=ON
186
184
)
187
185
if [[ "$arch" == armv7a ]]; then
188
186
flags+=(
189
187
-DANDROID_ABI=armeabi-v7a
190
188
-DLLVM_TARGET_ARCH=ARM
191
189
-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)'
193
191
)
194
192
elif [[ "$arch" == aarch64 ]]; then
195
193
flags+=(
196
194
-DANDROID_ABI=arm64-v8a
197
195
-DLLVM_TARGET_ARCH=AArch64
198
196
-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
199
201
)
200
202
fi
201
203
fi
Original file line number Diff line number Diff line change @@ -574,7 +574,7 @@ endif()
574
574
575
575
if (ANDROID)
576
576
# 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)
578
578
endif ()
579
579
580
580
set (aarch64_SOURCES
Original file line number Diff line number Diff line change 26
26
# include < sys/prctl.h>
27
27
# include < sys/resource.h>
28
28
# 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
30
32
# include < unistd.h>
31
33
# include < unwind.h>
32
34
You can’t perform that action at this time.
0 commit comments