commit c7cc6d5902ecd2052d61020eae7e8f594d832738
author Elliott Hughes <enh@google.com> Thu Dec 07 16:27:08 2023 -0800
committer Elliott Hughes <enh@google.com> Thu Dec 07 16:27:08 2023 -0800
tree a7d5564787e188f3ef1530f64107d838f5e40a82
parent b49314108df619faf17f2a4706518c934e4b77d0

Stop saying -fno-emulated-tls in tests.

This is now the default.

I've left the fuzzer workaround in for now, but we can come back and see
whether the fuzzer library has actually switched.

Test: treehugger
Change-Id: Ia3a09738396bfe915ceabec4a6019f4cedb0f39c

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index 3aea968..8f84564 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -667,12 +667,11 @@
     shared: {
         enabled: false,
     },
-    cflags: [
-        "-fno-emulated-tls",
-    ],
+    // TODO: still needed?
     // With fuzzer builds, compiler instrumentation generates a reference to the
     // __sancov_lowest_stack variable, which (for now) is defined by the fuzzer
-    // library as an emutls symbol. The -fno-emulated-tls flag above configures
+    // library as an emutls symbol.
+    // The -fno-emulated-tls flag that used to be here configured
     // the compiler to reference an ordinary ELF TLS __sancov_lowest_stack
     // symbol instead, which isn't defined. Disable the fuzzer for this test
     // until the platform is switched to ELF TLS.
@@ -697,12 +696,11 @@
     shared: {
         enabled: false,
     },
-    cflags: [
-        "-fno-emulated-tls",
-    ],
+    // TODO: still needed?
     // With fuzzer builds, compiler instrumentation generates a reference to the
     // __sancov_lowest_stack variable, which (for now) is defined by the fuzzer
-    // library as an emutls symbol. The -fno-emulated-tls flag above configures
+    // library as an emutls symbol.
+    // The -fno-emulated-tls flag that used to be here configured
     // the compiler to reference an ordinary ELF TLS __sancov_lowest_stack
     // symbol instead, which isn't defined. Disable the fuzzer for this test
     // until the platform is switched to ELF TLS.

tests/libs/Android.bp

diff --git a/tests/libs/Android.bp b/tests/libs/Android.bp
index 51f5ac6..26bc224 100644
--- a/tests/libs/Android.bp
+++ b/tests/libs/Android.bp
@@ -53,14 +53,12 @@
     name: "libtest_elftls_shared_var",
     defaults: ["bionic_testlib_defaults"],
     srcs: ["elftls_shared_var.cpp"],
-    cflags: ["-fno-emulated-tls"],
 }
 
 cc_test_library {
     name: "libtest_elftls_shared_var_ie",
     defaults: ["bionic_testlib_defaults"],
     srcs: ["elftls_shared_var_ie.cpp"],
-    cflags: ["-fno-emulated-tls"],
     shared_libs: ["libtest_elftls_shared_var"],
 }
 
@@ -68,7 +66,6 @@
     name: "libtest_elftls_tprel",
     defaults: ["bionic_testlib_defaults"],
     srcs: ["elftls_tprel.cpp"],
-    cflags: ["-fno-emulated-tls"],
 }
 
 cc_test {
@@ -82,7 +79,6 @@
     name: "libtest_elftls_dynamic",
     defaults: ["bionic_testlib_defaults"],
     srcs: ["elftls_dynamic.cpp"],
-    cflags: ["-fno-emulated-tls"],
     shared_libs: ["libtest_elftls_shared_var"],
 }
 
@@ -90,14 +86,12 @@
    name: "thread_exit_cb_helper",
    defaults: ["bionic_testlib_defaults"],
    srcs: ["thread_exit_cb_helper.cpp"],
-   cflags: ["-fno-emulated-tls"],
 }
 
 cc_test {
    name: "tls_properties_helper",
    defaults: ["bionic_testlib_defaults"],
    srcs: ["tls_properties_helper.cpp"],
-   cflags: ["-fno-emulated-tls"],
    shared_libs: ["libtest_elftls_shared_var"],
 }
 
@@ -107,7 +101,6 @@
     defaults: ["bionic_testlib_defaults"],
     srcs: ["elftls_dynamic_filler.cpp"],
     cflags: [
-        "-fno-emulated-tls",
         "-DTLS_FILLER=100",
     ],
 }
@@ -117,7 +110,6 @@
     defaults: ["bionic_testlib_defaults"],
     srcs: ["elftls_dynamic_filler.cpp"],
     cflags: [
-        "-fno-emulated-tls",
         "-DTLS_FILLER=200",
     ],
 }
@@ -127,7 +119,6 @@
     defaults: ["bionic_testlib_defaults"],
     srcs: ["elftls_dynamic_filler.cpp"],
     cflags: [
-        "-fno-emulated-tls",
         "-DTLS_FILLER=300",
     ],
 }