Skip to content

R
riscv-gcc-1
Commit 748f7574 by Eric Botcazou
Options

Remove conflict marker 

From-SVN: r173756
parent e6242bc7
Showing with 5 additions and 6 deletions
gcc/ChangeLog
...@@ -129,7 +129,6 @@ ...@@ -129,7 +129,6 @@
* configure.ac: Use AS_HELP_STRING throughout. * configure.ac: Use AS_HELP_STRING throughout.
* configure: Regenerate. * configure: Regenerate.
>>>>>>> .r173734
2011-05-12 H.J. Lu <hongjiu.lu@intel.com> 2011-05-12 H.J. Lu <hongjiu.lu@intel.com>
* config/i386/i386.c (ix86_save_reg): Change maybe_eh_return to bool. * config/i386/i386.c (ix86_save_reg): Change maybe_eh_return to bool.
...@@ -1475,7 +1474,7 @@ ...@@ -1475,7 +1474,7 @@
* config/bfin/uclinux.h (LINK_GCC_C_SEQUENCE_SPEC): Make sure * config/bfin/uclinux.h (LINK_GCC_C_SEQUENCE_SPEC): Make sure
libbffastfp overrides libgcc when -mfast-fp. libbffastfp overrides libgcc when -mfast-fp.
2011-05-03 Stuart Henderson <shenders@gcc.gnu.org> 2011-05-03 Stuart Henderson <shenders@gcc.gnu.org>
Originally from Bernd Schmidt Originally from Bernd Schmidt
* config/bfin/uclinux.h (SUBTARGET_FDPIC_NOT_SUPPORTED): New macro. * config/bfin/uclinux.h (SUBTARGET_FDPIC_NOT_SUPPORTED): New macro.
...@@ -3926,7 +3925,7 @@ ...@@ -3926,7 +3925,7 @@
* haifa-sched.c (prune_ready_list, schedule_block): Use * haifa-sched.c (prune_ready_list, schedule_block): Use
sched_pressure_p rather than flag_sched_pressure. sched_pressure_p rather than flag_sched_pressure.
2011-04-15 Pat Haugen <pthaugen@us.ibm.com> 2011-04-15 Pat Haugen <pthaugen@us.ibm.com>
* config/rs6000/rs6000.c (call_ABI_of_interest): Call * config/rs6000/rs6000.c (call_ABI_of_interest): Call
cgraph_get_node instead of cgraph_get_create_node. cgraph_get_node instead of cgraph_get_create_node.
...@@ -4217,7 +4216,7 @@ ...@@ -4217,7 +4216,7 @@
2011-04-14 Anatoly Sokolov <aesok@post.ru> 2011-04-14 Anatoly Sokolov <aesok@post.ru>
Eric Weddington <eric.weddington@atmel.com> Eric Weddington <eric.weddington@atmel.com>
Georg-Johann Lay <avr@gjlay.de> Georg-Johann Lay <avr@gjlay.de>
* config/avr/avr.c ("insn-codes.h", "optabs.h", "langhooks.h"): * config/avr/avr.c ("insn-codes.h", "optabs.h", "langhooks.h"):
New Includes New Includes
...@@ -4462,7 +4461,7 @@ ...@@ -4462,7 +4461,7 @@
(TREE_CHAIN): Check for a TS_COMMON structure. (TREE_CHAIN): Check for a TS_COMMON structure.
(TREE_TYPE): Check for a TS_TYPED structure. (TREE_TYPE): Check for a TS_TYPED structure.
2011-04-12 Pat Haugen <pthaugen@us.ibm.com> 2011-04-12 Pat Haugen <pthaugen@us.ibm.com>
* config/rs6000/rs6000.c (call_ABI_of_interest): Call * config/rs6000/rs6000.c (call_ABI_of_interest): Call
cgraph_get_create_node instead of cgraph_node. cgraph_get_create_node instead of cgraph_node.
...@@ -6248,7 +6247,7 @@ ...@@ -6248,7 +6247,7 @@
* config/i386/cygming.opt: Make sure trailing empty line is retained. * config/i386/cygming.opt: Make sure trailing empty line is retained.
* config/i386/mingw-w64.opt: Likewise. * config/i386/mingw-w64.opt: Likewise.
2011-04-01 Gary Funck <gary@intrepid.com> 2011-04-01 Gary Funck <gary@intrepid.com>
* c-decl.c (grokdeclarator): Fix formatting. * c-decl.c (grokdeclarator): Fix formatting.
......
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