[Git][ghc/ghc][wip/T22740] 2 commits: fix config.sub

[Sylvain Henry (@hsyl20)]

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


Commits:
619a874e by Sylvain Henry at 2023-02-03T09:45:04+01:00
fix config.sub

- - - - -
55f7a976 by Sylvain Henry at 2023-02-03T09:48:08+01:00
Fix configure

- - - - -


4 changed files:

- config.sub
- configure.ac
- m4/fptools_set_haskell_platform_vars.m4
- m4/ghc_convert_cpu.m4


Changes:

=====================================
config.sub
=====================================
@@ -1190,7 +1190,7 @@ case $cpu-$vendor in
 			| arc | arceb | arc32 | arc64 \
 			| arm | arm[lb]e | arme[lb] | armv* \
 			| avr | avr32 \
-			| asmjs | js \
+			| asmjs | javascript \
 			| ba \
 			| be32 | be64 \
 			| bfin | bpf | bs2000 \


=====================================
configure.ac
=====================================
@@ -333,7 +333,7 @@ AC_SUBST(TablesNextToCode)
 dnl ** Does target have runtime linker support?
 dnl --------------------------------------------------------------
 case "$target" in
-    powerpc64-*|powerpc64le-*|powerpc-ibm-aix*|s390x-ibm-linux|riscv64-*|wasm*|js-*|loongarch64-*)
+    powerpc64-*|powerpc64le-*|powerpc-ibm-aix*|s390x-ibm-linux|riscv64-*|wasm*|javascript-*|loongarch64-*)
         TargetHasRTSLinker=NO
         ;;
     *)


=====================================
m4/fptools_set_haskell_platform_vars.m4
=====================================
@@ -51,7 +51,7 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_VARS_SHELL_FUNCTIONS],
         hppa|hppa1_1|ia64|m68k|nios2|riscv32|loongarch32|rs6000|s390|sh4|vax)
             test -z "[$]2" || eval "[$]2=ArchUnknown"
             ;;
-        js)
+        javascript)
             test -z "[$]2" || eval "[$]2=ArchJavaScript"
             ;;
         *)


=====================================
m4/ghc_convert_cpu.m4
=====================================
@@ -83,8 +83,8 @@ case "$1" in
   wasm32)
     $2="wasm32"
     ;;
-  js)
-    $2="js"
+  javascript)
+    $2="javascript"
     ;;
   *)
     echo "Unknown CPU $1"



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/c2775e1939a4355054bfaa4d79539026b0527605...55f7a976e5084cf0e7fc98dcf479a01982c2a2de

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/c2775e1939a4355054bfaa4d79539026b0527605...55f7a976e5084cf0e7fc98dcf479a01982c2a2de
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/49e436e0/attachment-0001.html>