Skip to content

R
riscv-gcc-1
Commit 5038b1e9 by Ben Elliston
Options

Remove conflict marker around 2006-05-07. 

From-SVN: r113643
parent 74be08f8
Showing with 0 additions and 2 deletions
gcc/ChangeLog
...@@ -64,7 +64,6 @@ ...@@ -64,7 +64,6 @@
* tree-ssa-structalias.c (get_constraint_for_component_ref): * tree-ssa-structalias.c (get_constraint_for_component_ref):
Do not try to find zero-sized subvars. Do not try to find zero-sized subvars.
>>>>>>> .r113631
2006-05-07 Richard Guenther <rguenther@suse.de> 2006-05-07 Richard Guenther <rguenther@suse.de>
PR tree-optimization/27136 PR tree-optimization/27136
...@@ -566,7 +565,6 @@ ...@@ -566,7 +565,6 @@
* basic-block.h (safe_insert_insn_on_edge): Removed. * basic-block.h (safe_insert_insn_on_edge): Removed.
* cfgrtl.c (mark_killed_regs, safe_insert_insn_on_edge): Removed. * cfgrtl.c (mark_killed_regs, safe_insert_insn_on_edge): Removed.
2006-04-26 David Edelsohn <edelsohn@gnu.org> 2006-04-26 David Edelsohn <edelsohn@gnu.org>
Paolo Bonzini <bonzini@gnu.org> Paolo Bonzini <bonzini@gnu.org>
......
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