diff options
| author | Moritz Angermann <moritz.angermann@gmail.com> | 2017-04-10 21:39:02 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2017-04-10 21:39:03 -0400 |
| commit | 185834e74f3c20f7ea727cc799436afd8e16cfa4 (patch) | |
| tree | 4b37b90dd05cafc5562d7b75d21b68c54840b51c | |
| parent | d4631078ece3cfa4179c70f5937738be72659dba (diff) | |
| download | haskell-185834e74f3c20f7ea727cc799436afd8e16cfa4.tar.gz | |
[MachO] Use OBJFORMAT_MACHO.
Reviewers: bgamari, austin, erikd, simonmar, rwbarton
Reviewed By: rwbarton
Subscribers: rwbarton, thomie
Differential Revision: https://phabricator.haskell.org/D3433
| -rw-r--r-- | rts/linker/LoadArchive.c | 2 | ||||
| -rw-r--r-- | rts/linker/MachOTypes.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/rts/linker/LoadArchive.c b/rts/linker/LoadArchive.c index a33c00da3e..c83b3baf25 100644 --- a/rts/linker/LoadArchive.c +++ b/rts/linker/LoadArchive.c @@ -13,7 +13,7 @@ /* Platform specific headers */ #if defined(OBJFORMAT_PEi386) # include "linker/PEi386.h" -#elif defined(darwin_HOST_OS) || defined(ios_HOST_OS) +#elif defined(OBJFORMAT_MACHO) # include "linker/MachO.h" # include <regex.h> # include <mach/machine.h> diff --git a/rts/linker/MachOTypes.h b/rts/linker/MachOTypes.h index f78bfca555..5b2dced81b 100644 --- a/rts/linker/MachOTypes.h +++ b/rts/linker/MachOTypes.h @@ -1,7 +1,7 @@ #ifndef MachOTypes_h #define MachOTypes_h -#if defined(darwin_HOST_OS) || defined(ios_HOST_OS) +#if defined(OBJFORMAT_MACHO) #include "ghcplatform.h" @@ -129,5 +129,5 @@ typedef struct _SectionFormatInfo { MachORelocationInfo * relocation_info; } SectionFormatInfo; -#endif /* darwin_HOST_OS || ios_HOST_OS */ +#endif /* OBJECTFORMAT_MACHO */ #endif /* MachOTypes_h */ |