From 1e2bee4f5f1bdeb8c5cadbecf9d0b92e60a8bd13 Mon Sep 17 00:00:00 2001 From: Cary Coutant Date: Wed, 22 Aug 2012 18:26:32 +0000 Subject: 2012-08-22 Cary Coutant gold/ * layout.cc (Layout::include_section): Don't assert on GROUP sections with --emit-relocs. --- gold/ChangeLog | 5 +++++ gold/layout.cc | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'gold') diff --git a/gold/ChangeLog b/gold/ChangeLog index e79f4e4..2f5fcb1 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,8 @@ +2012-08-22 Cary Coutant + + * layout.cc (Layout::include_section): Don't assert on GROUP + sections with --emit-relocs. + 2012-08-21 Cary Coutant * symtab.cc (Symbol_table::gc_mark_undef_symbols): Don't assert diff --git a/gold/layout.cc b/gold/layout.cc index 1e31cce..db6b6ac 100644 --- a/gold/layout.cc +++ b/gold/layout.cc @@ -606,8 +606,7 @@ Layout::include_section(Sized_relobj_file*, const char* name, case elfcpp::SHT_GROUP: // If we are emitting relocations these should be handled // elsewhere. - gold_assert(!parameters->options().relocatable() - && !parameters->options().emit_relocs()); + gold_assert(!parameters->options().relocatable()); return false; case elfcpp::SHT_PROGBITS: -- cgit v1.1