Ticket #4999: powerpc-compile-fix.diff

rts/Linker.c

@@ -70 +70 @@
 #include <sys/wait.h>
 #endif
 
-#if defined(linux_HOST_OS    ) || defined(freebsd_HOST_OS) || \
-    defined(dragonfly_HOST_OS) || defined(netbsd_HOST_OS ) || \
-    defined(openbsd_HOST_OS  ) || \
-    ( defined(darwin_HOST_OS ) && !defined(powerpc_HOST_ARCH) ) || \
-    defined(kfreebsdgnu_HOST_OS)
-/* Don't use mmap on powerpc-apple-darwin as mmap doesn't support
+#if !defined(powerpc_HOST_ARCH) && \
+    (   defined(linux_HOST_OS    ) || defined(freebsd_HOST_OS) || \
+        defined(dragonfly_HOST_OS) || defined(netbsd_HOST_OS ) || \
+        defined(openbsd_HOST_OS  ) || defined(darwin_HOST_OS ) || \
+        defined(kfreebsdgnu_HOST_OS) )
+/* Don't use mmap on powerpc_HOST_ARCH as mmap doesn't support
  * reallocating but we need to allocate jump islands just after each
  * object images. Otherwise relative branches to jump islands can fail
  * due to 24-bits displacement overflow.
@@ -132 +132 @@
 static ObjectCode* mkOc( char *path, char *image, int imageSize,
                          char *archiveMemberName
 #ifndef USE_MMAP
-#ifdef darwin_HOST_OS
+#ifdef powerpc_HOST_ARCH
                        , int misalignment
 #endif
 #endif
@@ -156 +156 @@
 static int ocGetNames_MachO       ( ObjectCode* oc );
 static int ocResolve_MachO        ( ObjectCode* oc );
 
-#ifndef USE_MMAP
+#if !defined USE_MMAP && defined(darwin_HOST_OS)
 static int machoGetMisalignment( FILE * );
 #endif
 #if defined(powerpc_HOST_ARCH) || defined(x86_64_HOST_ARCH)
@@ -981 +981 @@
       SymI_HasProto(stg_yieldzh)                        \
       SymI_NeedsProto(stg_interp_constr_entry)          \
       SymI_HasProto(stg_arg_bitmaps)                    \
-      SymI_HasProto(large_alloc_lim)                    \
+      SymI_HasProto(alloc_blocks_lim)                   \
       SymI_HasProto(g0)                                 \
       SymI_HasProto(allocate)                           \
       SymI_HasProto(allocateExec)                       \
@@ -1591 +1591 @@
        } else {
            if ((W_)result > 0x80000000) {
                // oops, we were given memory over 2Gb
-#if defined(freebsd_HOST_OS)  || defined(kfreebsdgnu_HOST_OS) || defined(dragonfly_HOST_OS)
+#if defined(freebsd_HOST_OS) || defined(kfreebsdgnu_HOST_OS) || defined(dragonfly_HOST_OS)
                // Some platforms require MAP_FIXED.  This is normally
                // a bad idea, because MAP_FIXED will overwrite
                // existing mappings.
@@ -1630 +1630 @@
 mkOc( char *path, char *image, int imageSize,
       char *archiveMemberName
 #ifndef USE_MMAP
-#ifdef darwin_HOST_OS
+#ifdef powerpc_HOST_ARCH
     , int misalignment
 #endif
 #endif
@@ -1669 +1669 @@
    oc->proddables        = NULL;
 
 #ifndef USE_MMAP
-#ifdef darwin_HOST_OS
+#ifdef powerpc_HOST_ARCH
    oc->misalignment = misalignment;
 #endif
 #endif
@@ -1696 +1696 @@
     char tmp[12];
     char *gnuFileIndex;
     int gnuFileIndexSize;
-#if !defined(USE_MMAP) && defined(darwin_HOST_OS)
+#if !defined(USE_MMAP) && defined(powerpc_HOST_ARCH)
     int misalignment;
 #endif
 
@@ -1890 +1890 @@
 
             oc = mkOc(path, image, memberSize, archiveMemberName
 #ifndef USE_MMAP
-#ifdef darwin_HOST_OS
+#ifdef powerpc_HOST_ARCH
                      , misalignment
 #endif
 #endif
@@ -1971 +1971 @@
    int fd;
 #else
    FILE *f;
-#  if defined(darwin_HOST_OS)
+#  if defined(powerpc_HOST_ARCH)
    int misalignment;
 #  endif
 #endif
@@ -2065 +2065 @@
 
    oc = mkOc(path, image, fileSize, NULL
 #ifndef USE_MMAP
-#ifdef darwin_HOST_OS
+#ifdef powerpc_HOST_ARCH
             , misalignment
 #endif
 #endif
@@ -2315 +2315 @@
   int aligned;
 #ifndef USE_MMAP
   int misalignment = 0;
-#ifdef darwin_HOST_OS
+#ifdef powerpc_HOST_ARCH
   misalignment = oc->misalignment;
 #endif
 #endif
@@ -5344 +5344 @@
 }
 #endif
 
-#ifndef USE_MMAP
+#if !defined USE_MMAP && defined(darwin_HOST_OS)
 /*
  * Figure out by how much to shift the entire Mach-O file in memory
  * when loading so that its single segment ends up 16-byte-aligned

rts/LinkerInternals.h

@@ -80 +80 @@
     /* ptr to malloc'd lump of memory holding the obj file */
     char*      image;
 
-#ifdef darwin_HOST_OS
+#ifdef powerpc_HOST_ARCH
     /* record by how much image has been deliberately misaligned
        after allocation, so that we can use realloc */
     int        misalignment;