5 files changed, 11 insertions, 11 deletions
diff --git a/libraries/base/System/CPUTime.hsc b/libraries/base/System/CPUTime.hsc
index 19d21e2135..c98c5ddaf6 100644
--- a/libraries/base/System/CPUTime.hsc
+++ b/libraries/base/System/CPUTime.hsc
@@ -34,7 +34,7 @@ import System.IO.Unsafe (unsafePerformIO)
 #if defined(mingw32_HOST_OS)
 import qualified System.CPUTime.Windows as I
 
-#elif defined(js_HOST_ARCH)
+#elif defined(javascript_HOST_ARCH)
 import qualified System.CPUTime.Javascript as I
 
 #elif _POSIX_TIMERS > 0 && defined(_POSIX_CPUTIME) && _POSIX_CPUTIME >= 0
diff --git a/libraries/base/System/Environment.hs b/libraries/base/System/Environment.hs
index c5e5d6d039..771b490196 100644
--- a/libraries/base/System/Environment.hs
+++ b/libraries/base/System/Environment.hs
@@ -19,7 +19,7 @@ module System.Environment
     (
       getArgs,
       getProgName,
-#if !defined(js_HOST_ARCH)
+#if !defined(javascript_HOST_ARCH)
       executablePath,
 #endif
       getExecutablePath,
diff --git a/libraries/base/System/Environment/ExecutablePath.hsc b/libraries/base/System/Environment/ExecutablePath.hsc
index ede63d5e6d..cb9fad7a7e 100644
--- a/libraries/base/System/Environment/ExecutablePath.hsc
+++ b/libraries/base/System/Environment/ExecutablePath.hsc
@@ -18,12 +18,12 @@
 
 module System.Environment.ExecutablePath
   ( getExecutablePath
-##if !defined(js_HOST_ARCH)
+##if !defined(javascript_HOST_ARCH)
   , executablePath
 ##endif
   ) where
 
-##if defined(js_HOST_ARCH)
+##if defined(javascript_HOST_ARCH)
 
 getExecutablePath :: IO FilePath
 getExecutablePath = return "a.jsexe"
diff --git a/libraries/base/System/Posix/Internals.hs b/libraries/base/System/Posix/Internals.hs
index 4a82bbae1c..89fa80672f 100644
--- a/libraries/base/System/Posix/Internals.hs
+++ b/libraries/base/System/Posix/Internals.hs
@@ -429,7 +429,7 @@ c_safe_open filepath oflags mode =
 hostIsThreaded :: Bool
 hostIsThreaded = rtsIsThreaded_ /= 0
 
-#if !defined(js_HOST_ARCH)
+#if !defined(javascript_HOST_ARCH)
 foreign import ccall unsafe "HsBase.h __hscore_open"
    c_open :: CFilePath -> CInt -> CMode -> IO CInt
 
@@ -454,7 +454,7 @@ foreign import ccall unsafe "HsBase.h __hscore_lstat"
    lstat :: CFilePath -> Ptr CStat -> IO CInt
 #endif
 
-#if defined(js_HOST_ARCH)
+#if defined(javascript_HOST_ARCH)
 
 foreign import javascript unsafe "(() => { return rts_isThreaded; })" rtsIsThreaded_ :: Int
 foreign import javascript interruptible "(($1_1, $2_2, $2, $c) => { return h$base_access($1_1,$2_2,$2,$c); })"
@@ -743,7 +743,7 @@ foreign import ccall unsafe "HsBase.h getpid"
 #endif
 #endif
 
-#if !defined(js_HOST_ARCH)
+#if !defined(javascript_HOST_ARCH)
 foreign import ccall unsafe "HsBase.h __hscore_stat"
    c_stat :: CFilePath -> Ptr CStat -> IO CInt
 
@@ -751,7 +751,7 @@ foreign import ccall unsafe "HsBase.h __hscore_ftruncate"
    c_ftruncate :: CInt -> COff -> IO CInt
 #endif
 
-#if !defined(mingw32_HOST_OS) && !defined(js_HOST_ARCH)
+#if !defined(mingw32_HOST_OS) && !defined(javascript_HOST_ARCH)
 foreign import capi unsafe "HsBase.h fcntl"
    c_fcntl_read  :: CInt -> CInt -> IO CInt
 
@@ -822,7 +822,7 @@ c_waitpid _ _ _ = ioError (ioeSetLocation unsupportedOperation "waitpid")
 
 #endif
 
-#if !defined(js_HOST_ARCH)
+#if !defined(javascript_HOST_ARCH)
 -- POSIX flags only:
 foreign import ccall unsafe "HsBase.h __hscore_o_rdonly" o_RDONLY :: CInt
 foreign import ccall unsafe "HsBase.h __hscore_o_wronly" o_WRONLY :: CInt
diff --git a/libraries/base/System/Timeout.hs b/libraries/base/System/Timeout.hs
index bf215c747a..60908066d4 100644
--- a/libraries/base/System/Timeout.hs
+++ b/libraries/base/System/Timeout.hs
@@ -17,7 +17,7 @@
 -- TODO: Inspect is still suitable.
 module System.Timeout ( Timeout, timeout ) where
 
-#if !defined(mingw32_HOST_OS) && !defined(js_HOST_ARCH)
+#if !defined(mingw32_HOST_OS) && !defined(javascript_HOST_ARCH)
 import Control.Monad
 import GHC.Event           (getSystemTimerManager,
                             registerTimeout, unregisterTimeout)
@@ -99,7 +99,7 @@ timeout :: Int -> IO a -> IO (Maybe a)
 timeout n f
     | n <  0    = fmap Just f
     | n == 0    = return Nothing
-#if !defined(mingw32_HOST_OS) && !defined(js_HOST_ARCH)
+#if !defined(mingw32_HOST_OS) && !defined(javascript_HOST_ARCH)
     | rtsSupportsBoundThreads = do
         -- In the threaded RTS, we use the Timer Manager to delay the
         -- (fairly expensive) 'forkIO' call until the timeout has expired.