diff options
| author | Serge Rogatch <srogatch@accesssoftek.com> | 2016-12-05 23:29:56 +0000 |
|---|---|---|
| committer | Serge Rogatch <srogatch@accesssoftek.com> | 2016-12-05 23:29:56 +0000 |
| commit | 882fc5d0a3c68cbe82042b97371a409c6a288b4d (patch) | |
| tree | 42222b630ebb9c3003ff4a20b1f0e6eae9d4d1b4 /compiler-rt/lib | |
| parent | daf21c3f69f14507d12f2350592171151d480758 (diff) | |
| download | bcm5719-llvm-882fc5d0a3c68cbe82042b97371a409c6a288b4d.tar.gz bcm5719-llvm-882fc5d0a3c68cbe82042b97371a409c6a288b4d.zip | |
[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
Diffstat (limited to 'compiler-rt/lib')
| -rw-r--r-- | compiler-rt/lib/xray/xray_interface.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler-rt/lib/xray/xray_interface.cc b/compiler-rt/lib/xray/xray_interface.cc index f2c8074a578..20a2b66c440 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 */ |
