Skip to content

R
riscv-gcc-1
Commit 2b74262b by Uros Bizjak
Options

* ChangeLog: Remove SVN conflict marks. 

From-SVN: r164144
parent 5d44e5c8
Showing with 1 additions and 3 deletions
gcc/ChangeLog
...@@ -33,8 +33,7 @@ ...@@ -33,8 +33,7 @@
2010-09-09 Ramana Radhakrishnan <ramana.radhakrishnan@arm.com> 2010-09-09 Ramana Radhakrishnan <ramana.radhakrishnan@arm.com>
* config/arm/bpabi.h (BE8_LINK_SPEC): Handle Cortex-a15. * config/arm/bpabi.h (BE8_LINK_SPEC): Handle Cortex-a15.
* config/arm/arm-cores.def (cortex-a15): New core. Treat it * config/arm/arm-cores.def (cortex-a15): New core. Treat it as a v7-a.
as a v7-a.
* config/arm/arm-tune.md: Regenerate. * config/arm/arm-tune.md: Regenerate.
* doc/invoke.texi (ARM Options): Document it. * doc/invoke.texi (ARM Options): Document it.
...@@ -118,7 +117,6 @@ ...@@ -118,7 +117,6 @@
* target.def (dispatch): Defined. * target.def (dispatch): Defined.
(dispatch_do): Defined. (dispatch_do): Defined.
>>>>>>> .r164133
2010-09-09 Vladimir Makarov <vmakarov@redhat.com> 2010-09-09 Vladimir Makarov <vmakarov@redhat.com>
PR middle-end/45312 PR middle-end/45312
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment