Skip to content

R
riscv-gcc-1
Commit 811d7e77 by Jason Merrill
Options

fix conflict markers 

From-SVN: r82926
parent 23a60a04
Showing with 0 additions and 14 deletions
gcc/ChangeLog
......@@ -204,10 +204,6 @@
(ia64_gimplify_va_arg): New fn.
* config/rs6000/rs6000.c (rs6000_gimplify_va_arg): New fn.
(TARGET_GIMPLIFY_VA_ARG_EXPR): Define.
<<<<<<< ChangeLog
=======
* config/sparc/sparc.c (sparc_gimplify_va_arg): New fn.
>>>>>>> 2.3910
* alias.c (get_varargs_alias_set): Just return 0 for now.
* c-objc-common.c (c_tree_printer): Improve handling of %T.
......@@ -300,15 +296,6 @@
2004-06-08 Richard Henderson <rth@redhat.com>
<<<<<<< ChangeLog
* gimple-low.c (struct lower_data): Replace the_return_label and
one_return_stmt with return_statements.
(lower_function_body): Process the entire list of return_statements.
(lower_return_expr): Check source value before unifying return_exprs.
* gimplify.c (gimplify_return_expr): Force the use of a temporary
for !aggregate_value_p.
* tree-gimple.c: Update RETURN_EXPR grammer.
=======
* gimple-low.c (struct lower_data): Replace the_return_label and
one_return_stmt with return_statements.
(lower_function_body): Process the entire list of return_statements.
......@@ -316,7 +303,6 @@
* gimplify.c (gimplify_return_expr): Force the use of a temporary
for !aggregate_value_p.
* tree-gimple.c: Update RETURN_EXPR grammer.
>>>>>>> 2.3910
2004-06-08 Vladimir Makarov <vmakarov@redhat.com>
......
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