Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(560)

Unified Diff: gcc/gcc/varasm.c

Issue 2880018: [gcc] Misc cleanup. (Closed) Base URL: ssh://git@chromiumos-git/nacl-toolchain.git
Patch Set: ready for code review Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« gcc/gcc/config/i386/i386.md ('K') | « gcc/gcc/config/i386/i386.md ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gcc/gcc/varasm.c
diff --git a/gcc/gcc/varasm.c b/gcc/gcc/varasm.c
index 34ed51932f00caad968aa909d79f4e0e593a5e4f..751d67428ee0b2115b1e69bf6e78f73cd8b35b60 100644
--- a/gcc/gcc/varasm.c
+++ b/gcc/gcc/varasm.c
@@ -5695,7 +5695,7 @@ decl_default_tls_model (const_tree decl)
kind = TLS_MODEL_GLOBAL_DYNAMIC;
if (kind < flag_tls_default)
kind = flag_tls_default;
- if (TARGET_64BIT && flag_control_integrity)
+ if (TARGET_64BIT && TARGET_NACL)
/* NaCl currently supports a hybrid TLS model: __tls_get_addr(TPOFF) */
kind = TLS_MODEL_LOCAL_EXEC;
« gcc/gcc/config/i386/i386.md ('K') | « gcc/gcc/config/i386/i386.md ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698