diff options
| author | Jason Merrill <jason@gcc.gnu.org> | 2004-06-10 11:50:26 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2004-06-10 11:50:26 -0400 |
| commit | 811d7e77459bb2926e5928b2ad47caf6eaf258fc (patch) | |
| tree | 91a2fb07112cdd0c78a8943149894dc38a1666c6 | |
| parent | 23a60a0436f48f1de4e5bf124f29f0e4a32e7d4e (diff) | |
| download | gcc-811d7e77459bb2926e5928b2ad47caf6eaf258fc.zip gcc-811d7e77459bb2926e5928b2ad47caf6eaf258fc.tar.gz gcc-811d7e77459bb2926e5928b2ad47caf6eaf258fc.tar.bz2 | |
fix conflict markers
From-SVN: r82926
| -rw-r--r-- | gcc/ChangeLog | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 48af490..ed2a94b 100644 --- a/gcc/ChangeLog +++ b/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> |