Chromium Code Reviews| Index: gcc/gcc/varasm.c |
| diff --git a/gcc/gcc/varasm.c b/gcc/gcc/varasm.c |
| index 751d67428ee0b2115b1e69bf6e78f73cd8b35b60..9385b47704c255cec9130ee3478d6350a8f256d7 100644 |
| --- a/gcc/gcc/varasm.c |
| +++ b/gcc/gcc/varasm.c |
| @@ -5695,9 +5695,6 @@ decl_default_tls_model (const_tree decl) |
| kind = TLS_MODEL_GLOBAL_DYNAMIC; |
| if (kind < flag_tls_default) |
| kind = flag_tls_default; |
| - if (TARGET_64BIT && TARGET_NACL) |
| - /* NaCl currently supports a hybrid TLS model: __tls_get_addr(TPOFF) */ |
| - kind = TLS_MODEL_LOCAL_EXEC; |
| return kind; |
| } |