conflict marker in testsuite/ChangeLog-2008.
From-SVN: r143380
* basic-block.h: Remove the prototype for
partition_hot_cold_basic_blocks.
-2006-01-16 Rafael Ã\81vila de EspÃ�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.
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