Update copyright year to 2015

[gnu-emacs] / src / unexmacosx.c

diff --git a/src/unexmacosx.c b/src/unexmacosx.c
index 3bd8f3b02fc3acf3eeead9c0469441e94748081a..fe6637e2ef5ca4b28ce3ab4aefdc41ecca95b2b5 100644 (file)
--- a/src/unexmacosx.c
+++ b/src/unexmacosx.c
@@ -1,5 +1,5 @@
 /* Dump Emacs in Mach-O format for use on Mac OS X.
-   Copyright (C) 2001-2014 Free Software Foundation, Inc.
+   Copyright (C) 2001-2015 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -107,9 +107,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <mach/mach.h>
 #include <mach-o/loader.h>
 #include <mach-o/reloc.h>
-#if defined (__ppc__)
-#include <mach-o/ppc/reloc.h>
-#endif
 #ifdef HAVE_MALLOC_MALLOC_H
 #include <malloc/malloc.h>
 #else
@@ -1033,17 +1030,8 @@ unrelocate (const char *name, off_t reloff, int nrel, vm_address_t base)
                          name, i, reloc_info.r_type);
          }
       else
-       switch (sc_reloc_info->r_type)
-         {
-#if defined (__ppc__)
-         case PPC_RELOC_PB_LA_PTR:
-           /* nothing to do for prebound lazy pointer */
-           break;
-#endif
-         default:
-           unexec_error ("unrelocate: %s:%d cannot handle scattered type = %d",
-                         name, i, sc_reloc_info->r_type);
-         }
+        unexec_error ("unrelocate: %s:%d cannot handle scattered type = %d",
+                      name, i, sc_reloc_info->r_type);
     }
 
   if (nrel > 0)
@@ -1051,35 +1039,6 @@ unrelocate (const char *name, off_t reloff, int nrel, vm_address_t base)
            unreloc_count, nrel, name);
 }
 
-#if __ppc64__
-/* Rebase r_address in the relocation table.  */
-static void
-rebase_reloc_address (off_t reloff, int nrel, long linkedit_delta, long diff)
-{
-  int i;
-  struct relocation_info reloc_info;
-  struct scattered_relocation_info *sc_reloc_info
-    = (struct scattered_relocation_info *) &reloc_info;
-
-  for (i = 0; i < nrel; i++, reloff += sizeof (reloc_info))
-    {
-      if (lseek (infd, reloff - linkedit_delta, L_SET)
-         != reloff - linkedit_delta)
-       unexec_error ("rebase_reloc_table: cannot seek to reloc_info");
-      if (!unexec_read (&reloc_info, sizeof (reloc_info)))
-       unexec_error ("rebase_reloc_table: cannot read reloc_info");
-
-      if (sc_reloc_info->r_scattered == 0
-         && reloc_info.r_type == GENERIC_RELOC_VANILLA)
-       {
-         reloc_info.r_address -= diff;
-         if (!unexec_write (reloff, &reloc_info, sizeof (reloc_info)))
-           unexec_error ("rebase_reloc_table: cannot write reloc_info");
-       }
-    }
-}
-#endif
-
 /* Copy a LC_DYSYMTAB load command from the input file to the output
    file, adjusting the file offset fields.  */
 static void
@@ -1089,28 +1048,8 @@ copy_dysymtab (struct load_command *lc, long delta)
   vm_address_t base;
 
 #ifdef _LP64
-#if __ppc64__
-  {
-    int i;
-
-    base = 0;
-    for (i = 0; i < nlc; i++)
-      if (lca[i]->cmd == LC_SEGMENT)
-       {
-         struct segment_command *scp = (struct segment_command *) lca[i];
-
-         if (scp->vmaddr + scp->vmsize > 0x100000000
-             && (scp->initprot & VM_PROT_WRITE) != 0)
-           {
-             base = data_segment_scp->vmaddr;
-             break;
-           }
-       }
-  }
-#else
   /* First writable segment address.  */
   base = data_segment_scp->vmaddr;
-#endif
 #else
   /* First segment address in the file (unless MH_SPLIT_SEGS set). */
   base = 0;
@@ -1136,29 +1075,6 @@ copy_dysymtab (struct load_command *lc, long delta)
     unexec_error ("cannot write symtab command to header");
 
   curr_header_offset += lc->cmdsize;
-
-#if __ppc64__
-  /* Check if the relocation base needs to be changed.  */
-  if (base == 0)
-    {
-      vm_address_t newbase = 0;
-      int i;
-
-      for (i = 0; i < num_unexec_regions; i++)
-       if (unexec_regions[i].range.address + unexec_regions[i].range.size
-           > 0x100000000)
-         {
-           newbase = data_segment_scp->vmaddr;
-           break;
-         }
-
-      if (newbase)
-       {
-         rebase_reloc_address (dstp->locreloff, dstp->nlocrel, delta, newbase);
-         rebase_reloc_address (dstp->extreloff, dstp->nextrel, delta, newbase);
-       }
-    }
-#endif
 }
 
 /* Copy a LC_TWOLEVEL_HINTS load command from the input file to the output
@@ -1351,7 +1267,7 @@ unexec (const char *outfile, const char *infile)
       unexec_error ("cannot open input file `%s'", infile);
     }
 
-  outfd = emacs_open (outfile, O_WRONLY | O_TRUNC | O_CREAT, 0755);
+  outfd = emacs_open (outfile, O_WRONLY | O_TRUNC | O_CREAT, 0777);
   if (outfd < 0)
     {
       emacs_close (infd);