diff options
| author | Uros Bizjak <uros@gcc.gnu.org> | 2010-09-10 11:05:52 +0200 |
|---|---|---|
| committer | Uros Bizjak <uros@gcc.gnu.org> | 2010-09-10 11:05:52 +0200 |
| commit | 2b74262bfcb6002f9cff86d0b6546967a32d96cf (patch) | |
| tree | 6b69e18e779664c9c9672400f9aaa2a9fc3b4ea2 /gcc | |
| parent | 5d44e5c8398ca39f0cfdc33ff1470d17132b2af3 (diff) | |
| download | gcc-2b74262bfcb6002f9cff86d0b6546967a32d96cf.zip gcc-2b74262bfcb6002f9cff86d0b6546967a32d96cf.tar.gz gcc-2b74262bfcb6002f9cff86d0b6546967a32d96cf.tar.bz2 | |
* ChangeLog: Remove SVN conflict marks.
From-SVN: r164144
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 10 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 10 |
2 files changed, 9 insertions, 11 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 22c53c0..6b8bd3a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -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 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e4c2c9a..32889aa 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -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. |