OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove conflict marker

Browse Source 
From-SVN: r174267
This commit is contained in:
Eric Botcazou 2011-05-26 08:53:05 +00:00
parent 50fed7bf1a
commit 1651e70348
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gcc/ChangeLog
View File

@ -191,7 +191,6 @@
* ipa.c (function_and_variable_visibility): Only add to same
comdat group list if DECL_ONE_ONLY.
>>>>>>> .r174265
2011-05-25 Andrey Belevantsev <abel@ispras.ru>
PR rtl-optimization/49014
@ -756,7 +755,7 @@
TRUTH_AND_EXPR, TRUTH_OR_EXPR, and TRUTH_XOR_EXPR.
(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>
* config/t-sol2 (sol2.o): Add $(TARGET_H) dependency.