diff options
| author | Sriraman Tallam <tmsriram@google.com> | 2009-10-13 21:17:43 +0000 |
|---|---|---|
| committer | Sriraman Tallam <tmsriram@google.com> | 2009-10-13 21:17:43 +0000 |
| commit | 032ce4e9e37bd92e928352fca78b1eee3bb41fdd (patch) | |
| tree | ca3bb0efd21ae5b265a39f8b4179c4d28d3465b2 /gold/object.cc | |
| parent | 55b126d49cd449155a9057c7212d0b2e74bab465 (diff) | |
| download | gdb-032ce4e9e37bd92e928352fca78b1eee3bb41fdd.zip gdb-032ce4e9e37bd92e928352fca78b1eee3bb41fdd.tar.gz gdb-032ce4e9e37bd92e928352fca78b1eee3bb41fdd.tar.bz2 | |
* 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.
Diffstat (limited to 'gold/object.cc')
| -rw-r--r-- | gold/object.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gold/object.cc b/gold/object.cc index e09a71f..e9826b0 100644 --- a/gold/object.cc +++ b/gold/object.cc @@ -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) { |