From 99fd8cfff7a9da67efc2e6c627176f5c767c6e7d Mon Sep 17 00:00:00 2001 From: Cary Coutant Date: Tue, 15 Apr 2014 11:24:30 -0700 Subject: [PATCH] Allow target to decide whether to include a section. 2014-04-15 Sasa Stankovic gold/ * layout.cc (Layout::include_section): Allow a target to decide whether to include a section. * target.h (Target::should_include_section): New function. (Target::do_should_include_section): New function. --- gold/ChangeLog | 7 +++++++ gold/layout.cc | 8 +++++++- gold/target.h | 10 ++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/gold/ChangeLog b/gold/ChangeLog index 4ddef9a37d..f1fea46986 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,10 @@ +2014-04-15 Sasa Stankovic + + * layout.cc (Layout::include_section): Allow a target to decide + whether to include a section. + * target.h (Target::should_include_section): New function. + (Target::do_should_include_section): New function. + 2014-04-15 Sasa Stankovic * copy-relocs.cc (Copy_relocs::Copy_reloc_entry::emit): Remove and diff --git a/gold/layout.cc b/gold/layout.cc index c96516c053..02f691edf1 100644 --- a/gold/layout.cc +++ b/gold/layout.cc @@ -644,7 +644,13 @@ Layout::include_section(Sized_relobj_file*, const char* name, && (shdr.get_sh_flags() & elfcpp::SHF_EXCLUDE)) return false; - switch (shdr.get_sh_type()) + elfcpp::Elf_Word sh_type = shdr.get_sh_type(); + + if ((sh_type >= elfcpp::SHT_LOOS && sh_type <= elfcpp::SHT_HIOS) + || (sh_type >= elfcpp::SHT_LOPROC && sh_type <= elfcpp::SHT_HIPROC)) + return parameters->target().should_include_section(sh_type); + + switch (sh_type) { case elfcpp::SHT_NULL: case elfcpp::SHT_SYMTAB: diff --git a/gold/target.h b/gold/target.h index aaf4b1ccaa..e380591030 100644 --- a/gold/target.h +++ b/gold/target.h @@ -480,6 +480,11 @@ class Target adjust_dyn_symbol(const Symbol* sym, unsigned char* view) const { this->do_adjust_dyn_symbol(sym, view); } + // Return whether to include the section in the link. + bool + should_include_section(elfcpp::Elf_Word sh_type) const + { return this->do_should_include_section(sh_type); } + protected: // This struct holds the constant information for a child class. We // use a struct to avoid the overhead of virtual function calls for @@ -773,6 +778,11 @@ class Target do_adjust_dyn_symbol(const Symbol*, unsigned char*) const { } + // This may be overridden by the child class. + virtual bool + do_should_include_section(elfcpp::Elf_Word) const + { return true; } + private: // The implementations of the four do_make_elf_object virtual functions are // almost identical except for their sizes and endianness. We use a template. -- 2.34.1