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

Remove conflict marker

Browse Source 
From-SVN: r173756
This commit is contained in:
Eric Botcazou 2011-05-14 10:38:45 +00:00
parent e6242bc79e
commit 748f7574e8
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gcc/ChangeLog
View File

@ -129,7 +129,6 @@
* configure.ac: Use AS_HELP_STRING throughout.
* configure: Regenerate.
>>>>>>> .r173734
2011-05-12 H.J. Lu <hongjiu.lu@intel.com>
* config/i386/i386.c (ix86_save_reg): Change maybe_eh_return to bool.