Commit 1411df4e27

@@ -91,7 +91,6 @@ static const ArchType arch_list[] = {
     {ZigLLVM_mips64el, ZigLLVM_MipsSubArch_r6},
 
     {ZigLLVM_msp430, ZigLLVM_NoSubArch},
-    {ZigLLVM_nios2, ZigLLVM_NoSubArch},
     {ZigLLVM_ppc, ZigLLVM_NoSubArch},
     {ZigLLVM_ppc64, ZigLLVM_NoSubArch},
     {ZigLLVM_ppc64le, ZigLLVM_NoSubArch},
@@ -185,6 +184,7 @@ static const Os os_list[] = {
     OsAMDPAL,
     OsHermitCore,
     OsHurd,
+    OsWASI,
     OsZen,
     OsUefi,
 };
@@ -333,6 +333,8 @@ ZigLLVM_OSType get_llvm_os_type(Os os_type) {
             return ZigLLVM_HermitCore;
         case OsHurd:
             return ZigLLVM_Hurd;
+        case OsWASI:
+            return ZigLLVM_WASI;
     }
     zig_unreachable();
 }
@@ -406,6 +408,8 @@ static Os get_zig_os_type(ZigLLVM_OSType os_type) {
             return OsHermitCore;
         case ZigLLVM_Hurd:
             return OsHurd;
+        case ZigLLVM_WASI:
+            return OsWASI;
     }
     zig_unreachable();
 }
@@ -450,6 +454,7 @@ const char *get_target_os_name(Os os_type) {
         case OsAMDPAL:
         case OsHermitCore:
         case OsHurd:
+        case OsWASI:
             return ZigLLVMGetOSTypeName(get_llvm_os_type(os_type));
     }
     zig_unreachable();
@@ -617,7 +622,6 @@ void resolve_target_object_format(ZigTarget *target) {
         case ZigLLVM_mips64el:
         case ZigLLVM_mipsel:
         case ZigLLVM_msp430:
-        case ZigLLVM_nios2:
         case ZigLLVM_nvptx:
         case ZigLLVM_nvptx64:
         case ZigLLVM_ppc64le:
@@ -674,7 +678,6 @@ static int get_arch_pointer_bit_width(ZigLLVM_ArchType arch) {
         case ZigLLVM_le32:
         case ZigLLVM_mips:
         case ZigLLVM_mipsel:
-        case ZigLLVM_nios2:
         case ZigLLVM_nvptx:
         case ZigLLVM_ppc:
         case ZigLLVM_r600:
@@ -826,6 +829,7 @@ uint32_t target_c_type_size_in_bits(const ZigTarget *target, CIntType id) {
         case OsAMDPAL:
         case OsHermitCore:
         case OsHurd:
+        case OsWASI:
             zig_panic("TODO c type size in bits for this target");
     }
     zig_unreachable();
@@ -1014,7 +1018,6 @@ const char *arch_stack_pointer_register_name(const ArchType *arch) {
         case ZigLLVM_mips64el:
         case ZigLLVM_mipsel:
         case ZigLLVM_msp430:
-        case ZigLLVM_nios2:
         case ZigLLVM_nvptx:
         case ZigLLVM_nvptx64:
         case ZigLLVM_ppc64le:
@@ -1076,7 +1079,6 @@ bool target_is_arm(const ZigTarget *target) {
         case ZigLLVM_mips64el:
         case ZigLLVM_mipsel:
         case ZigLLVM_msp430:
-        case ZigLLVM_nios2:
         case ZigLLVM_nvptx:
         case ZigLLVM_nvptx64:
         case ZigLLVM_ppc64le:

@@ -52,6 +52,7 @@ enum Os {
     OsAMDPAL,
     OsHermitCore,
     OsHurd,
+    OsWASI,
     OsZen,
     OsUefi,
 };

@@ -929,7 +929,6 @@ static_assert((Triple::ArchType)ZigLLVM_mipsel == Triple::mipsel, "");
 static_assert((Triple::ArchType)ZigLLVM_mips64 == Triple::mips64, "");
 static_assert((Triple::ArchType)ZigLLVM_mips64el == Triple::mips64el, "");
 static_assert((Triple::ArchType)ZigLLVM_msp430 == Triple::msp430, "");
-static_assert((Triple::ArchType)ZigLLVM_nios2 == Triple::nios2, "");
 static_assert((Triple::ArchType)ZigLLVM_ppc == Triple::ppc, "");
 static_assert((Triple::ArchType)ZigLLVM_ppc64 == Triple::ppc64, "");
 static_assert((Triple::ArchType)ZigLLVM_ppc64le == Triple::ppc64le, "");

@@ -226,12 +226,11 @@ enum ZigLLVM_ArchType {
     ZigLLVM_bpfel,          // eBPF or extended BPF or 64-bit BPF (little endian)
     ZigLLVM_bpfeb,          // eBPF or extended BPF or 64-bit BPF (big endian)
     ZigLLVM_hexagon,        // Hexagon: hexagon
-    ZigLLVM_mips,           // MIPS: mips, mipsallegrex
-    ZigLLVM_mipsel,         // MIPSEL: mipsel, mipsallegrexel
-    ZigLLVM_mips64,         // MIPS64: mips64
-    ZigLLVM_mips64el,       // MIPS64EL: mips64el
+    ZigLLVM_mips,           // MIPS: mips, mipsallegrex, mipsr6
+    ZigLLVM_mipsel,         // MIPSEL: mipsel, mipsallegrexe, mipsr6el
+    ZigLLVM_mips64,         // MIPS64: mips64, mips64r6, mipsn32, mipsn32r6
+    ZigLLVM_mips64el,       // MIPS64EL: mips64el, mips64r6el, mipsn32el, mipsn32r6el
     ZigLLVM_msp430,         // MSP430: msp430
-    ZigLLVM_nios2,          // NIOSII: nios2
     ZigLLVM_ppc,            // PPC: powerpc
     ZigLLVM_ppc64,          // PPC64: powerpc64, ppu
     ZigLLVM_ppc64le,        // PPC64LE: powerpc64le
@@ -363,8 +362,9 @@ enum ZigLLVM_OSType {
     ZigLLVM_AMDPAL,     // AMD PAL Runtime
     ZigLLVM_HermitCore, // HermitCore Unikernel/Multikernel
     ZigLLVM_Hurd,       // GNU/Hurd
+    ZigLLVM_WASI,       // Experimental WebAssembly OS
 
-    ZigLLVM_LastOSType = ZigLLVM_Hurd
+    ZigLLVM_LastOSType = ZigLLVM_WASI
 };
 
 // Synchronize with target.cpp::environ_list

@@ -233,7 +233,6 @@ pub const Target = union(enum) {
             builtin.Arch.le32,
             builtin.Arch.mipsr6,
             builtin.Arch.mipselr6,
-            builtin.Arch.nios2,
             builtin.Arch.powerpc,
             builtin.Arch.r600,
             builtin.Arch.riscv32,
@@ -438,7 +437,6 @@ pub const Target = union(enum) {
                     builtin.Arch.bpfeb,
                     builtin.Arch.hexagon,
                     builtin.Arch.msp430,
-                    builtin.Arch.nios2,
                     builtin.Arch.r600,
                     builtin.Arch.amdgcn,
                     builtin.Arch.riscv32,
@@ -576,6 +574,7 @@ pub const Target = union(enum) {
             builtin.Os.amdpal,
             builtin.Os.hermit,
             builtin.Os.hurd,
+            builtin.Os.wasi,
             => @panic("TODO specify the C integer type sizes for this OS"),
         }
     }