binutils-elf-sort.patch

   1 Content-Type: text/x-patch
   2 Content-Disposition: inline;
   3   filename=bfd-elf-sort-symbol-solaris-crash.patch
   4
   5 Index: bfd/ChangeLog
   6 from  Alexandre Oliva  <aoliva@redhat.com>
   7
   8         * elflink.c (elf_sort_symbol): Compare section id, not pointers.
   9         (elf_link_add_object_symbols): Likewise.
  10
  11 Index: bfd/elflink.c
  12 ===================================================================
  13 RCS file: /cvs/src/src/bfd/elflink.c,v
  14 retrieving revision 1.71
  15 diff -u -p -r1.71 elflink.c
  16 --- bfd/elflink.c 25 May 2004 06:33:46 -0000 1.71
  17 +++ bfd/elflink.c 9 Jun 2004 13:35:40 -0000
  18 @@ -2728,7 +2728,7 @@ elf_sort_symbol (const void *arg1, const
  19      return vdiff > 0 ? 1 : -1;
  20    else
  21      {
  22 -      long sdiff = h1->root.u.def.section - h2->root.u.def.section;
  23 +      long sdiff = h1->root.u.def.section->id - h2->root.u.def.section->id;
  24        if (sdiff != 0)
  25         return sdiff > 0 ? 1 : -1;
  26      }
  27 @@ -3982,7 +3982,7 @@ elf_link_add_object_symbols (bfd *abfd,
  28                 i = idx + 1;
  29               else
  30                 {
  31 -                 long sdiff = slook - h->root.u.def.section;
  32 +                 long sdiff = slook->id - h->root.u.def.section->id;
  33                   if (sdiff < 0)
  34                     j = idx;
  35                   else if (sdiff > 0)