[PATCH] D61337: [hwasan] Fix HWASAN_WITH_INTERCEPTORS=OFF build on not-android.

[Evgenii Stepanov via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL359914: [hwasan] Fix HWASAN_WITH_INTERCEPTORS=OFF build on not-android. (authored by eugenis, committed by ).
Herald added a subscriber: delcypher.

Changed prior to commit:
  https://reviews.llvm.org/D61337?vs=197907&id=198052#toc

Repository:
  rL LLVM

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D61337/new/

https://reviews.llvm.org/D61337

Files:
  compiler-rt/trunk/lib/hwasan/hwasan_linux.cpp


Index: compiler-rt/trunk/lib/hwasan/hwasan_linux.cpp
===================================================================
--- compiler-rt/trunk/lib/hwasan/hwasan_linux.cpp
+++ compiler-rt/trunk/lib/hwasan/hwasan_linux.cpp
@@ -38,7 +38,17 @@
 #include "sanitizer_common/sanitizer_common.h"
 #include "sanitizer_common/sanitizer_procmaps.h"
 
-#if HWASAN_WITH_INTERCEPTORS && !SANITIZER_ANDROID
+// Configurations of HWASAN_WITH_INTERCEPTORS and SANITIZER_ANDROID.
+//
+// HWASAN_WITH_INTERCEPTORS=OFF, SANITIZER_ANDROID=OFF
+//   Not currently tested.
+// HWASAN_WITH_INTERCEPTORS=OFF, SANITIZER_ANDROID=ON
+//   Integration tests downstream exist.
+// HWASAN_WITH_INTERCEPTORS=ON, SANITIZER_ANDROID=OFF
+//    Tested with check-hwasan on x86_64-linux.
+// HWASAN_WITH_INTERCEPTORS=ON, SANITIZER_ANDROID=ON
+//    Tested with check-hwasan on aarch64-linux-android.
+#if !SANITIZER_ANDROID
 SANITIZER_INTERFACE_ATTRIBUTE
 THREADLOCAL uptr __hwasan_tls;
 #endif


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D61337.198052.patch
Type: text/x-patch
Size: 958 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190503/69a104f0/attachment.bin>