[compiler-rt] b834d63 - [sanitizer] Android ELF TLS is supported from Q (API 29)

[Ryan Prichard via llvm-commits]

Author: Ryan Prichard
Date: 2021-05-27T14:53:49-07:00
New Revision: b834d6309455e340d6f5dcb8b8de885da5cf25a0

URL: https://github.com/llvm/llvm-project/commit/b834d6309455e340d6f5dcb8b8de885da5cf25a0
DIFF: https://github.com/llvm/llvm-project/commit/b834d6309455e340d6f5dcb8b8de885da5cf25a0.diff

LOG: [sanitizer] Android ELF TLS is supported from Q (API 29)

Reviewed By: oontvoo, MaskRay

Differential Revision: https://reviews.llvm.org/D103214

Added: 
    

Modified: 
    compiler-rt/CMakeLists.txt
    compiler-rt/test/lit.common.cfg.py
    compiler-rt/test/sanitizer_common/TestCases/Linux/use_tls_test.cpp

Removed: 
    


################################################################################
diff  --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt
index c9939acfd7100..aa4905edb640b 100644
--- a/compiler-rt/CMakeLists.txt
+++ b/compiler-rt/CMakeLists.txt
@@ -274,8 +274,8 @@ if(NOT COMPILER_RT_HAS_FUNC_SYMBOL)
   add_definitions(-D__func__=__FUNCTION__)
 endif()
 
-# Provide some common commmandline flags for Sanitizer runtimes.
-if("${ANDROID_API_LEVEL}" GREATER_EQUAL 28)
+# Provide some common commandline flags for Sanitizer runtimes.
+if("${ANDROID_API_LEVEL}" GREATER_EQUAL 29)
   list(APPEND SANITIZER_COMMON_CFLAGS -fno-emulated-tls)
   string(APPEND COMPILER_RT_TEST_COMPILER_CFLAGS " -fno-emulated-tls")
 endif()

diff  --git a/compiler-rt/test/lit.common.cfg.py b/compiler-rt/test/lit.common.cfg.py
index 12e2b220ad37a..75dc77e221733 100644
--- a/compiler-rt/test/lit.common.cfg.py
+++ b/compiler-rt/test/lit.common.cfg.py
@@ -463,7 +463,7 @@ def get_macos_aligned_version(macos_vers):
   except ValueError:
     lit_config.fatal("Failed to read ro.build.version.sdk (using '%s' as adb): got '%s'" % (adb, android_api_level_str))
   android_api_level = min(android_api_level, int(config.android_api_level))
-  for required in [26, 28, 30]:
+  for required in [26, 28, 29, 30]:
     if android_api_level >= required:
       config.available_features.add('android-%s' % required)
   # FIXME: Replace with appropriate version when availible.

diff  --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/use_tls_test.cpp b/compiler-rt/test/sanitizer_common/TestCases/Linux/use_tls_test.cpp
index 202030e3aa5bf..4cbdb77a19f5c 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Linux/use_tls_test.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/use_tls_test.cpp
@@ -1,7 +1,7 @@
 // Test that executable with ELF-TLS will link/run successfully
 // RUN: %clangxx -fno-emulated-tls %s -o %t
 // RUN: %run %t 2>&1
-// REQUIRES: android-28
+// REQUIRES: android-29
 
 #include <stdio.h>
 #include <stdlib.h>