Skip to content

R
riscv-gcc-1
Commit 1651e703 by Eric Botcazou
Options

Remove conflict marker 

From-SVN: r174267
parent 50fed7bf
Showing with 1 additions and 2 deletions
gcc/ChangeLog
...@@ -191,7 +191,6 @@ ...@@ -191,7 +191,6 @@
* ipa.c (function_and_variable_visibility): Only add to same * ipa.c (function_and_variable_visibility): Only add to same
comdat group list if DECL_ONE_ONLY. comdat group list if DECL_ONE_ONLY.
>>>>>>> .r174265
2011-05-25 Andrey Belevantsev <abel@ispras.ru> 2011-05-25 Andrey Belevantsev <abel@ispras.ru>
PR rtl-optimization/49014 PR rtl-optimization/49014
...@@ -756,7 +755,7 @@ ...@@ -756,7 +755,7 @@
TRUTH_AND_EXPR, TRUTH_OR_EXPR, and TRUTH_XOR_EXPR. TRUTH_AND_EXPR, TRUTH_OR_EXPR, and TRUTH_XOR_EXPR.
(gimplify_expr): Move TRUTH_AND|OR|XOR_EXPR to its binary form. (gimplify_expr): Move TRUTH_AND|OR|XOR_EXPR to its binary form.
2011-05-19 Anatoly Sokolov <aesok@post.ru> 2011-05-19 Anatoly Sokolov <aesok@post.ru>
Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* config/t-sol2 (sol2.o): Add $(TARGET_H) dependency. * config/t-sol2 (sol2.o): Add $(TARGET_H) dependency.
......
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