Index: include/llvm/ADT/Triple.h =================================================================== --- include/llvm/ADT/Triple.h +++ include/llvm/ADT/Triple.h @@ -92,7 +92,7 @@ kalimba, // Kalimba: generic kalimba shave, // SHAVE: Movidius vector VLIW processors lanai, // Lanai: Lanai 32-bit - wasm32, // WebAssembly with 32-bit pointers + wasm, // WebAssembly with 32-bit pointers wasm64, // WebAssembly with 64-bit pointers renderscript32, // 32-bit RenderScript renderscript64, // 64-bit RenderScript Index: include/llvm/Object/ELFObjectFile.h =================================================================== --- include/llvm/Object/ELFObjectFile.h +++ include/llvm/Object/ELFObjectFile.h @@ -1078,7 +1078,7 @@ return Triple::sparcv9; case ELF::EM_WEBASSEMBLY: switch (EF.getHeader()->e_ident[ELF::EI_CLASS]) { - case ELF::ELFCLASS32: return Triple::wasm32; + case ELF::ELFCLASS32: return Triple::wasm; case ELF::ELFCLASS64: return Triple::wasm64; default: return Triple::UnknownArch; } Index: lib/Object/WasmObjectFile.cpp =================================================================== --- lib/Object/WasmObjectFile.cpp +++ lib/Object/WasmObjectFile.cpp @@ -1135,7 +1135,7 @@ StringRef WasmObjectFile::getFileFormatName() const { return "WASM"; } -Triple::ArchType WasmObjectFile::getArch() const { return Triple::wasm32; } +Triple::ArchType WasmObjectFile::getArch() const { return Triple::wasm; } SubtargetFeatures WasmObjectFile::getFeatures() const { return SubtargetFeatures(); Index: lib/Support/Triple.cpp =================================================================== --- lib/Support/Triple.cpp +++ lib/Support/Triple.cpp @@ -67,7 +67,7 @@ case kalimba: return "kalimba"; case lanai: return "lanai"; case shave: return "shave"; - case wasm32: return "wasm32"; + case wasm: return "wasm"; case wasm64: return "wasm64"; case renderscript32: return "renderscript32"; case renderscript64: return "renderscript64"; @@ -141,7 +141,7 @@ case kalimba: return "kalimba"; case lanai: return "lanai"; case shave: return "shave"; - case wasm32: + case wasm: case wasm64: return "wasm"; case riscv32: @@ -306,8 +306,8 @@ .Case("kalimba", kalimba) .Case("lanai", lanai) .Case("shave", shave) - .Case("wasm32", wasm32) - .Case("wasm64", wasm64) + .Case("wasm32", wasm) + .Case("wasm", wasm64) .Case("renderscript32", renderscript32) .Case("renderscript64", renderscript64) .Default(UnknownArch); @@ -429,7 +429,7 @@ .StartsWith("kalimba", Triple::kalimba) .Case("lanai", Triple::lanai) .Case("shave", Triple::shave) - .Case("wasm32", Triple::wasm32) + .Cases("wasm", "wasm32", Triple::wasm) .Case("wasm64", Triple::wasm64) .Case("renderscript32", Triple::renderscript32) .Case("renderscript64", Triple::renderscript64) @@ -679,7 +679,7 @@ return Triple::MachO; return Triple::ELF; - case Triple::wasm32: + case Triple::wasm: case Triple::wasm64: return Triple::Wasm; } @@ -1213,7 +1213,7 @@ case llvm::Triple::kalimba: case llvm::Triple::lanai: case llvm::Triple::shave: - case llvm::Triple::wasm32: + case llvm::Triple::wasm: case llvm::Triple::renderscript32: return 32; @@ -1294,7 +1294,7 @@ case Triple::xcore: case Triple::lanai: case Triple::shave: - case Triple::wasm32: + case Triple::wasm: case Triple::renderscript32: // Already 32-bit. break; @@ -1312,7 +1312,7 @@ case Triple::amdil64: T.setArch(Triple::amdil); break; case Triple::hsail64: T.setArch(Triple::hsail); break; case Triple::spir64: T.setArch(Triple::spir); break; - case Triple::wasm64: T.setArch(Triple::wasm32); break; + case Triple::wasm64: T.setArch(Triple::wasm); break; case Triple::renderscript64: T.setArch(Triple::renderscript32); break; } return T; @@ -1376,7 +1376,7 @@ case Triple::spir: T.setArch(Triple::spir64); break; case Triple::thumb: T.setArch(Triple::aarch64); break; case Triple::thumbeb: T.setArch(Triple::aarch64_be); break; - case Triple::wasm32: T.setArch(Triple::wasm64); break; + case Triple::wasm: T.setArch(Triple::wasm64); break; case Triple::renderscript32: T.setArch(Triple::renderscript64); break; } return T; @@ -1409,7 +1409,7 @@ case Triple::shave: case Triple::spir64: case Triple::spir: - case Triple::wasm32: + case Triple::wasm: case Triple::wasm64: case Triple::x86: case Triple::x86_64: @@ -1499,7 +1499,7 @@ case Triple::spir64: case Triple::spir: case Triple::thumb: - case Triple::wasm32: + case Triple::wasm: case Triple::wasm64: case Triple::x86: case Triple::x86_64: Index: lib/Target/WebAssembly/MCTargetDesc/WebAssemblyELFObjectWriter.cpp =================================================================== --- lib/Target/WebAssembly/MCTargetDesc/WebAssemblyELFObjectWriter.cpp +++ lib/Target/WebAssembly/MCTargetDesc/WebAssemblyELFObjectWriter.cpp @@ -49,10 +49,10 @@ switch (Fixup.getKind()) { case FK_Data_4: - assert(!is64Bit() && "4-byte relocations only supported on wasm32"); + assert(!is64Bit() && "4-byte relocations not supported on wasm64"); return ELF::R_WEBASSEMBLY_DATA; case FK_Data_8: - assert(is64Bit() && "8-byte relocations only supported on wasm64"); + assert(is64Bit() && "8-byte relocations not supported on wasm"); return ELF::R_WEBASSEMBLY_DATA; default: llvm_unreachable("unimplemented fixup kind"); Index: lib/Target/WebAssembly/TargetInfo/WebAssemblyTargetInfo.cpp =================================================================== --- lib/Target/WebAssembly/TargetInfo/WebAssemblyTargetInfo.cpp +++ lib/Target/WebAssembly/TargetInfo/WebAssemblyTargetInfo.cpp @@ -29,8 +29,8 @@ } extern "C" void LLVMInitializeWebAssemblyTargetInfo() { - RegisterTarget X(getTheWebAssemblyTarget32(), "wasm32", - "WebAssembly 32-bit", "WebAssembly"); + RegisterTarget X(getTheWebAssemblyTarget32(), "wasm32", + "WebAssembly 32-bit", "WebAssembly"); RegisterTarget Y(getTheWebAssemblyTarget64(), "wasm64", "WebAssembly 64-bit", "WebAssembly"); } Index: lib/Target/WebAssembly/WebAssemblyInstrControl.td =================================================================== --- lib/Target/WebAssembly/WebAssemblyInstrControl.td +++ lib/Target/WebAssembly/WebAssemblyInstrControl.td @@ -38,7 +38,7 @@ let Defs = [ARGUMENTS] in { // TODO: SelectionDAG's lowering insists on using a pointer as the index for -// jump tables, so in practice we don't ever use BR_TABLE_I64 in wasm32 mode +// jump tables, so in practice we don't ever use BR_TABLE_I64 in wasm mode // currently. // Set TSFlags{0} to 1 to indicate that the variable_ops are immediates. // Set TSFlags{1} to 1 to indicate that the immediates represent labels. Index: lib/Transforms/IPO/LowerTypeTests.cpp =================================================================== --- lib/Transforms/IPO/LowerTypeTests.cpp +++ lib/Transforms/IPO/LowerTypeTests.cpp @@ -1122,7 +1122,7 @@ if (Arch == Triple::x86 || Arch == Triple::x86_64 || Arch == Triple::arm || Arch == Triple::thumb || Arch == Triple::aarch64) buildBitSetsFromFunctionsNative(TypeIds, Functions); - else if (Arch == Triple::wasm32 || Arch == Triple::wasm64) + else if (Arch == Triple::wasm || Arch == Triple::wasm64) buildBitSetsFromFunctionsWASM(TypeIds, Functions); else report_fatal_error("Unsupported architecture for jump tables"); Index: test/MC/WebAssembly/file-headers.ll =================================================================== --- test/MC/WebAssembly/file-headers.ll +++ test/MC/WebAssembly/file-headers.ll @@ -4,6 +4,6 @@ target triple = "wasm32-unknown-unknown-wasm" ; CHECK: Format: WASM{{$}} -; CHECK: Arch: wasm32{{$}} +; CHECK: Arch: wasm{{$}} ; CHECK: AddressSize: 32bit{{$}} ; CHECK: Version: 0x1{{$}} Index: test/MC/WebAssembly/sections.ll =================================================================== --- test/MC/WebAssembly/sections.ll +++ test/MC/WebAssembly/sections.ll @@ -16,7 +16,7 @@ } ; CHECK: Format: WASM -; CHECK: Arch: wasm32 +; CHECK: Arch: wasm ; CHECK: AddressSize: 32bit ; CHECK: Sections [ ; CHECK: Section { Index: test/tools/llvm-readobj/file-headers.test =================================================================== --- test/tools/llvm-readobj/file-headers.test +++ test/tools/llvm-readobj/file-headers.test @@ -389,6 +389,6 @@ ELF-LANAI-NEXT: } WASM: Format: WASM -WASM-NEXT: Arch: wasm32 +WASM-NEXT: Arch: wasm WASM-NEXT: AddressSize: 32bit WASM-NEXT: Version: 0x1