elfcode.h (elf_sort_hdrs): Put SHT_NOBITS sections after !SHT_NOBITS.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index ae489a0..76ccd0f 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+Wed Feb  8 09:53:42 1995  Doug Evans  <dje@canuck.cygnus.com>
+
+       * elfcode.h (elf_sort_hdrs): Put SHT_NOBITS sections after !SHT_NOBITS.
+
 Tue Feb  7 16:27:33 1995  Jeff Law  (law@snake.cs.utah.edu)
 
        * som.c (som_bfd_find_nearest_line): Just return false, don't

diff --git a/bfd/elfcode.h b/bfd/elfcode.h
index a5f0ffd..e96f088 100644 (file)
--- a/bfd/elfcode.h
+++ b/bfd/elfcode.h
@@ -2265,8 +2265,9 @@ elf_sort_hdrs (arg1, arg2)
        return -1;
       else if (hdr1->sh_addr > hdr2->sh_addr)
        return 1;
-      else
-       return 0;
+      /* Put !SHT_NOBITS sections before SHT_NOBITS ones.
+         The main loop in map_program_segments assumes this. */
+      return (hdr1->sh_type == SHT_NOBITS) - (hdr2->sh_type == SHT_NOBITS);
     }
   else
     {