summaryrefslogtreecommitdiff
path: root/gold/layout.cc
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@airs.com>2011-06-29 21:39:19 +0000
committerIan Lance Taylor <ian@airs.com>2011-06-29 21:39:19 +0000
commit96f8c5f58d52a663ab537b8ef63483a14b4da410 (patch)
tree1eed2e4221396399187c6546a5fb3d5d7c620fa8 /gold/layout.cc
parenta49ecdfad167197056dc366237759431af74a972 (diff)
downloadbinutils-redhat-96f8c5f58d52a663ab537b8ef63483a14b4da410.tar.gz
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/layout.cc')
-rw-r--r--gold/layout.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/gold/layout.cc b/gold/layout.cc
index a52d35c7b2..3152622fb1 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";