From 882fc5d0a3c68cbe82042b97371a409c6a288b4d Mon Sep 17 00:00:00 2001 From: Serge Rogatch Date: Mon, 5 Dec 2016 23:29:56 +0000 Subject: [PATCH] [XRay][AArch64] Attempt to fix unstable test XRay-aarch64-linux::patching-unpatching.cc Summary: Currently test XRay-aarch64-linux::patching-unpatching.cc sometimes passes, sometimes fails. This is an attempt to fix it by handling better the situations when both `__arm__` and `__aarch64__` are defined. Reviewers: dberris, rengolin Subscribers: llvm-commits, iid_iunknown, aemerson, rengolin, dberris Differential Revision: https://reviews.llvm.org/D27421 llvm-svn: 288729 --- compiler-rt/lib/xray/xray_interface.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler-rt/lib/xray/xray_interface.cc b/compiler-rt/lib/xray/xray_interface.cc index f2c8074..20a2b66 100644 --- a/compiler-rt/lib/xray/xray_interface.cc +++ b/compiler-rt/lib/xray/xray_interface.cc @@ -31,10 +31,10 @@ namespace __xray { // FIXME: The actual length is 11 bytes. Why was length 12 passed to mprotect() // ? static const int16_t cSledLength = 12; -#elif defined(__arm__) -static const int16_t cSledLength = 28; #elif defined(__aarch64__) static const int16_t cSledLength = 32; +#elif defined(__arm__) +static const int16_t cSledLength = 28; #else #error "Unsupported CPU Architecture" #endif /* CPU architecture */ -- 2.7.4