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 e79f4e446101eeceab7c83569b11e781033aa951..2f5fcb11a5a8a36a3d806d56e755f9eeed4013e9 100644 (file)
--- 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 1e31ccef9128642262fec474606ccd96df65f44c..db6b6ac174bb5e1330ea2b5542d989cac7a20ef3 100644 (file)
--- 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: