[commit: ghc] master: Fix iossimulator (094a752)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/094a752a1561b5cb8640648b0882cea97831226c/ghc

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

commit 094a752a1561b5cb8640648b0882cea97831226c
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Thu May 11 18:14:47 2017 +0800

    Fix iossimulator
    
    The introduction of the aarch64 linker for
    iOS forgot that the ios simulator was still using
    the x86_64/mach-o linker, which requires the use of
    symbol extras.  Until this is overhauled (see #13678),
    we should revert to the symbol extras logic for
    x86_64-apple-ios
    
    Reviewers: austin, bgamari, erikd, simonmar
    
    Reviewed By: simonmar
    
    Subscribers: rwbarton, thomie
    
    Differential Revision: https://phabricator.haskell.org/D3556


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

094a752a1561b5cb8640648b0882cea97831226c
 rts/LinkerInternals.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/rts/LinkerInternals.h b/rts/LinkerInternals.h
index a884561..b8c411d 100644
--- a/rts/LinkerInternals.h
+++ b/rts/LinkerInternals.h
@@ -109,6 +109,11 @@ typedef struct ForeignExportStablePtr_ {
 #endif /* ios_HOST_OS */
 #endif
 
+/* iOS Simulator however, needs symbol extras for now (#13678) */
+#if defined(ios_HOST_OS) && defined(x86_64_HOST_ARCH)
+#define NEED_SYMBOL_EXTRAS 1
+#endif
+
 /* Jump Islands are sniplets of machine code required for relative
  * address relocations on the PowerPC, x86_64 and ARM.
  */