From: Jason Merrill Date: Thu, 10 Jun 2004 15:50:26 +0000 (-0400) Subject: fix conflict markers X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=811d7e77459bb2926e5928b2ad47caf6eaf258fc;p=gcc.git fix conflict markers From-SVN: r82926 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 48af490674e..ed2a94b93a6 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 -<<<<<<< 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