Skip to content

R
riscv-gcc-1
Commit 7964957f by Andreas Schwab
Options

Remove conflict marker 

From-SVN: r211708
parent 5c3d09f7
Showing with 0 additions and 1 deletions
gcc/ChangeLog
...@@ -58,7 +58,6 @@ ...@@ -58,7 +58,6 @@
* c-family/c-common.c (handle_tls_model_attribute): Use set_decl_tls_model. * c-family/c-common.c (handle_tls_model_attribute): Use set_decl_tls_model.
* c-family/c-common.c (handle_tls_model_attribute): Use * c-family/c-common.c (handle_tls_model_attribute): Use
set_decl_tls_model. set_decl_tls_model.
>>>>>>> .r211699
* cgraph.h (struct varpool_node): Add tls_model. * cgraph.h (struct varpool_node): Add tls_model.
* tree.c (decl_tls_model, set_decl_tls_model): New functions. * tree.c (decl_tls_model, set_decl_tls_model): New functions.
* tree.h (DECL_TLS_MODEL): Update. * tree.h (DECL_TLS_MODEL): Update.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment