diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt --- a/compiler-rt/CMakeLists.txt +++ b/compiler-rt/CMakeLists.txt @@ -274,8 +274,8 @@ 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/sanitizer_common/TestCases/Linux/use_tls_test.cpp b/compiler-rt/test/sanitizer_common/TestCases/Linux/use_tls_test.cpp --- 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 #include