diff options
| author | Cary Coutant <ccoutant@google.com> | 2012-08-22 18:26:32 +0000 |
|---|---|---|
| committer | Cary Coutant <ccoutant@google.com> | 2012-08-22 18:26:32 +0000 |
| commit | 1e2bee4f5f1bdeb8c5cadbecf9d0b92e60a8bd13 (patch) | |
| tree | 149f78c9b9357cf5c3e2f70a22c7e3fbb0cb5cc2 | |
| parent | 522002f96cdfe306cb3385d075a5ae9f8381969e (diff) | |
| download | gdb-1e2bee4f5f1bdeb8c5cadbecf9d0b92e60a8bd13.zip gdb-1e2bee4f5f1bdeb8c5cadbecf9d0b92e60a8bd13.tar.gz gdb-1e2bee4f5f1bdeb8c5cadbecf9d0b92e60a8bd13.tar.bz2 | |
2012-08-22 Cary Coutant <ccoutant@google.com>
gold/
* layout.cc (Layout::include_section): Don't assert on GROUP
sections with --emit-relocs.
| -rw-r--r-- | gold/ChangeLog | 5 | ||||
| -rw-r--r-- | gold/layout.cc | 3 |
2 files changed, 6 insertions, 2 deletions
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 <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 1e31cce..db6b6ac 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: |