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

[Miles Bader]

Index: emacs/src/unexelf.c
diff -c emacs/src/unexelf.c:1.48.2.1 emacs/src/unexelf.c:1.48.2.2
*** emacs/src/unexelf.c:1.48.2.1        Fri Apr  4 01:21:03 2003
--- emacs/src/unexelf.c Tue Oct 14 19:22:47 2003
***************
*** 1,4 ****
! /* Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992, 1999, 2000, 2001
     Free Software Foundation, Inc.
  
  This file is part of GNU Emacs.
--- 1,4 ----
! /* Copyright (C) 1985,86,87,88,90,92,1999,2000,01,2003
     Free Software Foundation, Inc.
  
  This file is part of GNU Emacs.
***************
*** 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
***************
*** 1201,1206 ****
--- 1205,1211 ----
  
        /* Cause a compilation error if anyone uses n instead of nn below.  */
        struct {int a;} n;
+       (void)n.a;              /* Prevent `unused variable' warnings.  */
  
        switch (section.sh_type)
        {
***************
*** 1279,1281 ****
--- 1284,1289 ----
    if (chmod (new_name, stat_buf.st_mode) == -1)
      fatal ("Can't chmod (%s): errno %d\n", new_name, errno);
  }
+ 
+ /* arch-tag: e02e1512-95e2-4ef0-bba7-b6bce658f1e3
+    (do not change this comment) */