diff options
| author | Austin Seipp <austin@well-typed.com> | 2014-10-24 17:57:50 -0500 |
|---|---|---|
| committer | Austin Seipp <austin@well-typed.com> | 2014-10-24 19:09:10 -0500 |
| commit | 1addef805ceacb13d346eb14190e1c9b88d02d2d (patch) | |
| tree | 1748478c34c309e26694f557a86ec55efb4f1b64 /rts/Linker.c | |
| parent | aa4799534225e3fc6bbde0d5e5eeab8868cc3111 (diff) | |
| download | haskell-1addef805ceacb13d346eb14190e1c9b88d02d2d.tar.gz | |
Fix windows build failure.
Authored-by: Simon Marlow <marlowsd@gmail.com>
Signed-off-by: Austin Seipp <austin@well-typed.com>
Diffstat (limited to 'rts/Linker.c')
| -rw-r--r-- | rts/Linker.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/rts/Linker.c b/rts/Linker.c index 4ab7cc5b09..c40086de5a 100644 --- a/rts/Linker.c +++ b/rts/Linker.c @@ -217,8 +217,9 @@ static int ocRunInit_PEi386 ( ObjectCode* oc ); static void *lookupSymbolInDLLs ( unsigned char *lbl ); static void zapTrailingAtSign ( unsigned char *sym ); static char *allocateImageAndTrampolines ( + pathchar* arch_name, char* member_name, #if defined(x86_64_HOST_ARCH) - FILE* f, pathchar* arch_name, char* member_name, + FILE* f, #endif int size ); #if defined(x86_64_HOST_ARCH) @@ -2725,9 +2726,9 @@ loadArchive( pathchar *path ) #elif defined(mingw32_HOST_OS) // TODO: We would like to use allocateExec here, but allocateExec // cannot currently allocate blocks large enough. - image = allocateImageAndTrampolines( + image = allocateImageAndTrampolines(path, fileName, #if defined(x86_64_HOST_ARCH) - f, path, fileName, + f, #endif memberSize); #elif defined(darwin_HOST_OS) @@ -2946,9 +2947,9 @@ loadObj( pathchar *path ) # if defined(mingw32_HOST_OS) // TODO: We would like to use allocateExec here, but allocateExec // cannot currently allocate blocks large enough. - image = allocateImageAndTrampolines( + image = allocateImageAndTrampolines(path, "itself", #if defined(x86_64_HOST_ARCH) - f, path, "itself", + f, #endif fileSize); if (image == NULL) { @@ -3663,8 +3664,9 @@ static int verifyCOFFHeader ( COFF_header *hdr, pathchar *filename); */ static char * allocateImageAndTrampolines ( + pathchar* arch_name, char* member_name, #if defined(x86_64_HOST_ARCH) - FILE* f, pathchar* arch_name, char* member_name, + FILE* f, #endif int size ) { |