Add Wasm32 and WASI to Arch and OS structures

MLton · May 16, 2024 · 94e4af4 · 94e4af4
1 parent 008a6d5
commit 94e4af4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/basis-library/mlton/platform.sig b/basis-library/mlton/platform.sig
@@ -10,7 +10,7 @@ signature MLTON_PLATFORM =
       structure Arch:
          sig
             datatype t = Alpha | AMD64 | ARM | ARM64 | HPPA | IA64 | LoongArch64 | m68k |
-                         MIPS | PowerPC | PowerPC64 | RISCV | S390 | Sparc | X86
+                         MIPS | PowerPC | PowerPC64 | RISCV | S390 | Sparc | Wasm32 | X86
 
             val fromString: string -> t option
             val host: t
@@ -29,7 +29,7 @@ signature MLTON_PLATFORM =
       structure OS:
          sig
             datatype t = AIX | Cygwin | Darwin | FreeBSD | Hurd | HPUX
-                       | Linux | MinGW | NetBSD | OpenBSD | Solaris
+                       | Linux | MinGW | NetBSD | OpenBSD | Solaris | WASI
 
             val fromString: string -> t option
             val host: t

diff --git a/basis-library/mlton/platform.sml b/basis-library/mlton/platform.sml
@@ -44,6 +44,7 @@ structure MLtonPlatform: MLTON_PLATFORM =
              | RISCV
              | S390
              | Sparc
+             | Wasm32
              | X86
 
             val all =
@@ -61,6 +62,7 @@ structure MLtonPlatform: MLTON_PLATFORM =
                (RISCV, "RISCV")::
                (S390, "S390")::
                (Sparc, "Sparc")::
+               (Wasm32, "Wasm32")::
                (X86, "X86")::
                nil
 
@@ -83,6 +85,7 @@ structure MLtonPlatform: MLTON_PLATFORM =
                 | "riscv" => RISCV
                 | "s390" => S390
                 | "sparc" => Sparc
+                | "wasm32" => Wasm32
                 | "x86" => X86
                 | _ => raise Fail "strange MLton_Platform_Arch_host"
          end
@@ -128,6 +131,7 @@ structure MLtonPlatform: MLTON_PLATFORM =
              | NetBSD
              | OpenBSD
              | Solaris
+             | WASI
 
             val all =
                (AIX, "AIX")::
@@ -141,6 +145,7 @@ structure MLtonPlatform: MLTON_PLATFORM =
                (NetBSD, "NetBSD")::
                (OpenBSD, "OpenBSD")::
                (Solaris, "Solaris")::
+               (WASI, "WASI")::
                nil
 
             val (fromString, toString) = fromString_toString all
@@ -159,6 +164,7 @@ structure MLtonPlatform: MLTON_PLATFORM =
                 | "netbsd" => NetBSD
                 | "openbsd" => OpenBSD
                 | "solaris" => Solaris
+                | "wasi" => WASI
                 | _ => raise Fail "strange MLton_Platform_OS_host"
          end
    end
diff --git a/basis-library/sml-nj/sml-nj.sml b/basis-library/sml-nj/sml-nj.sml
@@ -42,6 +42,7 @@ structure SMLofNJ: SML_OF_NJ =
                    | NetBSD => UNIX
                    | OpenBSD => UNIX
                    | Solaris => UNIX
+                   | WASI => UNIX
                end
 
             fun getOSName () = MLton.Platform.OS.toString MLton.Platform.OS.host

diff --git a/mlton/main/main.fun b/mlton/main/main.fun
@@ -1239,7 +1239,8 @@ fun commandLine (_: string, args: string list): unit =
                       | MinGW => true
                       | NetBSD => true
                       | OpenBSD => true
-                      | Solaris => true)
+                      | Solaris => true
+                      | WASI => false)
                     then ()
                     else usage (concat ["can't use -profile time on ",
                                         MLton.Platform.OS.toString targetOS])