summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2023-12-11 15:22:53 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-12-11 15:22:53 +0000
commit9e2b34364c8c8a7353748459a629d2e921d8f0d9 (patch)
tree8ff5d37dc8ae9443de95cdad43d61b139d50a8e3
parent654fc765decf3a3388930656d47c40893e0d0a73 (diff)
parent5173bc3076ee15eb5e5fa87ed760d0f2236c0f9f (diff)
downloadscudo-9e2b34364c8c8a7353748459a629d2e921d8f0d9.tar.gz
Merge "Remove explicit -fno-emulated-tls." into main am: 5173bc3076
Original change: https://android-review.googlesource.com/c/platform/external/scudo/+/2866654 Change-Id: Id415a961eb767315ae78c8f62fd4fcd6cd387635 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
1 files changed, 0 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp
index 4f24fcffcac..3711973c88e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -105,7 +105,6 @@ cc_defaults {
"-fno-rtti",
// This option speeds up alloc/free code paths by about 5% to 7%.
"-fno-stack-protector",
- "-fno-emulated-tls",
"-Wall",
"-Wextra",
@@ -223,7 +222,6 @@ cc_defaults {
"external/scudo/standalone/include",
],
cflags: [
- "-fno-emulated-tls",
"-Wconversion",
// In memtag_test.cpp, some tests are disabled by GTEST_SKIP() so that
// they won't be run. However, for those disabled tests, it may contain