* ChangeLog: Remove SVN conflict marks.

From-SVN: r164144
This commit is contained in:
Uros Bizjak 2010-09-10 11:05:52 +02:00
parent 5d44e5c839
commit 2b74262bfc
2 changed files with 9 additions and 11 deletions

View File

@ -32,11 +32,10 @@
2010-09-09 Ramana Radhakrishnan <ramana.radhakrishnan@arm.com>
* config/arm/bpabi.h (BE8_LINK_SPEC): Handle Cortex-a15.
* config/arm/arm-cores.def (cortex-a15): New core. Treat it
as a v7-a.
* config/arm/arm-tune.md: Regenerate.
* doc/invoke.texi (ARM Options): Document it.
* config/arm/bpabi.h (BE8_LINK_SPEC): Handle Cortex-a15.
* config/arm/arm-cores.def (cortex-a15): New core. Treat it as a v7-a.
* config/arm/arm-tune.md: Regenerate.
* doc/invoke.texi (ARM Options): Document it.
2010-09-09 Reza Yazdani <reza.yazdani@amd.com>
@ -118,7 +117,6 @@
* target.def (dispatch): Defined.
(dispatch_do): Defined.
>>>>>>> .r164133
2010-09-09 Vladimir Makarov <vmakarov@redhat.com>
PR middle-end/45312

View File

@ -5,7 +5,7 @@
* gcc.dg/tree-ssa/pr45144.c: Likewise.
* gcc.dg/tree-ssa/forwprop-5.c: Likewise and scan optimzed dump
instead.
* g++.dg/torture/pr44972.C: New test.
* g++.dg/torture/pr44972.C: New test.
2010-09-10 Martin Jambor <mjambor@suse.cz>
@ -39,7 +39,7 @@
PR middle-end/40386
* gcc.c-torture/execute/{pr40386.c,pr40386.x}: New testcase.
2010-09-09 Mikael Morin <mikael@gcc.gnu.org>
* gfortran.dg/inline_transpose_1.f90: New test.
@ -60,7 +60,7 @@
* objc/execute/exceptions/handler-1.m: Updated to use the new
objc_set_uncaught_exception_handler() function.
* objc/execute/exceptions/matcher-1.m: New test.
2010-09-08 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
PR fortran/38282
@ -104,7 +104,7 @@
PR tree-optimization/43430
* gcc.dg/vect/pr43430-2.c: New test.
2010-09-08 Michael Matz <matz@suse.de>
PR tree-optimization/33244
@ -422,7 +422,7 @@
* gcc.dg/vect/bb-slp-8.c: Separate the interesting part and the
check into different basic blocks. Expect vectorization if misaligned
stores are supported.
stores are supported.
* gcc.dg/vect/bb-slp-8a.c: New test.
* gcc.dg/vect/bb-slp-8b.c: New test.