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

[Sylvain Henry (@hsyl20)]

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


Commits:
2cef38b1 by Sylvain Henry at 2023-02-03T15:27:24+01:00
More

- - - - -


3 changed files:

- hadrian/bindist/config.mk.in
- m4/ghc_unregisterised.m4
- rts/rts.cabal.in


Changes:

=====================================
hadrian/bindist/config.mk.in
=====================================
@@ -128,7 +128,7 @@ GhcUnregisterised     = @Unregisterised@
 ifeq "$(TargetArch_CPP)" "arm"
 # We don't support load/store barriers pre-ARMv7. See #10433.
 ArchSupportsSMP=$(if $(filter $(ARM_ISA),ARMv5 ARMv6),NO,YES)
-else ifeq "$(TargetArch_CPP)" "js"
+else ifeq "$(TargetArch_CPP)" "javascript"
 ArchSupportsSMP=NO
 else
 ArchSupportsSMP=$(strip $(patsubst $(TargetArch_CPP), YES, $(findstring $(TargetArch_CPP), i386 x86_64 sparc powerpc powerpc64 powerpc64le s390x aarch64 riscv64)))


=====================================
m4/ghc_unregisterised.m4
=====================================
@@ -5,7 +5,7 @@ AC_DEFUN([GHC_UNREGISTERISED],
 [
   AC_MSG_CHECKING(whether target supports a registerised ABI)
   case "$TargetArch" in
-      i386|x86_64|powerpc|powerpc64|powerpc64le|s390x|arm|aarch64|riscv64|wasm32|js|loongarch64)
+      i386|x86_64|powerpc|powerpc64|powerpc64le|s390x|arm|aarch64|riscv64|wasm32|javascript|loongarch64)
           UnregisterisedDefault=NO
           AC_MSG_RESULT([yes])
           ;;


=====================================
rts/rts.cabal.in
=====================================
@@ -84,7 +84,7 @@ library
     exposed: True
     exposed-modules:
 
-    if os(ghcjs)
+    if arch(javascript)
 
       include-dirs: include
       -- dummy file to force the build of a .a lib



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

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/2cef38b1b3030b9bf51c8519fcc9c43b597f1b3a
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/aa0578a9/attachment-0001.html>