[commit: ghc] master: Fix two occurences of `x86_HOST_ARCH` (34eaf2b)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/34eaf2b8d699c49ba367f26840052c8c9aa031b1/ghc

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

commit 34eaf2b8d699c49ba367f26840052c8c9aa031b1
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sat Dec 19 23:13:11 2015 +0100

    Fix two occurences of `x86_HOST_ARCH`
    
    The proper name for the define is `i386_HOST_ARCH`
    
    One was introduced back in 2011 via
    035b8ebb5405efbcbfd3474821a877add1feca1e / #4914
    and the other one more recently via
    4905b83a2d448c65ccced385343d4e8124548a3b
    
    We may want to add some validation to catch such typos early on...
    
    Reviewed By: erikd
    
    Differential Revision: https://phabricator.haskell.org/D1664


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

34eaf2b8d699c49ba367f26840052c8c9aa031b1
 libraries/ghci/GHCi/InfoTable.hsc | 2 +-
 rts/RtsUtils.c                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/ghci/GHCi/InfoTable.hsc b/libraries/ghci/GHCi/InfoTable.hsc
index c3e20f5..34604ea 100644
--- a/libraries/ghci/GHCi/InfoTable.hsc
+++ b/libraries/ghci/GHCi/InfoTable.hsc
@@ -66,7 +66,7 @@ platform =
        ArchSparc
 #elif defined(powerpc_HOST_ARCH)
        ArchPPC
-#elif defined(x86_HOST_ARCH)
+#elif defined(i386_HOST_ARCH)
        ArchX86
 #elif defined(x86_64_HOST_ARCH)
        ArchX86_64
diff --git a/rts/RtsUtils.c b/rts/RtsUtils.c
index ddf5a1f..72e19a0 100644
--- a/rts/RtsUtils.c
+++ b/rts/RtsUtils.c
@@ -319,7 +319,7 @@ int rts_isDynamic(void)
 // Used for detecting a non-empty FPU stack on x86 (see #4914)
 void checkFPUStack(void)
 {
-#ifdef x86_HOST_ARCH
+#ifdef i386_HOST_ARCH
     static unsigned char buf[108];
     asm("FSAVE %0":"=m" (buf));