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

fix conflict markers 

From-SVN: r82926
This commit is contained in:
Jason Merrill 2004-06-10 11:50:26 -04:00
parent 23a60a0436
commit 811d7e7745
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gcc/ChangeLog
View File

@ -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>