| 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;
|
|
|
|
|