diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2017-04-04 16:15:32 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2017-04-04 16:57:01 -0400 |
| commit | ff267f37788eb47e1d9da15bf396eccec4297bf6 (patch) | |
| tree | 0d9b9e50b2cbd4a79c1a479eaf86df0d13bb657e /rts | |
| parent | 7e340c2bbf4a56959bd1e95cdd1cfdb2b7e537c2 (diff) | |
| download | haskell-ff267f37788eb47e1d9da15bf396eccec4297bf6.tar.gz | |
rts: Fix lingering #ifs
These were missed in D3278.
Diffstat (limited to 'rts')
| -rw-r--r-- | rts/Linker.c | 6 | ||||
| -rw-r--r-- | rts/LinkerInternals.h | 2 | ||||
| -rw-r--r-- | rts/linker/Elf.c | 4 | ||||
| -rw-r--r-- | rts/linker/SymbolExtras.c | 2 | ||||
| -rw-r--r-- | rts/linker/SymbolExtras.h | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/rts/Linker.c b/rts/Linker.c index 529af9ac9a..7366904831 100644 --- a/rts/Linker.c +++ b/rts/Linker.c @@ -1174,7 +1174,7 @@ void freeObjectCode (ObjectCode *oc) /* Free symbol_extras. On x86_64 Windows, symbol_extras are allocated * alongside the image, so we don't need to free. */ -#if NEED_SYMBOL_EXTRAS && (!defined(x86_64_HOST_ARCH) || !defined(mingw32_HOST_OS)) +#if defined(NEED_SYMBOL_EXTRAS) && (!defined(x86_64_HOST_ARCH) || !defined(mingw32_HOST_OS)) if (RTS_LINKER_USE_MMAP) { if (!USE_CONTIGUOUS_MMAP && oc->symbol_extras != NULL) { m32_free(oc->symbol_extras, @@ -1244,7 +1244,7 @@ mkOc( pathchar *path, char *image, int imageSize, oc->sections = NULL; oc->proddables = NULL; oc->stable_ptrs = NULL; -#if NEED_SYMBOL_EXTRAS +#if defined(NEED_SYMBOL_EXTRAS) oc->symbol_extras = NULL; #endif oc->imageMapped = mapped; @@ -1467,7 +1467,7 @@ HsInt loadOc (ObjectCode* oc) return r; } -#if NEED_SYMBOL_EXTRAS +#if defined(NEED_SYMBOL_EXTRAS) # if defined(OBJFORMAT_MACHO) r = ocAllocateSymbolExtras_MachO ( oc ); if (!r) { diff --git a/rts/LinkerInternals.h b/rts/LinkerInternals.h index a04db77b92..02fe167829 100644 --- a/rts/LinkerInternals.h +++ b/rts/LinkerInternals.h @@ -175,7 +175,7 @@ typedef struct _ObjectCode { unsigned int pltIndex; #endif -#if NEED_SYMBOL_EXTRAS +#if defined(NEED_SYMBOL_EXTRAS) SymbolExtra *symbol_extras; unsigned long first_symbol_extra; unsigned long n_symbol_extras; diff --git a/rts/linker/Elf.c b/rts/linker/Elf.c index 73e34d38a7..77107a73ea 100644 --- a/rts/linker/Elf.c +++ b/rts/linker/Elf.c @@ -1445,7 +1445,7 @@ do_Elf_Rela_relocations ( ObjectCode* oc, char* ehdrC, break; # endif -#if x86_64_HOST_ARCH +#if defined(x86_64_HOST_ARCH) case R_X86_64_64: *(Elf64_Xword *)P = value; break; @@ -1673,7 +1673,7 @@ int ocRunInit_ELF( ObjectCode *oc ) * PowerPC & X86_64 ELF specifics */ -#if NEED_SYMBOL_EXTRAS +#if defined(NEED_SYMBOL_EXTRAS) int ocAllocateSymbolExtras_ELF( ObjectCode *oc ) { diff --git a/rts/linker/SymbolExtras.c b/rts/linker/SymbolExtras.c index 73f219f428..07000331ef 100644 --- a/rts/linker/SymbolExtras.c +++ b/rts/linker/SymbolExtras.c @@ -11,7 +11,7 @@ #include "LinkerInternals.h" -#if NEED_SYMBOL_EXTRAS +#if defined(NEED_SYMBOL_EXTRAS) #if !defined(x86_64_HOST_ARCH) || !defined(mingw32_HOST_OS) #include "RtsUtils.h" diff --git a/rts/linker/SymbolExtras.h b/rts/linker/SymbolExtras.h index 5e2a6d0208..25cb022ab0 100644 --- a/rts/linker/SymbolExtras.h +++ b/rts/linker/SymbolExtras.h @@ -6,7 +6,7 @@ #include "BeginPrivate.h" -#if NEED_SYMBOL_EXTRAS +#if defined(NEED_SYMBOL_EXTRAS) int ocAllocateSymbolExtras( ObjectCode* oc, int count, int first ); |