From a08ae8487c843d3a4ce8ad00adbca6af5c91a5be Mon Sep 17 00:00:00 2001 From: Alex Light Date: Wed, 31 Oct 2018 11:18:22 -0700 Subject: [PATCH] Remove -fno-emulated-tls from linux_bionic This was preventing tools using 'thread_local' from compiling and is not needed. Bionic fully implements TLS. Test: cd tools/dexter/slicer; mma Bug: 31559095 Change-Id: Ib362ad8bc950726080356b61ccae83f155ce040b --- cc/config/x86_linux_bionic_host.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cc/config/x86_linux_bionic_host.go b/cc/config/x86_linux_bionic_host.go index 5fb88e66e..fb1cdebe4 100644 --- a/cc/config/x86_linux_bionic_host.go +++ b/cc/config/x86_linux_bionic_host.go @@ -124,7 +124,7 @@ func (t *toolchainLinuxBionic) ClangLldflags() string { func (t *toolchainLinuxBionic) ToolchainClangCflags() string { return "-m64 -march=x86-64" + // TODO: We're not really android, but we don't have a triple yet b/31393676 - " -U__ANDROID__ -fno-emulated-tls" + " -U__ANDROID__" } func (t *toolchainLinuxBionic) ToolchainClangLdflags() string {