forked from Imagelibrary/binutils-gdb
* gc.h (gc_process_relocs): Check if icf is enabled using new
function. * gold.cc (queue_initial_tasks): Likewise. (queue_middle_tasks): Likewise. * object.cc (do_layout): Likewise. * symtab.cc (is_section_folded): Likewise. * main.cc (main): Likewise. * reloc.cc (Read_relocs::run): Likewise. (Sized_relobj::do_scan_relocs): Likewise. * icf.cc (is_function_ctor_or_dtor): New function. (Icf::find_identical_sections): Check if function is ctor or dtor when safe icf is chosen. * options.h (General_options::icf): Change option to be an enum. (Icf_status): New enum. (icf_enabled): New method. (icf_safe_folding): New method. (set_icf_status): New method. (icf_status_): New variable. * (options.cc) (General_options::finalize): Set icf_status_. * testsuite/Makefile.am: Add commands to build icf_safe_test. Modify icf_test and icf_keep_unique_test to use the --icf enum flag. * testsuite/icf_safe_test.sh: New file. * testsuite/icf_safe_test.cc: New file.
This commit is contained in:
@@ -934,16 +934,16 @@ Sized_relobj<size, big_endian>::do_layout(Symbol_table* symtab,
|
||||
const unsigned int shnum = this->shnum();
|
||||
bool is_gc_pass_one = ((parameters->options().gc_sections()
|
||||
&& !symtab->gc()->is_worklist_ready())
|
||||
|| (parameters->options().icf()
|
||||
|| (parameters->options().icf_enabled()
|
||||
&& !symtab->icf()->is_icf_ready()));
|
||||
|
||||
bool is_gc_pass_two = ((parameters->options().gc_sections()
|
||||
&& symtab->gc()->is_worklist_ready())
|
||||
|| (parameters->options().icf()
|
||||
|| (parameters->options().icf_enabled()
|
||||
&& symtab->icf()->is_icf_ready()));
|
||||
|
||||
bool is_gc_or_icf = (parameters->options().gc_sections()
|
||||
|| parameters->options().icf());
|
||||
|| parameters->options().icf_enabled());
|
||||
|
||||
// Both is_gc_pass_one and is_gc_pass_two should not be true.
|
||||
gold_assert(!(is_gc_pass_one && is_gc_pass_two));
|
||||
@@ -1238,7 +1238,7 @@ Sized_relobj<size, big_endian>::do_layout(Symbol_table* symtab,
|
||||
}
|
||||
}
|
||||
|
||||
if (is_gc_pass_two && parameters->options().icf())
|
||||
if (is_gc_pass_two && parameters->options().icf_enabled())
|
||||
{
|
||||
if (out_sections[i] == NULL)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user