[Emacs-diffs] Changes to emacs/src/unexelf.c

[Richard M. Stallman]

Index: emacs/src/unexelf.c
diff -c emacs/src/unexelf.c:1.53 emacs/src/unexelf.c:1.54
*** emacs/src/unexelf.c:1.53    Sun May 25 13:45:27 2003
--- emacs/src/unexelf.c Sat Jul 12 17:53:28 2003
***************
*** 950,957 ****
        }
        else
        {
!         /* Any section that was original placed AFTER the bss
!            section should now be off by NEW_DATA2_SIZE. */
  #ifdef SOLARIS_POWERPC
          /* On PPC Reference Platform running Solaris 2.5.1
             the plt section is also of type NOBI like the bss section.
--- 950,962 ----
        }
        else
        {
!         /* Any section that was originally placed after the .bss
!            section should now be off by NEW_DATA2_SIZE.  If a
!            section overlaps the .bss section, consider it to be
!            placed after the .bss section.  Overlap can occur if the
!            section just before .bss has less-strict alignment; this
!            was observed between .symtab and .bss on Solaris 2.5.1
!            (sparc) with GCC snapshot 960602.  */
  #ifdef SOLARIS_POWERPC
          /* On PPC Reference Platform running Solaris 2.5.1
             the plt section is also of type NOBI like the bss section.
***************
*** 965,973 ****
              >= OLD_SECTION_H (old_bss_index-1).sh_offset)
            NEW_SECTION_H (nn).sh_offset += new_data2_size;
  #else
!         if (round_up (NEW_SECTION_H (nn).sh_offset,
!                       OLD_SECTION_H (old_bss_index).sh_addralign)
!             >= new_data2_offset)
            NEW_SECTION_H (nn).sh_offset += new_data2_size;
  #endif
          /* Any section that was originally placed after the section
--- 970,977 ----
              >= OLD_SECTION_H (old_bss_index-1).sh_offset)
            NEW_SECTION_H (nn).sh_offset += new_data2_size;
  #else
!         if (NEW_SECTION_H (nn).sh_offset + NEW_SECTION_H (nn).sh_size
!             > new_data2_offset)
            NEW_SECTION_H (nn).sh_offset += new_data2_size;
  #endif
          /* Any section that was originally placed after the section