JS: replace "js" architecture with "javascript"

Despite Cabal supporting any architecture name, `cabal --check` only
supports a few built-in ones. Sadly `cabal --check` is used by Hackage
hence using any non built-in name in a package (e.g. `arch(js)`) is
rejected and the package is prevented from being uploaded on Hackage.

Luckily built-in support for the `javascript` architecture was added for
GHCJS a while ago. In order to allow newer `base` to be uploaded on
Hackage we make the switch from `js` to `javascript` architecture.

Fixes #22740.

Co-authored-by: Ben Gamari <ben@smart-cactus.org>

13 files changed, 34 insertions, 34 deletions

diff --git a/libraries/base/GHC/Conc/IO.hs b/libraries/base/GHC/Conc/IO.hs
index 869847e77a..4f7795e369 100644
--- a/libraries/base/GHC/Conc/IO.hs
+++ b/libraries/base/GHC/Conc/IO.hs
@@ -65,12 +65,12 @@ import GHC.IO.SubSystem
 import GHC.Conc.Windows (asyncRead, asyncWrite, asyncDoProc, asyncReadBA,
                          asyncWriteBA, ConsoleEvent(..), win32ConsoleHandler,
                          toWin32ConsoleEvent)
-#elif !defined(js_HOST_ARCH)
+#elif !defined(javascript_HOST_ARCH)
 import qualified GHC.Event.Thread as Event
 #endif
 
 ensureIOManagerIsRunning :: IO ()
-#if defined(js_HOST_ARCH)
+#if defined(javascript_HOST_ARCH)
 ensureIOManagerIsRunning = pure ()
 #elif !defined(mingw32_HOST_OS)
 ensureIOManagerIsRunning = Event.ensureIOManagerIsRunning
@@ -91,7 +91,7 @@ interruptIOManager = Windows.interruptIOManager
 #endif
 
 ioManagerCapabilitiesChanged :: IO ()
-#if !defined(mingw32_HOST_OS) && !defined(js_HOST_ARCH)
+#if !defined(mingw32_HOST_OS) && !defined(javascript_HOST_ARCH)
 ioManagerCapabilitiesChanged = Event.ioManagerCapabilitiesChanged
 #else
 ioManagerCapabilitiesChanged = return ()
@@ -105,7 +105,7 @@ ioManagerCapabilitiesChanged = return ()
 -- that has been used with 'threadWaitRead', use 'closeFdWith'.
 threadWaitRead :: Fd -> IO ()
 threadWaitRead fd
-#if !defined(mingw32_HOST_OS) && !defined(js_HOST_ARCH)
+#if !defined(mingw32_HOST_OS) && !defined(javascript_HOST_ARCH)
   | threaded  = Event.threadWaitRead fd
 #endif
   | otherwise = IO $ \s ->
@@ -121,7 +121,7 @@ threadWaitRead fd
 -- that has been used with 'threadWaitWrite', use 'closeFdWith'.
 threadWaitWrite :: Fd -> IO ()
 threadWaitWrite fd
-#if !defined(mingw32_HOST_OS) && !defined(js_HOST_ARCH)
+#if !defined(mingw32_HOST_OS) && !defined(javascript_HOST_ARCH)
   | threaded  = Event.threadWaitWrite fd
 #endif
   | otherwise = IO $ \s ->
@@ -135,7 +135,7 @@ threadWaitWrite fd
 -- in the file descriptor.
 threadWaitReadSTM :: Fd -> IO (Sync.STM (), IO ())
 threadWaitReadSTM fd
-#if !defined(mingw32_HOST_OS) && !defined(js_HOST_ARCH)
+#if !defined(mingw32_HOST_OS) && !defined(javascript_HOST_ARCH)
   | threaded  = Event.threadWaitReadSTM fd
 #endif
   | otherwise = do
@@ -154,7 +154,7 @@ threadWaitReadSTM fd
 -- in the file descriptor.
 threadWaitWriteSTM :: Fd -> IO (Sync.STM (), IO ())
 threadWaitWriteSTM fd
-#if !defined(mingw32_HOST_OS) && !defined(js_HOST_ARCH)
+#if !defined(mingw32_HOST_OS) && !defined(javascript_HOST_ARCH)
   | threaded  = Event.threadWaitWriteSTM fd
 #endif
   | otherwise = do
@@ -179,7 +179,7 @@ closeFdWith :: (Fd -> IO ()) -- ^ Low-level action that performs the real close.
             -> Fd            -- ^ File descriptor to close.
             -> IO ()
 closeFdWith close fd
-#if !defined(mingw32_HOST_OS) && !defined(js_HOST_ARCH)
+#if !defined(mingw32_HOST_OS) && !defined(javascript_HOST_ARCH)
   | threaded  = Event.closeFdWith close fd
 #endif
   | otherwise = close fd
