[commit: ghc] master: [MachO] Use OBJFORMAT_MACHO. (185834e)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/185834e74f3c20f7ea727cc799436afd8e16cfa4/ghc

>---------------------------------------------------------------

commit 185834e74f3c20f7ea727cc799436afd8e16cfa4
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Mon Apr 10 21:39:02 2017 -0400

    [MachO] Use OBJFORMAT_MACHO.
    
    Reviewers: bgamari, austin, erikd, simonmar, rwbarton
    
    Reviewed By: rwbarton
    
    Subscribers: rwbarton, thomie
    
    Differential Revision: https://phabricator.haskell.org/D3433


>---------------------------------------------------------------

185834e74f3c20f7ea727cc799436afd8e16cfa4
 rts/linker/LoadArchive.c | 2 +-
 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 a33c00d..c83b3ba 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 f78bfca..5b2dced 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 */