Revert previous delta - the bug had already been fixed.

2 files changed, 10 insertions, 17 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 03f2192..8055cb1 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,8 +1,3 @@
-2004-07-13  Kelvin Lee  <Kelvin.Lee@lansa.com.au>
-
-	* elflink.c (elf_sort_symbol): Restructure code to avoid bug in
-	Solaris hosted versions of gcc.
-
 2004-07-10  James E Wilson  <wilson@specifixinc.com>
 
 	* elfxx-ia64.c (elfNN_ia64_relax_ldxmov): Remove abfd parameter.
diff --git a/bfd/elflink.c b/bfd/elflink.c
index cf7d14e..1c1de27 100644
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -2733,26 +2733,24 @@ elf_add_dt_needed_tag (struct bfd_link_info *info,
 }
 
 /* Sort symbol by value and section.  */
-
 static int
 elf_sort_symbol (const void *arg1, const void *arg2)
 {
   const struct elf_link_hash_entry *h1;
   const struct elf_link_hash_entry *h2;
+  bfd_signed_vma vdiff;
 
   h1 = *(const struct elf_link_hash_entry **) arg1;
   h2 = *(const struct elf_link_hash_entry **) arg2;
-
-  /* Coded this way to avoid bugs in various versions of gcc.  */
-  if (h1->root.u.def.value < h2->root.u.def.value)
-     return -1;
-  if (h1->root.u.def.value > h2->root.u.def.value)
-     return 1;
-  if (h1->root.u.def.section < h2->root.u.def.section)
-     return -1;
-  if (h1->root.u.def.section > h2->root.u.def.section)
-     return 1;
-
+  vdiff = h1->root.u.def.value - h2->root.u.def.value;
+  if (vdiff != 0)
+    return vdiff > 0 ? 1 : -1;
+  else
+    {
+      long sdiff = h1->root.u.def.section->id - h2->root.u.def.section->id;
+      if (sdiff != 0)
+	return sdiff > 0 ? 1 : -1;
+    }
   return 0;
 }