@@ -199,7 +199,7 @@ threadDelay time
 #if defined(mingw32_HOST_OS)
   | isWindowsNativeIO = Windows.threadDelay time
   | threaded          = Windows.threadDelay time
-#elif !defined(js_HOST_ARCH)
+#elif !defined(javascript_HOST_ARCH)
   | threaded  = Event.threadDelay time
 #endif
   | otherwise         = IO $ \s ->
@@ -219,11 +219,11 @@ registerDelay _usecs
 #if defined(mingw32_HOST_OS)
   | isWindowsNativeIO = Windows.registerDelay _usecs
   | threaded          = Windows.registerDelay _usecs
-#elif !defined(js_HOST_ARCH)
+#elif !defined(javascript_HOST_ARCH)
   | threaded          = Event.registerDelay _usecs
 #endif
   | otherwise         = errorWithoutStackTrace "registerDelay: requires -threaded"
 
-#if !defined(js_HOST_ARCH)
+#if !defined(javascript_HOST_ARCH)
 foreign import ccall unsafe "rtsSupportsBoundThreads" threaded :: Bool
 #endif
diff --git a/libraries/base/GHC/Conc/Windows.hs b/libraries/base/GHC/Conc/Windows.hs
index e9733806e7..b22307e1f2 100644
--- a/libraries/base/GHC/Conc/Windows.hs
+++ b/libraries/base/GHC/Conc/Windows.hs
@@ -19,7 +19,7 @@
 
 -- #not-home
 module GHC.Conc.Windows
