diff options
| author | Kavon Farvardin <kavon@farvard.in> | 2018-09-23 15:29:37 -0500 |
|---|---|---|
| committer | Kavon Farvardin <kavon@farvard.in> | 2018-09-23 15:29:37 -0500 |
| commit | 84c2ad99582391005b5e873198b15e9e9eb4f78d (patch) | |
| tree | caa8c2f2ec7e97fbb4977263c6817c9af5025cf4 /rts/linker/LoadArchive.c | |
| parent | 8ddb47cfcf5776e9a3c55fd37947c8a95e00fa12 (diff) | |
| parent | e68b439fe5de61b9a2ca51af472185c62ccb8b46 (diff) | |
| download | haskell-wip/T13904.tar.gz | |
update to current master againwip/T13904
Diffstat (limited to 'rts/linker/LoadArchive.c')
| -rw-r--r-- | rts/linker/LoadArchive.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/rts/linker/LoadArchive.c b/rts/linker/LoadArchive.c index 3c4bd44a28..8c32585681 100644 --- a/rts/linker/LoadArchive.c +++ b/rts/linker/LoadArchive.c @@ -22,6 +22,7 @@ #include <string.h> #include <stddef.h> #include <ctype.h> +#include <fs_rts.h> #define FAIL(...) do {\ errorBelch("loadArchive: "__VA_ARGS__); \ @@ -260,7 +261,7 @@ static HsInt loadArchive_ (pathchar *path) int misalignment = 0; DEBUG_LOG("start\n"); - DEBUG_LOG("Loading archive `%" PATH_FMT" '\n", path); + DEBUG_LOG("Loading archive `%" PATH_FMT "'\n", path); /* Check that we haven't already loaded this archive. Ignore requests to load multiple times */ @@ -489,12 +490,7 @@ static HsInt loadArchive_ (pathchar *path) DEBUG_LOG("Member is an object file...loading...\n"); -#if defined(mingw32_HOST_OS) - // TODO: We would like to use allocateExec here, but allocateExec - // cannot currently allocate blocks large enough. - image = allocateImageAndTrampolines(path, fileName, f, memberSize, - isThin); -#elif defined(darwin_HOST_OS) || defined(ios_HOST_OS) +#if defined(darwin_HOST_OS) || defined(ios_HOST_OS) if (RTS_LINKER_USE_MMAP) image = mmapForLinker(memberSize, MAP_ANONYMOUS, -1, 0); else { @@ -505,7 +501,7 @@ static HsInt loadArchive_ (pathchar *path) image += misalignment; } -#else // not windows or darwin +#else // not darwin image = stgMallocBytes(memberSize, "loadArchive(image)"); #endif if (isThin) { |