From 7124b5f6f98c0fabaa0d7654845569ceab78d3b4 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Tue, 11 Apr 2017 14:28:49 +0000 Subject: Revert r299923, it doesn't build in bootstrap builds. FAILED: lib/sanitizer_common/CMakeFiles/RTSanitizerCommon.arm.dir/sanitizer_linux.cc.o lib/sanitizer_common/sanitizer_linux.cc:1340:24: error: invalid instruction BLX(ip) ^ lib/sanitizer_common/sanitizer_linux.cc:1313:19: note: expanded from macro 'BLX' # define BLX(R) "mov lr, pc; bx" #R "\n" ^ :6:13: note: instantiated into assembly here mov lr, pc; bxip ^~~~ llvm-svn: 299943 --- compiler-rt/lib/sanitizer_common/sanitizer_linux.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'compiler-rt/lib/sanitizer_common/sanitizer_linux.h') diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_linux.h b/compiler-rt/lib/sanitizer_common/sanitizer_linux.h index 14047b4803f..bba8624a9b9 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_linux.h +++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux.h @@ -48,8 +48,7 @@ int internal_sigaction_syscall(int signum, const void *act, void *oldact); #endif void internal_sigdelset(__sanitizer_sigset_t *set, int signum); #if defined(__x86_64__) || defined(__mips__) || defined(__aarch64__) \ - || defined(__powerpc64__) || defined(__s390__) || defined(__i386__) \ - || defined(__arm__) + || defined(__powerpc64__) || defined(__s390__) || defined(__i386__) uptr internal_clone(int (*fn)(void *), void *child_stack, int flags, void *arg, int *parent_tidptr, void *newtls, int *child_tidptr); #endif -- cgit v1.2.3