-#if defined(js_HOST_ARCH)
+#if defined(javascript_HOST_ARCH)
        () where
 #else
        ( ensureIOManagerIsRunning
diff --git a/libraries/base/GHC/Event.hs b/libraries/base/GHC/Event.hs
index a9acda5516..5a98a9aeda 100644
--- a/libraries/base/GHC/Event.hs
+++ b/libraries/base/GHC/Event.hs
@@ -11,7 +11,7 @@
 -- ----------------------------------------------------------------------------
 
 module GHC.Event
-#if defined(js_HOST_ARCH)
+#if defined(javascript_HOST_ARCH)
     ( ) where
 #else
     ( -- * Types
diff --git a/libraries/base/GHC/Event/Thread.hs b/libraries/base/GHC/Event/Thread.hs
index f76e9147da..1018edc253 100644
--- a/libraries/base/GHC/Event/Thread.hs
+++ b/libraries/base/GHC/Event/Thread.hs
@@ -5,7 +5,7 @@
 #include <ghcplatform.h>
 
 module GHC.Event.Thread
-#if defined(js_HOST_ARCH)
+#if defined(javascript_HOST_ARCH)
     ( ) where
 #else
     ( getSystemEventManager
diff --git a/libraries/base/GHC/Event/TimerManager.hs b/libraries/base/GHC/Event/TimerManager.hs
index bb26741d58..b334924a9d 100644
--- a/libraries/base/GHC/Event/TimerManager.hs
+++ b/libraries/base/GHC/Event/TimerManager.hs
@@ -7,7 +7,7 @@
 
 -- TODO: use the new Windows IO manager
 module GHC.Event.TimerManager
-#if defined(js_HOST_ARCH)
+#if defined(javascript_HOST_ARCH)
     () where
 #else
     ( -- * Types
diff --git a/libraries/base/GHC/IO/Encoding.hs b/libraries/base/GHC/IO/Encoding.hs
index ea738c56a4..4759356f4c 100644
--- a/libraries/base/GHC/IO/Encoding.hs
+++ b/libraries/base/GHC/IO/Encoding.hs
@@ -180,7 +180,7 @@ initLocaleEncoding, initFileSystemEncoding, initForeignEncoding :: TextEncoding
 -- N.B. initLocaleEncoding is exported for use in System.IO.localeEncoding.
 -- NOINLINE ensures that this result is shared.
 
-#if defined(js_HOST_ARCH)
+#if defined(javascript_HOST_ARCH)
 initLocaleEncoding     = utf8
 initFileSystemEncoding = utf8
 initForeignEncoding    = utf8
diff --git a/libraries/base/GHC/IO/Encoding/CodePage/API.hs b/libraries/base/GHC/IO/Encoding/CodePage/API.hs
index ef6bebd002..6136156cdb 100644
--- a/libraries/base/GHC/IO/Encoding/CodePage/API.hs
+++ b/libraries/base/GHC/IO/Encoding/CodePage/API.hs
@@ -32,7 +32,7 @@ import GHC.ForeignPtr (castForeignPtr)
 
 import System.Posix.Internals
 
-#if defined(js_HOST_ARCH)
+#if defined(javascript_HOST_ARCH)
 mkCodePageEncoding :: String
 mkCodePageEncoding = ""
 #else
diff --git a/libraries/base/GHC/IO/FD.hs b/libraries/base/GHC/IO/FD.hs
index 2886658a5c..2d4b92fa4f 100644
--- a/libraries/base/GHC/IO/FD.hs
+++ b/libraries/base/GHC/IO/FD.hs
@@ -570,7 +570,7 @@ indicates that there's no data, we call threadWaitRead.
 
 readRawBufferPtr :: String -> FD -> Ptr Word8 -> Int -> CSize -> IO Int
 readRawBufferPtr loc !fd !buf !off !len
-#if defined(js_HOST_ARCH)
+#if defined(javascript_HOST_ARCH)
   = fmap fromIntegral . uninterruptibleMask_ $
     throwErrnoIfMinus1 loc (c_read (fdFD fd) (buf `plusPtr` off) len)
 #else
@@ -592,7 +592,7 @@ readRawBufferPtr loc !fd !buf !off !len
 -- return: -1 indicates EOF, >=0 is bytes read
 readRawBufferPtrNoBlock :: String -> FD -> Ptr Word8 -> Int -> CSize -> IO Int
 readRawBufferPtrNoBlock loc !fd !buf !off !len
-#if defined(js_HOST_ARCH)
+#if defined(javascript_HOST_ARCH)
   = uninterruptibleMask_ $ do
       r <- throwErrnoIfMinus1 loc (c_read (fdFD fd) (buf `plusPtr` off) len)
       case r of
@@ -617,7 +617,7 @@ readRawBufferPtrNoBlock loc !fd !buf !off !len
 
 writeRawBufferPtr :: String -> FD -> Ptr Word8 -> Int -> CSize -> IO CInt
 writeRawBufferPtr loc !fd !buf !off !len
-#if defined(js_HOST_ARCH)
+#if defined(javascript_HOST_ARCH)
   = fmap fromIntegral . uninterruptibleMask_ $
     throwErrnoIfMinus1 loc (c_write (fdFD fd) (buf `plusPtr` off) len)
 #else
@@ -637,7 +637,7 @@ writeRawBufferPtr loc !fd !buf !off !len
 
 writeRawBufferPtrNoBlock :: String -> FD -> Ptr Word8 -> Int -> CSize -> IO CInt
 writeRawBufferPtrNoBlock loc !fd !buf !off !len
-#if defined(js_HOST_ARCH)
+#if defined(javascript_HOST_ARCH)
   = uninterruptibleMask_ $ do
       r <- throwErrnoIfMinus1 loc (c_write (fdFD fd) (buf `plusPtr` off) len)
       case r of
@@ -658,7 +658,7 @@ writeRawBufferPtrNoBlock loc !fd !buf !off !len
     safe_write    = do_write (c_safe_write (fdFD fd) (buf `plusPtr` off) len)
 #endif
 
-#if !defined(js_HOST_ARCH)
+#if !defined(javascript_HOST_ARCH)
 isNonBlocking :: FD -> Bool
 isNonBlocking fd = fdIsNonBlocking fd /= 0
 
@@ -754,14 +754,14 @@ foreign import WINDOWS_CCONV safe "send"
 
 #endif
 
-#if !defined(js_HOST_ARCH)
+#if !defined(javascript_HOST_ARCH)
 foreign import ccall unsafe "rtsSupportsBoundThreads" threaded :: Bool
 #endif
 
 -- -----------------------------------------------------------------------------
 -- utils
 
-#if !defined(mingw32_HOST_OS) && !defined(js_HOST_ARCH)
+#if !defined(mingw32_HOST_OS) && !defined(javascript_HOST_ARCH)
 throwErrnoIfMinus1RetryOnBlock  :: String -> IO CSsize -> IO CSsize -> IO CSsize
 throwErrnoIfMinus1RetryOnBlock loc f on_block  =
   do
diff --git a/libraries/base/GHC/JS/Prim.hs b/libraries/base/GHC/JS/Prim.hs
index 4a9505cbdf..955cadf328 100644
--- a/libraries/base/GHC/JS/Prim.hs
+++ b/libraries/base/GHC/JS/Prim.hs
@@ -10,7 +10,7 @@
 module GHC.JS.Prim ( JSVal(..), JSVal#
                    , JSException(..)
                    , WouldBlockException(..)
-#if defined(js_HOST_ARCH)
+#if defined(javascript_HOST_ARCH)
                   , toIO
                   , resolve
                   , resolveIO
@@ -54,7 +54,7 @@ import           GHC.IO
   argument or result.
 -}
 
-#if defined(js_HOST_ARCH)
+#if defined(javascript_HOST_ARCH)
 data JSVal  = JSVal ByteArray#
 type JSVal# = ByteArray#
 #else
@@ -75,7 +75,7 @@ instance Ex.Exception JSException
 instance Show JSException where
   show (JSException _ xs) = "JavaScript exception: " ++ xs
 
-#if defined(js_HOST_ARCH)
+#if defined(javascript_HOST_ARCH)
 
 {-# NOINLINE toIO #-}
 toIO :: Exts.Any -> IO Exts.Any
diff --git a/libraries/base/GHC/JS/Prim/Internal/Build.hs b/libraries/base/GHC/JS/Prim/Internal/Build.hs
index 78203cd787..18a5c76441 100644
--- a/libraries/base/GHC/JS/Prim/Internal/Build.hs
+++ b/libraries/base/GHC/JS/Prim/Internal/Build.hs
@@ -1,7 +1,7 @@
 -- helpers for constructing JS objects that can be efficiently inlined as literals
 -- no Template Haskell available yet, generated by utils/genBuildObject.hs
 {-# LANGUAGE CPP #-}
-#if !defined(js_HOST_ARCH)
+#if !defined(javascript_HOST_ARCH)
 module GHC.JS.Prim.Internal.Build () where
 #else
 {-# LANGUAGE ForeignFunctionInterface, JavaScriptFFI, GHCForeignImportPrim #-}
diff --git a/libraries/base/GHC/Stack/CCS.hsc b/libraries/base/GHC/Stack/CCS.hsc
index b6d3f83b94..274202efd6 100644
--- a/libraries/base/GHC/Stack/CCS.hsc
+++ b/libraries/base/GHC/Stack/CCS.hsc
@@ -76,7 +76,7 @@ clearCCS :: IO a -> IO a
 clearCCS (IO m) = IO $ \s -> clearCCS## m s
 
 -- | Get the 'CostCentre' at the head of a 'CostCentreStack'.
-#if defined(js_HOST_ARCH)
+#if defined(javascript_HOST_ARCH)
 ccsCC :: Ptr CostCentreStack -> IO (Ptr CostCentre)
 ccsCC p = peekByteOff p 4
 
diff --git a/libraries/base/GHC/TopHandler.hs b/libraries/base/GHC/TopHandler.hs
index 153b5170d7..04045dad05 100644
--- a/libraries/base/GHC/TopHandler.hs
+++ b/libraries/base/GHC/TopHandler.hs
@@ -47,7 +47,7 @@ import GHC.Weak
 
 #if defined(mingw32_HOST_OS)
 import GHC.ConsoleHandler
-#elif defined(js_HOST_ARCH)
+#elif defined(javascript_HOST_ARCH)
 #else
 import Data.Dynamic (toDyn)
 #endif
@@ -95,7 +95,7 @@ runMainIO main =
       topHandler
 
 install_interrupt_handler :: IO () -> IO ()
-#if defined(js_HOST_ARCH)
+#if defined(javascript_HOST_ARCH)
 install_interrupt_handler _ = return ()
 #elif defined(mingw32_HOST_OS)
 install_interrupt_handler handler = do
@@ -269,7 +269,7 @@ unreachable :: IO a
 unreachable = failIO "If you can read this, shutdownHaskellAndExit did not exit."
 
 exitHelper :: CInt -> Int -> IO a
-#if defined(mingw32_HOST_OS) || defined(js_HOST_ARCH)
+#if defined(mingw32_HOST_OS) || defined(javascript_HOST_ARCH)
 exitHelper exitKind r =
   shutdownHaskellAndExit (fromIntegral r) exitKind >> unreachable
 #else
@@ -297,7 +297,7 @@ foreign import ccall "shutdownHaskellAndSignal"
 
 exitInterrupted :: IO a
 exitInterrupted =
-#if defined(mingw32_HOST_OS) || defined(js_HOST_ARCH)
+#if defined(mingw32_HOST_OS) || defined(javascript_HOST_ARCH)
   safeExit 252
 #elif !defined(HAVE_SIGNAL_H)
   safeExit 1
diff --git a/libraries/base/GHC/Windows.hs b/libraries/base/GHC/Windows.hs
index 85faa25e43..f007d90453 100644
--- a/libraries/base/GHC/Windows.hs
+++ b/libraries/base/GHC/Windows.hs
@@ -21,7 +21,7 @@
 -----------------------------------------------------------------------------
 
 module GHC.Windows (
-#if defined(js_HOST_ARCH)
+#if defined(javascript_HOST_ARCH)
                    ) where
 
 #else