From: Cary Coutant <ccoutant@google.com>
Date: Wed, 22 Aug 2012 18:26:32 +0000 (+0000)
Subject: 2012-08-22  Cary Coutant  <ccoutant@google.com>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1e2bee4f5f1bdeb8c5cadbecf9d0b92e60a8bd13;p=binutils-gdb.git

2012-08-22  Cary Coutant  <ccoutant@google.com>

gold/
	* layout.cc (Layout::include_section): Don't assert on GROUP
	sections with --emit-relocs.
---

diff --git a/gold/ChangeLog b/gold/ChangeLog
index e79f4e44610..2f5fcb11a5a 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-22  Cary Coutant  <ccoutant@google.com>
+
+	* layout.cc (Layout::include_section): Don't assert on GROUP
+	sections with --emit-relocs.
+
 2012-08-21  Cary Coutant  <ccoutant@google.com>
 
 	* symtab.cc (Symbol_table::gc_mark_undef_symbols): Don't assert
diff --git a/gold/layout.cc b/gold/layout.cc
index 1e31ccef912..db6b6ac174b 100644
--- a/gold/layout.cc
+++ b/gold/layout.cc
@@ -606,8 +606,7 @@ Layout::include_section(Sized_relobj_file<size, big_endian>*, 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: