[PATCH] D68754: [sanitizers] Update linker scripts to avoid emutls issues.

[Mitch Phillips via Phabricator via llvm-commits]

hctim updated this revision to Diff 224230.
hctim added a comment.
Herald added a subscriber: srhines.

- Add test for emutls.


Repository:
  rG LLVM Github Monorepo

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

https://reviews.llvm.org/D68754

Files:
  compiler-rt/lib/asan/asan.syms.extra
  compiler-rt/lib/hwasan/hwasan.syms.extra
  compiler-rt/lib/msan/msan.syms.extra
  compiler-rt/lib/ubsan/ubsan.syms.extra
  compiler-rt/lib/ubsan_minimal/ubsan.syms.extra
  compiler-rt/test/asan/TestCases/coverage-emutls.cpp


Index: compiler-rt/test/asan/TestCases/coverage-emutls.cpp
===================================================================
--- /dev/null
+++ compiler-rt/test/asan/TestCases/coverage-emutls.cpp
@@ -0,0 +1,7 @@
+// Test that sanitizer coverage instrumentation is being exported correctly.
+// This caused a bug on Android where the TLS is emulated, and the linker script
+// rules didn't capture the change from "__sancov_lowest_stack" to
+// "__emutls_v.__sancov_lowest_stack", and didn't export the symbol.
+
+// RUN: llvm-nm %shared_libasan | FileCheck %s
+// CHECK: __sancov_lowest_stack
Index: compiler-rt/lib/ubsan_minimal/ubsan.syms.extra
===================================================================
--- compiler-rt/lib/ubsan_minimal/ubsan.syms.extra
+++ compiler-rt/lib/ubsan_minimal/ubsan.syms.extra
@@ -1 +1 @@
-__ubsan_*
+*__ubsan_*
Index: compiler-rt/lib/ubsan/ubsan.syms.extra
===================================================================
--- compiler-rt/lib/ubsan/ubsan.syms.extra
+++ compiler-rt/lib/ubsan/ubsan.syms.extra
@@ -1 +1 @@
-__ubsan_*
+*__ubsan_*
Index: compiler-rt/lib/msan/msan.syms.extra
===================================================================
--- compiler-rt/lib/msan/msan.syms.extra
+++ compiler-rt/lib/msan/msan.syms.extra
@@ -1,2 +1,3 @@
-__msan_*
-__ubsan_*
+*__msan_*
+*__ubsan_*
+*__sancov_*
Index: compiler-rt/lib/hwasan/hwasan.syms.extra
===================================================================
--- compiler-rt/lib/hwasan/hwasan.syms.extra
+++ compiler-rt/lib/hwasan/hwasan.syms.extra
@@ -1,2 +1,3 @@
-__hwasan_*
-__ubsan_*
+*__hwasan_*
+*__ubsan_*
+*__sancov_*
Index: compiler-rt/lib/asan/asan.syms.extra
===================================================================
--- compiler-rt/lib/asan/asan.syms.extra
+++ compiler-rt/lib/asan/asan.syms.extra
@@ -1,4 +1,4 @@
-__asan_*
-__lsan_*
-__ubsan_*
-__sancov_*
+*__asan_*
+*__lsan_*
+*__ubsan_*
+*__sancov_*


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D68754.224230.patch
Type: text/x-patch
Size: 1938 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20191010/048ed408/attachment.bin>