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

[Paul Eggert]

Index: emacs/src/unexelf.c
diff -c emacs/src/unexelf.c:1.38.16.7 emacs/src/unexelf.c:1.38.16.8
*** emacs/src/unexelf.c:1.38.16.7       Tue Oct 15 10:17:16 2002
--- emacs/src/unexelf.c Sun Jul 13 03:26:30 2003
***************
*** 1,5 ****
! /* Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992, 1999, 2000, 01, 02
!    Free Software Foundation, Inc.
  
  This file is part of GNU Emacs.
  
--- 1,5 ----
! /* Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992, 1999, 2000, 2001, 2002,
!    2003 Free Software Foundation, Inc.
  
  This file is part of GNU Emacs.
  
***************
*** 971,978 ****
        }
        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.
--- 971,983 ----
        }
        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.
***************
*** 986,994 ****
              >= 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
--- 991,998 ----
              >= 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