From: Richard Sandiford <rdsandiford@googlemail.com>
Date: Mon, 11 Feb 2013 17:27:57 +0000 (+0000)
Subject: bfd/
X-Git-Tag: sid-snapshot-20130301~194
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7d94b3191af0c590142ee723b5822f7ceb1ebf2d;p=external%2Fbinutils.git

bfd/
	* elfxx-mips.c (mips_elf_sort_hash_table_f): Remove asserts.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index be33a47..6347d83 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,9 @@
 2013-02-11  Richard Sandiford  <rdsandiford@googlemail.com>
 
+	* elfxx-mips.c (mips_elf_sort_hash_table_f): Remove asserts.
+
+2013-02-11  Richard Sandiford  <rdsandiford@googlemail.com>
+
 	* elfxx-mips.c (mips_elf_merge_got_with): Only use arg->global_count
 	if there are TLS relocations.
 
diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
index abf2156..f3259f4 100644
--- a/bfd/elfxx-mips.c
+++ b/bfd/elfxx-mips.c
@@ -3640,15 +3640,11 @@ mips_elf_sort_hash_table_f (struct mips_elf_link_hash_entry *h, void *data)
       break;
 
     case GGA_NORMAL:
-      BFD_ASSERT (h->tls_type == GOT_NORMAL);
-
       h->root.dynindx = --hsd->min_got_dynindx;
       hsd->low = (struct elf_link_hash_entry *) h;
       break;
 
     case GGA_RELOC_ONLY:
-      BFD_ASSERT (h->tls_type == GOT_NORMAL);
-
       if (hsd->max_unref_got_dynindx == hsd->min_got_dynindx)
 	hsd->low = (struct elf_link_hash_entry *) h;
       h->root.dynindx = hsd->max_unref_got_dynindx++;