[Git][ghc/ghc][wip/T22740] More

[Sylvain Henry (@hsyl20)]

Sylvain Henry pushed to branch wip/T22740 at Glasgow Haskell Compiler / GHC


Commits:
e2d84768 by Sylvain Henry at 2023-02-03T09:55:07+01:00
More

- - - - -


3 changed files:

- hadrian/src/Oracles/Flag.hs
- hadrian/src/Oracles/Setting.hs
- libraries/ghc-boot/GHC/Platform/ArchOS.hs


Changes:

=====================================
hadrian/src/Oracles/Flag.hs
=====================================
@@ -102,14 +102,14 @@ platformSupportsSharedLibs = do
     wasm          <- anyTargetArch [ "wasm32" ]
     ppc_linux     <- anyTargetPlatform [ "powerpc-unknown-linux" ]
     solaris       <- anyTargetPlatform [ "i386-unknown-solaris2" ]
-    javascript    <- anyTargetArch     [ "js" ]
+    javascript    <- anyTargetArch     [ "javascript" ]
     solarisBroken <- flag SolarisBrokenShld
     return $ not (windows || wasm || javascript || ppc_linux || solaris && solarisBroken)
 
 -- | Does the target support threaded RTS?
 targetSupportsThreadedRts :: Action Bool
 targetSupportsThreadedRts = do
-    bad_arch <- anyTargetArch [ "wasm32", "js" ]
+    bad_arch <- anyTargetArch [ "wasm32", "javascript" ]
     return $ not bad_arch
 
 -- | Does the target support the -N RTS flag?


=====================================
hadrian/src/Oracles/Setting.hs
=====================================
@@ -258,7 +258,7 @@ isWinTarget :: Action Bool
 isWinTarget = anyTargetOs ["mingw32"]
 
 isJsTarget :: Action Bool
-isJsTarget = anyTargetArch ["js"]
+isJsTarget = anyTargetArch ["javascript"]
 
 isOsxTarget :: Action Bool
 isOsxTarget = anyTargetOs ["darwin"]


=====================================
libraries/ghc-boot/GHC/Platform/ArchOS.hs
=====================================
@@ -136,7 +136,7 @@ stringEncodeArch = \case
   ArchMipsel        -> "mipsel"
   ArchRISCV64       -> "riscv64"
   ArchLoongArch64   -> "loongarch64"
-  ArchJavaScript    -> "js"
+  ArchJavaScript    -> "javascript"
   ArchWasm32        -> "wasm32"
 
 -- | See Note [Platform Syntax].



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e2d8476842d20e9a80aafb46e54d3ae8a3cc097d

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e2d8476842d20e9a80aafb46e54d3ae8a3cc097d
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20230203/4a380b89/attachment-0001.html>