Fix GHCJS OS platform (fix #23346)

compiler/GHC/Platform.hs

@@ -208,6 +208,7 @@ osElfTarget OSQNXNTO    = False
 osElfTarget OSAIX       = False
 osElfTarget OSHurd      = True
 osElfTarget OSWasi      = False
+osElfTarget OSGhcjs     = False
 osElfTarget OSUnknown   = False
  -- Defaulting to False is safe; it means don't rely on any
  -- ELF-specific functionality.  It is important to have a default for

libraries/ghc-boot/GHC/Platform/ArchOS.hs

@@ -98,6 +98,7 @@ data OS
    | OSAIX
    | OSHurd
    | OSWasi
+   | OSGhcjs
    deriving (Read, Show, Eq, Ord)
 
 
@@ -157,3 +158,4 @@ stringEncodeOS = \case
   OSAIX       -> "aix"
   OSHurd      -> "hurd"
   OSWasi      -> "wasi"
+  OSGhcjs     -> "ghcjs"

m4/fptools_set_haskell_platform_vars.m4

@@ -119,7 +119,7 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_VARS_SHELL_FUNCTIONS],
             test -z "[$]2" || eval "[$]2=OSHurd"
             ;;
         ghcjs|js)
-            test -z "[$]2" || eval "[$]2=OSUnknown"
+            test -z "[$]2" || eval "[$]2=OSGhcjs"
             ;;
         *)
             echo "Unknown OS '[$]1'"

testsuite/tests/javascript/T23346.hs

+{-# LANGUAGE CPP #-}
+
+module Main where
+
+main :: IO ()
+main = print (correct_host && correct_arch)
+
+#ifdef ghcjs_HOST_OS
+correct_host = True
+#else
+correct_host = False 
+#endif
+
+#ifdef javascript_HOST_ARCH
+correct_arch = True
+#else
+correct_arch = False 
+#endif

testsuite/tests/javascript/T23346.stdout

+True

testsuite/tests/javascript/all.T

@@ -15,3 +15,5 @@ test('js-callback02', normal, compile_and_run, [''])
 test('js-callback03', normal, compile_and_run, [''])
 test('js-callback04', js_skip, compile_and_run, [''])
 test('js-callback05', js_skip, compile_and_run, [''])
+
+test('T23346', normal, compile_and_run, [''])