diff options
| author | Ian Lance Taylor <ian@airs.com> | 2011-06-29 21:39:19 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@airs.com> | 2011-06-29 21:39:19 +0000 |
| commit | 4d5e4e62e11291ffec0c5039c9b396a07e9a2d39 (patch) | |
| tree | 0f1e0141dc2955e11026b9af26d154b42a5a2ab8 /gold | |
| parent | 886f533adaf49c51722d4b02a309e88dd8c1c239 (diff) | |
| download | binutils-4d5e4e62e11291ffec0c5039c9b396a07e9a2d39.zip binutils-4d5e4e62e11291ffec0c5039c9b396a07e9a2d39.tar.gz binutils-4d5e4e62e11291ffec0c5039c9b396a07e9a2d39.tar.bz2 | |
PR gold/12675
* object.cc (Sized_relobj_file::check_eh_frame_flags): Check for
SHT_X86_64_UNWIND.
* layout.cc (Layout::layout_eh_frame): Likewise.
Diffstat (limited to 'gold')
| -rw-r--r-- | gold/ChangeLog | 7 | ||||
| -rw-r--r-- | gold/layout.cc | 3 | ||||
| -rw-r--r-- | gold/object.cc | 4 |
3 files changed, 12 insertions, 2 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index bfb9a40..342fc19 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,5 +1,12 @@ 2011-06-29 Ian Lance Taylor <iant@google.com> + PR gold/12675 + * object.cc (Sized_relobj_file::check_eh_frame_flags): Check for + SHT_X86_64_UNWIND. + * layout.cc (Layout::layout_eh_frame): Likewise. + +2011-06-29 Ian Lance Taylor <iant@google.com> + PR gold/12695 * layout.cc (Layout::symtab_section_shndx): New function. * layout.h (class Layout): Declare symtab_section_shndx. diff --git a/gold/layout.cc b/gold/layout.cc index a52d35c..3152622 100644 --- a/gold/layout.cc +++ b/gold/layout.cc @@ -1132,7 +1132,8 @@ Layout::layout_eh_frame(Sized_relobj_file<size, big_endian>* object, unsigned int reloc_shndx, unsigned int reloc_type, off_t* off) { - gold_assert(shdr.get_sh_type() == elfcpp::SHT_PROGBITS); + gold_assert(shdr.get_sh_type() == elfcpp::SHT_PROGBITS + || shdr.get_sh_type() == elfcpp::SHT_X86_64_UNWIND); gold_assert((shdr.get_sh_flags() & elfcpp::SHF_ALLOC) != 0); const char* const name = ".eh_frame"; diff --git a/gold/object.cc b/gold/object.cc index 778f03b..322f56e 100644 --- a/gold/object.cc +++ b/gold/object.cc @@ -511,7 +511,9 @@ bool Sized_relobj_file<size, big_endian>::check_eh_frame_flags( const elfcpp::Shdr<size, big_endian>* shdr) const { - return (shdr->get_sh_type() == elfcpp::SHT_PROGBITS + elfcpp::Elf_Word sh_type = shdr->get_sh_type(); + return ((sh_type == elfcpp::SHT_PROGBITS + || sh_type == elfcpp::SHT_X86_64_UNWIND) && (shdr->get_sh_flags() & elfcpp::SHF_ALLOC) != 0); } |