[Git][ghc/ghc][wip/angerman/out-of-range-reloc] Cleanup (2)

[Moritz Angermann]

Moritz Angermann pushed to branch wip/angerman/out-of-range-reloc at Glasgow Haskell Compiler / GHC


Commits:
8c3c316c by Moritz Angermann at 2020-06-04T14:40:27+08:00
Cleanup (2)

- - - - -


1 changed file:

- rts/Linker.c


Changes:

=====================================
rts/Linker.c
=====================================
@@ -221,7 +221,6 @@ int ocTryLoad( ObjectCode* oc );
  * We pick a default address based on the OS, but also make this
  * configurable via an RTS flag (+RTS -xm)
  */
-#define MMAP_MAX_RETRY 100
 
 #if (defined(aarch64_TARGET_ARCH) || defined(aarch64_HOST_ARCH))
 // Try to use stg_upd_frame_info as the base. We need to be within +-4GB of that
@@ -1038,6 +1037,8 @@ mmap_next(void *addr, size_t length, int prot, int flags, int fd, off_t offset)
     if(mem == NULL) return mem;
     if(mem == target) return mem;
     munmap(mem, length);
+    IF_DEBUG(linker && (i % 1024 == 0),
+      debugBelch("mmap_next failed to find suitable space in %p - %p\n", addr, target));
   }
   return NULL;
 }



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8c3c316cdd220b8382535a3f2a255107596f7d43

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8c3c316cdd220b8382535a3f2a255107596f7d43
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20200604/233dd357/attachment.html>