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

Fix non-UTF-8 sequence in ChangeLog-2006 and left-over

Browse Source 
conflict marker in testsuite/ChangeLog-2008.

From-SVN: r143380
This commit is contained in:
Jakub Jelinek 2009-01-14 19:57:55 +01:00
parent 96a995c4af
commit ed8a0bc47c
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gcc/ChangeLog-2006
View File

@ -22671,7 +22671,7 @@
* basic-block.h: Remove the prototype for
partition_hot_cold_basic_blocks.
2006-01-16 Rafael ﾃ」ila de Espﾃ<70>ｽｭndola <rafael.espindola@gmail.com>
2006-01-16 Rafael Ávila de Espíndola <rafael.espindola@gmail.com>
* cppspec.c (lang_specific_spec_functions): Remove.
* gcc.c (lookup_spec_function): Use static_spec_functions directly.

1
gcc/testsuite/ChangeLog-2008
View File

@ -3280,7 +3280,6 @@
PR tree-optimization/37508
* gcc.dg/tree-ssa/pr37508.c: New testcase.
>>>>>>> .r140590
2008-09-15 Aldy Hernandez <aldyh@redhat.com>
* g++.old-deja/g++.brendan/crash16.C: Function name is the correct