commit cd93b8befb1768e8110570e82b5e62ff347cd96f
author Elliott Hughes <enh@google.com> Fri Dec 08 18:08:57 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Dec 08 18:08:57 2023 +0000
tree 166bc858fa1732d213919d40abec74deb79861d2
parent b12bb437594cc4c10eaa10f483477feaf33a6b89
parent 9cf79d736f2a43e3959f19d09f340526f75cb074

Merge "Stop saying -fno-emulated-tls in tests." into main am: 9cf79d736f

Original change: https://android-review.googlesource.com/c/platform/bionic/+/2865192

Change-Id: I0728e43468aa76c195648a5d3c9017ff2ee32d0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index 14b4e3e..4534241 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -583,12 +583,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.
@@ -613,12 +612,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 5d143f8..0f8d22b 100644
--- a/tests/libs/Android.bp
+++ b/tests/libs/Android.bp
@@ -54,14 +54,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"],
 }
 
@@ -69,7 +67,6 @@
     name: "libtest_elftls_tprel",
     defaults: ["bionic_testlib_defaults"],
     srcs: ["elftls_tprel.cpp"],
-    cflags: ["-fno-emulated-tls"],
 }
 
 cc_test {
@@ -83,7 +80,6 @@
     name: "libtest_elftls_dynamic",
     defaults: ["bionic_testlib_defaults"],
     srcs: ["elftls_dynamic.cpp"],
-    cflags: ["-fno-emulated-tls"],
     shared_libs: ["libtest_elftls_shared_var"],
 }
 
@@ -91,14 +87,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"],
 }
 
@@ -108,7 +102,6 @@
     defaults: ["bionic_testlib_defaults"],
     srcs: ["elftls_dynamic_filler.cpp"],
     cflags: [
-        "-fno-emulated-tls",
         "-DTLS_FILLER=100",
     ],
 }
@@ -118,7 +111,6 @@
     defaults: ["bionic_testlib_defaults"],
     srcs: ["elftls_dynamic_filler.cpp"],
     cflags: [
-        "-fno-emulated-tls",
         "-DTLS_FILLER=200",
     ],
 }
@@ -128,7 +120,6 @@
     defaults: ["bionic_testlib_defaults"],
     srcs: ["elftls_dynamic_filler.cpp"],
     cflags: [
-        "-fno-emulated-tls",
         "-DTLS_FILLER=300",
     ],
 }