Index: test/CodeGen/WebAssembly/address-offsets.ll
===================================================================
--- test/CodeGen/WebAssembly/address-offsets.ll
+++ test/CodeGen/WebAssembly/address-offsets.ll
@@ -4,7 +4,7 @@
 ; a variety of circumstances.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 @g = external global [0 x i32], align 4
 
Index: test/CodeGen/WebAssembly/byval.ll
===================================================================
--- test/CodeGen/WebAssembly/byval.ll
+++ test/CodeGen/WebAssembly/byval.ll
@@ -2,7 +2,7 @@
 ; RUN: llc < %s -asm-verbose=false -disable-wasm-fallthrough-return-opt -disable-wasm-explicit-locals -verify-machineinstrs -fast-isel | FileCheck %s
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 %SmallStruct = type { i32 }
 %OddStruct = type { i32, i8, i32 }
Index: test/CodeGen/WebAssembly/call.ll
===================================================================
--- test/CodeGen/WebAssembly/call.ll
+++ test/CodeGen/WebAssembly/call.ll
@@ -4,7 +4,7 @@
 ; Test that basic call operations assemble as expected.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 declare i32 @i32_nullary()
 declare i32 @i32_unary(i32)
Index: test/CodeGen/WebAssembly/cfg-stackify.ll
===================================================================
--- test/CodeGen/WebAssembly/cfg-stackify.ll
+++ test/CodeGen/WebAssembly/cfg-stackify.ll
@@ -7,7 +7,7 @@
 ; optnone test.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 declare void @something()
 
Index: test/CodeGen/WebAssembly/cfi.ll
===================================================================
--- test/CodeGen/WebAssembly/cfi.ll
+++ test/CodeGen/WebAssembly/cfi.ll
@@ -3,7 +3,7 @@
 ; Tests that we correctly assign indexes for control flow integrity.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 @0 = private unnamed_addr constant [2 x void (...)*] [void (...)* bitcast (void ()* @f to void (...)*), void (...)* bitcast (void ()* @g to void (...)*)], align 16
 
Index: test/CodeGen/WebAssembly/comparisons_f32.ll
===================================================================
--- test/CodeGen/WebAssembly/comparisons_f32.ll
+++ test/CodeGen/WebAssembly/comparisons_f32.ll
@@ -4,7 +4,7 @@
 ; expected.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; CHECK-LABEL: ord_f32:
 ; CHECK-NEXT: .param f32, f32{{$}}
Index: test/CodeGen/WebAssembly/comparisons_f64.ll
===================================================================
--- test/CodeGen/WebAssembly/comparisons_f64.ll
+++ test/CodeGen/WebAssembly/comparisons_f64.ll
@@ -4,7 +4,7 @@
 ; expected.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; CHECK-LABEL: ord_f64:
 ; CHECK-NEXT: .param f64, f64{{$}}
Index: test/CodeGen/WebAssembly/comparisons_i32.ll
===================================================================
--- test/CodeGen/WebAssembly/comparisons_i32.ll
+++ test/CodeGen/WebAssembly/comparisons_i32.ll
@@ -4,7 +4,7 @@
 ; Test that basic 32-bit integer comparison operations assemble as expected.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; CHECK-LABEL: eq_i32:
 ; CHECK-NEXT: .param i32, i32{{$}}
Index: test/CodeGen/WebAssembly/comparisons_i64.ll
===================================================================
--- test/CodeGen/WebAssembly/comparisons_i64.ll
+++ test/CodeGen/WebAssembly/comparisons_i64.ll
@@ -4,7 +4,7 @@
 ; Test that basic 64-bit integer comparison operations assemble as expected.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; CHECK-LABEL: eq_i64:
 ; CHECK-NEXT: .param i64, i64{{$}}
Index: test/CodeGen/WebAssembly/conv-trap.ll
===================================================================
--- test/CodeGen/WebAssembly/conv-trap.ll
+++ test/CodeGen/WebAssembly/conv-trap.ll
@@ -4,7 +4,7 @@
 ; the trapping opcodes and explicit code to suppress the trapping.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; CHECK-LABEL: i32_trunc_s_f32:
 ; CHECK-NEXT: .param f32{{$}}
Index: test/CodeGen/WebAssembly/conv.ll
===================================================================
--- test/CodeGen/WebAssembly/conv.ll
+++ test/CodeGen/WebAssembly/conv.ll
@@ -3,7 +3,7 @@
 ; Test that basic conversion operations assemble as expected.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; CHECK-LABEL: i32_wrap_i64:
 ; CHECK-NEXT: .param i64{{$}}
Index: test/CodeGen/WebAssembly/copysign-casts.ll
===================================================================
--- test/CodeGen/WebAssembly/copysign-casts.ll
+++ test/CodeGen/WebAssembly/copysign-casts.ll
@@ -4,7 +4,7 @@
 ; unfolded.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 declare double @copysign(double, double) nounwind readnone
 declare float @copysignf(float, float) nounwind readnone
Index: test/CodeGen/WebAssembly/cpus.ll
===================================================================
--- test/CodeGen/WebAssembly/cpus.ll
+++ test/CodeGen/WebAssembly/cpus.ll
@@ -1,12 +1,12 @@
 ; This tests that llc accepts all valid WebAssembly CPUs.
 
-; RUN: llc < %s -asm-verbose=false -mtriple=wasm32-unknown-unknown-wasm -mcpu=mvp 2>&1 | FileCheck %s
+; RUN: llc < %s -asm-verbose=false -mtriple=wasm32-unknown-unknown -mcpu=mvp 2>&1 | FileCheck %s
 ; RUN: llc < %s -asm-verbose=false -mtriple=wasm64-unknown-unknown-wasm -mcpu=mvp 2>&1 | FileCheck %s
-; RUN: llc < %s -asm-verbose=false -mtriple=wasm32-unknown-unknown-wasm -mcpu=generic 2>&1 | FileCheck %s
+; RUN: llc < %s -asm-verbose=false -mtriple=wasm32-unknown-unknown -mcpu=generic 2>&1 | FileCheck %s
 ; RUN: llc < %s -asm-verbose=false -mtriple=wasm64-unknown-unknown-wasm -mcpu=generic 2>&1 | FileCheck %s
-; RUN: llc < %s -asm-verbose=false -mtriple=wasm32-unknown-unknown-wasm -mcpu=bleeding-edge 2>&1 | FileCheck %s
+; RUN: llc < %s -asm-verbose=false -mtriple=wasm32-unknown-unknown -mcpu=bleeding-edge 2>&1 | FileCheck %s
 ; RUN: llc < %s -asm-verbose=false -mtriple=wasm64-unknown-unknown-wasm -mcpu=bleeding-edge 2>&1 | FileCheck %s
-; RUN: llc < %s -asm-verbose=false -mtriple=wasm32-unknown-unknown-wasm -mcpu=invalidcpu 2>&1 | FileCheck %s --check-prefix=INVALID
+; RUN: llc < %s -asm-verbose=false -mtriple=wasm32-unknown-unknown -mcpu=invalidcpu 2>&1 | FileCheck %s --check-prefix=INVALID
 ; RUN: llc < %s -asm-verbose=false -mtriple=wasm64-unknown-unknown-wasm -mcpu=invalidcpu 2>&1 | FileCheck %s --check-prefix=INVALID
 
 ; CHECK-NOT: is not a recognized processor for this target
Index: test/CodeGen/WebAssembly/dbgvalue.ll
===================================================================
--- test/CodeGen/WebAssembly/dbgvalue.ll
+++ test/CodeGen/WebAssembly/dbgvalue.ll
@@ -6,7 +6,7 @@
 ; CHECK: DW_TAG_variable
 source_filename = "test/CodeGen/WebAssembly/dbgvalue.ll"
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 @key = external local_unnamed_addr global [15 x i8], align 1
 @.str = external unnamed_addr constant [33 x i8], align 1
Index: test/CodeGen/WebAssembly/dead-vreg.ll
===================================================================
--- test/CodeGen/WebAssembly/dead-vreg.ll
+++ test/CodeGen/WebAssembly/dead-vreg.ll
@@ -3,7 +3,7 @@
 ; Check that unused vregs aren't assigned registers.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 define void @foo(i32* nocapture %a, i32 %w, i32 %h) {
 ; CHECK-LABEL: foo:
Index: test/CodeGen/WebAssembly/divrem-constant.ll
===================================================================
--- test/CodeGen/WebAssembly/divrem-constant.ll
+++ test/CodeGen/WebAssembly/divrem-constant.ll
@@ -3,7 +3,7 @@
 ; Test that integer div and rem by constant are optimized appropriately.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; CHECK-LABEL: test_udiv_2:
 ; CHECK: i32.shr_u
Index: test/CodeGen/WebAssembly/exception.ll
===================================================================
--- test/CodeGen/WebAssembly/exception.ll
+++ test/CodeGen/WebAssembly/exception.ll
@@ -1,7 +1,7 @@
 ; RUN: llc < %s -asm-verbose=false -disable-wasm-fallthrough-return-opt -disable-wasm-explicit-locals | FileCheck %s
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 declare void @llvm.wasm.throw(i32, i8*)
 declare void @llvm.wasm.rethrow()
Index: test/CodeGen/WebAssembly/f16.ll
===================================================================
--- test/CodeGen/WebAssembly/f16.ll
+++ test/CodeGen/WebAssembly/f16.ll
@@ -4,7 +4,7 @@
 ; Test that f16 is expanded.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; CHECK-LABEL: demote:
 ; CHECK-NEXT: .param  	f32{{$}}
Index: test/CodeGen/WebAssembly/f32.ll
===================================================================
--- test/CodeGen/WebAssembly/f32.ll
+++ test/CodeGen/WebAssembly/f32.ll
@@ -3,7 +3,7 @@
 ; Test that basic 32-bit floating-point operations assemble as expected.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 declare float @llvm.fabs.f32(float)
 declare float @llvm.copysign.f32(float, float)
Index: test/CodeGen/WebAssembly/f64.ll
===================================================================
--- test/CodeGen/WebAssembly/f64.ll
+++ test/CodeGen/WebAssembly/f64.ll
@@ -3,7 +3,7 @@
 ; Test that basic 64-bit floating-point operations assemble as expected.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 declare double @llvm.fabs.f64(double)
 declare double @llvm.copysign.f64(double, double)
Index: test/CodeGen/WebAssembly/fast-isel-noreg.ll
===================================================================
--- test/CodeGen/WebAssembly/fast-isel-noreg.ll
+++ test/CodeGen/WebAssembly/fast-isel-noreg.ll
@@ -4,7 +4,7 @@
 ; Test that FastISel does not generate instructions with NoReg
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; CHECK: i32.const $push0=, 0
 define hidden i32 @a() #0 {
Index: test/CodeGen/WebAssembly/fast-isel.ll
===================================================================
--- test/CodeGen/WebAssembly/fast-isel.ll
+++ test/CodeGen/WebAssembly/fast-isel.ll
@@ -4,7 +4,7 @@
 ; RUN:   | FileCheck %s
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; This tests very minimal fast-isel functionality.
 
Index: test/CodeGen/WebAssembly/frem.ll
===================================================================
--- test/CodeGen/WebAssembly/frem.ll
+++ test/CodeGen/WebAssembly/frem.ll
@@ -3,7 +3,7 @@
 ; Test that the frem instruction works.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; CHECK-LABEL: frem32:
 ; CHECK-NEXT: .param f32, f32{{$}}
Index: test/CodeGen/WebAssembly/func.ll
===================================================================
--- test/CodeGen/WebAssembly/func.ll
+++ test/CodeGen/WebAssembly/func.ll
@@ -3,7 +3,7 @@
 ; Test that basic functions assemble as expected.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; CHECK-LABEL: f0:
 ; CHECK: return{{$}}
Index: test/CodeGen/WebAssembly/function-bitcasts-varargs.ll
===================================================================
--- test/CodeGen/WebAssembly/function-bitcasts-varargs.ll
+++ test/CodeGen/WebAssembly/function-bitcasts-varargs.ll
@@ -4,7 +4,7 @@
 ; wrappers.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 define void @callWithArgs() {
 entry:
Index: test/CodeGen/WebAssembly/function-bitcasts.ll
===================================================================
--- test/CodeGen/WebAssembly/function-bitcasts.ll
+++ test/CodeGen/WebAssembly/function-bitcasts.ll
@@ -3,7 +3,7 @@
 ; Test that function pointer casts are replaced with wrappers.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 declare void @has_i32_arg(i32)
 declare i32 @has_i32_ret()
Index: test/CodeGen/WebAssembly/global.ll
===================================================================
--- test/CodeGen/WebAssembly/global.ll
+++ test/CodeGen/WebAssembly/global.ll
@@ -3,7 +3,7 @@
 ; Test that globals assemble as expected.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; CHECK-NOT: llvm.used
 ; CHECK-NOT: llvm.metadata
Index: test/CodeGen/WebAssembly/globl.ll
===================================================================
--- test/CodeGen/WebAssembly/globl.ll
+++ test/CodeGen/WebAssembly/globl.ll
@@ -1,7 +1,7 @@
 ; RUN: llc < %s -asm-verbose=false | FileCheck %s
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; CHECK: .globl foo
 ; CHECK: .type foo,@function
Index: test/CodeGen/WebAssembly/i128.ll
===================================================================
--- test/CodeGen/WebAssembly/i128.ll
+++ test/CodeGen/WebAssembly/i128.ll
@@ -3,7 +3,7 @@
 ; Test that basic 128-bit integer operations assemble as expected.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 declare i128 @llvm.ctlz.i128(i128, i1)
 declare i128 @llvm.cttz.i128(i128, i1)
Index: test/CodeGen/WebAssembly/i32-load-store-alignment.ll
===================================================================
--- test/CodeGen/WebAssembly/i32-load-store-alignment.ll
+++ test/CodeGen/WebAssembly/i32-load-store-alignment.ll
@@ -3,7 +3,7 @@
 ; Test loads and stores with custom alignment values.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; CHECK-LABEL: ldi32_a1:
 ; CHECK-NEXT: .param i32{{$}}
Index: test/CodeGen/WebAssembly/i32.ll
===================================================================
--- test/CodeGen/WebAssembly/i32.ll
+++ test/CodeGen/WebAssembly/i32.ll
@@ -3,7 +3,7 @@
 ; Test that basic 32-bit integer operations assemble as expected.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 declare i32 @llvm.ctlz.i32(i32, i1)
 declare i32 @llvm.cttz.i32(i32, i1)
Index: test/CodeGen/WebAssembly/i64-load-store-alignment.ll
===================================================================
--- test/CodeGen/WebAssembly/i64-load-store-alignment.ll
+++ test/CodeGen/WebAssembly/i64-load-store-alignment.ll
@@ -3,7 +3,7 @@
 ; Test loads and stores with custom alignment values.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; CHECK-LABEL: ldi64_a1:
 ; CHECK-NEXT: .param i32{{$}}
Index: test/CodeGen/WebAssembly/i64.ll
===================================================================
--- test/CodeGen/WebAssembly/i64.ll
+++ test/CodeGen/WebAssembly/i64.ll
@@ -3,7 +3,7 @@
 ; Test that basic 64-bit integer operations assemble as expected.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 declare i64 @llvm.ctlz.i64(i64, i1)
 declare i64 @llvm.cttz.i64(i64, i1)
Index: test/CodeGen/WebAssembly/ident.ll
===================================================================
--- test/CodeGen/WebAssembly/ident.ll
+++ test/CodeGen/WebAssembly/ident.ll
@@ -3,7 +3,7 @@
 ; Test llvm.ident.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; CHECK: .ident "hello world"
 
Index: test/CodeGen/WebAssembly/immediates.ll
===================================================================
--- test/CodeGen/WebAssembly/immediates.ll
+++ test/CodeGen/WebAssembly/immediates.ll
@@ -3,7 +3,7 @@
 ; Test that basic immediates assemble as expected.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; CHECK-LABEL: zero_i32:
 ; CHECK-NEXT: .result i32{{$}}
Index: test/CodeGen/WebAssembly/implicit-def.ll
===================================================================
--- test/CodeGen/WebAssembly/implicit-def.ll
+++ test/CodeGen/WebAssembly/implicit-def.ll
@@ -1,6 +1,6 @@
 ; RUN: llc -o - %s -asm-verbose=false | FileCheck %s
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; Test that stackified IMPLICIT_DEF instructions are converted into
 ; CONST_I32 to provide an explicit push.
Index: test/CodeGen/WebAssembly/inline-asm-m.ll
===================================================================
--- test/CodeGen/WebAssembly/inline-asm-m.ll
+++ test/CodeGen/WebAssembly/inline-asm-m.ll
@@ -4,7 +4,7 @@
 ; -no-integrated-as since these aren't actually valid assembly syntax.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 define void @bar(i32* %r, i32* %s) {
 entry:
Index: test/CodeGen/WebAssembly/inline-asm.ll
===================================================================
--- test/CodeGen/WebAssembly/inline-asm.ll
+++ test/CodeGen/WebAssembly/inline-asm.ll
@@ -4,7 +4,7 @@
 ; actually valid assembly syntax.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; CHECK-LABEL: foo:
 ; CHECK-NEXT: .param i32{{$}}
Index: test/CodeGen/WebAssembly/irreducible-cfg.ll
===================================================================
--- test/CodeGen/WebAssembly/irreducible-cfg.ll
+++ test/CodeGen/WebAssembly/irreducible-cfg.ll
@@ -3,7 +3,7 @@
 ; Test irreducible CFG handling.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; A simple loop with two entries.
 
Index: test/CodeGen/WebAssembly/legalize.ll
===================================================================
--- test/CodeGen/WebAssembly/legalize.ll
+++ test/CodeGen/WebAssembly/legalize.ll
@@ -3,7 +3,7 @@
 ; Test various types and operators that need to be legalized.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; CHECK-LABEL: shl_i3:
 ; CHECK: i32.const   $push0=, 7{{$}}
Index: test/CodeGen/WebAssembly/libcalls.ll
===================================================================
--- test/CodeGen/WebAssembly/libcalls.ll
+++ test/CodeGen/WebAssembly/libcalls.ll
@@ -3,7 +3,7 @@
 ; Test a subset of compiler-rt/libm libcalls expected to be emitted by the wasm backend
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 declare fp128 @llvm.sqrt.f128(fp128)
 declare fp128 @llvm.floor.f128(fp128)
Index: test/CodeGen/WebAssembly/load-ext-atomic.ll
===================================================================
--- test/CodeGen/WebAssembly/load-ext-atomic.ll
+++ test/CodeGen/WebAssembly/load-ext-atomic.ll
@@ -3,7 +3,7 @@
 ; Test that extending loads are assembled properly.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; CHECK-LABEL: sext_i8_i32:
 ; CHECK: i32.atomic.load8_u $push0=, 0($0){{$}}
Index: test/CodeGen/WebAssembly/load-ext.ll
===================================================================
--- test/CodeGen/WebAssembly/load-ext.ll
+++ test/CodeGen/WebAssembly/load-ext.ll
@@ -3,7 +3,7 @@
 ; Test that extending loads are assembled properly.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; CHECK-LABEL: sext_i8_i32:
 ; CHECK: i32.load8_s $push0=, 0($0){{$}}
Index: test/CodeGen/WebAssembly/load-store-i1.ll
===================================================================
--- test/CodeGen/WebAssembly/load-store-i1.ll
+++ test/CodeGen/WebAssembly/load-store-i1.ll
@@ -3,7 +3,7 @@
 ; Test that i1 extending loads and truncating stores are assembled properly.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; CHECK-LABEL: load_u_i1_i32:
 ; CHECK:      i32.load8_u $push[[NUM0:[0-9]+]]=, 0($0){{$}}
Index: test/CodeGen/WebAssembly/load.ll
===================================================================
--- test/CodeGen/WebAssembly/load.ll
+++ test/CodeGen/WebAssembly/load.ll
@@ -4,7 +4,7 @@
 ; Test that basic loads are assembled properly.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; CHECK-LABEL: ldi32:
 ; CHECK-NEXT: .param i32{{$}}
Index: test/CodeGen/WebAssembly/lower-em-ehsjlj-options.ll
===================================================================
--- test/CodeGen/WebAssembly/lower-em-ehsjlj-options.ll
+++ test/CodeGen/WebAssembly/lower-em-ehsjlj-options.ll
@@ -3,7 +3,7 @@
 ; RUN: llc < %s | FileCheck %s --check-prefix=NONE
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 %struct.__jmp_buf_tag = type { [6 x i32], i32, [32 x i32] }
 
Index: test/CodeGen/WebAssembly/lower-em-exceptions-whitelist.ll
===================================================================
--- test/CodeGen/WebAssembly/lower-em-exceptions-whitelist.ll
+++ test/CodeGen/WebAssembly/lower-em-exceptions-whitelist.ll
@@ -1,7 +1,7 @@
 ; RUN: opt < %s -wasm-lower-em-ehsjlj -emscripten-cxx-exceptions-whitelist=do_catch -S | FileCheck %s
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 define void @dont_catch() personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {
 ; CHECK-LABEL: @dont_catch(
Index: test/CodeGen/WebAssembly/lower-em-exceptions.ll
===================================================================
--- test/CodeGen/WebAssembly/lower-em-exceptions.ll
+++ test/CodeGen/WebAssembly/lower-em-exceptions.ll
@@ -1,7 +1,7 @@
 ; RUN: opt < %s -wasm-lower-em-ehsjlj -S | FileCheck %s
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 @_ZTIi = external constant i8*
 @_ZTIc = external constant i8*
Index: test/CodeGen/WebAssembly/lower-em-sjlj.ll
===================================================================
--- test/CodeGen/WebAssembly/lower-em-sjlj.ll
+++ test/CodeGen/WebAssembly/lower-em-sjlj.ll
@@ -1,7 +1,7 @@
 ; RUN: opt < %s -wasm-lower-em-ehsjlj -S | FileCheck %s
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 %struct.__jmp_buf_tag = type { [6 x i32], i32, [32 x i32] }
 
Index: test/CodeGen/WebAssembly/lower-global-dtors.ll
===================================================================
--- test/CodeGen/WebAssembly/lower-global-dtors.ll
+++ test/CodeGen/WebAssembly/lower-global-dtors.ll
@@ -1,7 +1,7 @@
 ; RUN: llc < %s -asm-verbose=false | FileCheck --check-prefix=CHECK --check-prefix=FINI --check-prefix=NULL %s
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; Test that @llvm.global_dtors is properly lowered into @llvm.global_ctors,
 ; grouping dtor calls by priority and associated symbol.
Index: test/CodeGen/WebAssembly/main-declaration.ll
===================================================================
--- test/CodeGen/WebAssembly/main-declaration.ll
+++ test/CodeGen/WebAssembly/main-declaration.ll
@@ -3,7 +3,7 @@
 ; Test main functions with alternate signatures.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 declare void @main()
 
Index: test/CodeGen/WebAssembly/main.ll
===================================================================
--- test/CodeGen/WebAssembly/main.ll
+++ test/CodeGen/WebAssembly/main.ll
@@ -3,7 +3,7 @@
 ; Test main functions with alternate signatures.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 define void @main() {
   ret void
Index: test/CodeGen/WebAssembly/mem-intrinsics.ll
===================================================================
--- test/CodeGen/WebAssembly/mem-intrinsics.ll
+++ test/CodeGen/WebAssembly/mem-intrinsics.ll
@@ -3,7 +3,7 @@
 ; Test memcpy, memmove, and memset intrinsics.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 declare void @llvm.memcpy.p0i8.p0i8.i32(i8* nocapture, i8* nocapture readonly, i32, i1)
 declare void @llvm.memmove.p0i8.p0i8.i32(i8* nocapture, i8* nocapture readonly, i32, i1)
Index: test/CodeGen/WebAssembly/memory-addr32.ll
===================================================================
--- test/CodeGen/WebAssembly/memory-addr32.ll
+++ test/CodeGen/WebAssembly/memory-addr32.ll
@@ -3,7 +3,7 @@
 ; Test that basic memory operations assemble as expected with 32-bit addresses.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 declare i32 @llvm.wasm.mem.size.i32(i32) nounwind readonly
 declare i32 @llvm.wasm.mem.grow.i32(i32, i32) nounwind
Index: test/CodeGen/WebAssembly/non-executable-stack.ll
===================================================================
--- test/CodeGen/WebAssembly/non-executable-stack.ll
+++ test/CodeGen/WebAssembly/non-executable-stack.ll
@@ -4,6 +4,6 @@
 ; because wasm's stack is always non-executable.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; CHECK-NOT: .note.GNU-stack
Index: test/CodeGen/WebAssembly/offset-atomics.ll
===================================================================
--- test/CodeGen/WebAssembly/offset-atomics.ll
+++ test/CodeGen/WebAssembly/offset-atomics.ll
@@ -4,7 +4,7 @@
 ; Test that atomic loads are assembled properly.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; CHECK-LABEL: load_i32_no_offset:
 ; CHECK: i32.atomic.load $push[[NUM:[0-9]+]]=, 0($0){{$}}
Index: test/CodeGen/WebAssembly/offset-folding.ll
===================================================================
--- test/CodeGen/WebAssembly/offset-folding.ll
+++ test/CodeGen/WebAssembly/offset-folding.ll
@@ -3,7 +3,7 @@
 ; Test that constant offsets can be folded into global addresses.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 @x = external global [0 x i32]
 @y = global [50 x i32] zeroinitializer
Index: test/CodeGen/WebAssembly/offset.ll
===================================================================
--- test/CodeGen/WebAssembly/offset.ll
+++ test/CodeGen/WebAssembly/offset.ll
@@ -3,7 +3,7 @@
 ; Test constant load and store address offsets.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; With an nuw add, we can fold an offset.
 
Index: test/CodeGen/WebAssembly/phi.ll
===================================================================
--- test/CodeGen/WebAssembly/phi.ll
+++ test/CodeGen/WebAssembly/phi.ll
@@ -3,7 +3,7 @@
 ; Test that phis are lowered.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; Basic phi triangle.
 
Index: test/CodeGen/WebAssembly/reg-stackify.ll
===================================================================
--- test/CodeGen/WebAssembly/reg-stackify.ll
+++ test/CodeGen/WebAssembly/reg-stackify.ll
@@ -3,7 +3,7 @@
 ; Test the register stackifier pass.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; No because of pointer aliasing.
 
Index: test/CodeGen/WebAssembly/return-int32.ll
===================================================================
--- test/CodeGen/WebAssembly/return-int32.ll
+++ test/CodeGen/WebAssembly/return-int32.ll
@@ -2,7 +2,7 @@
 ; RUN: llc < %s -asm-verbose=false -fast-isel -fast-isel-abort=1 | FileCheck %s
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; CHECK-LABEL: return_i32:
 ; CHECK-NEXT:  .param i32{{$}}
Index: test/CodeGen/WebAssembly/return-void.ll
===================================================================
--- test/CodeGen/WebAssembly/return-void.ll
+++ test/CodeGen/WebAssembly/return-void.ll
@@ -2,7 +2,7 @@
 ; RUN: llc < %s -asm-verbose=false -fast-isel -fast-isel-abort=1 | FileCheck %s
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; CHECK-LABEL: return_void:
 ; CHECK-NEXT: end_function{{$}}
Index: test/CodeGen/WebAssembly/returned.ll
===================================================================
--- test/CodeGen/WebAssembly/returned.ll
+++ test/CodeGen/WebAssembly/returned.ll
@@ -3,7 +3,7 @@
 ; Test that the "returned" attribute is optimized effectively.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; CHECK-LABEL: _Z3foov:
 ; CHECK-NEXT: .result   i32{{$}}
Index: test/CodeGen/WebAssembly/select.ll
===================================================================
--- test/CodeGen/WebAssembly/select.ll
+++ test/CodeGen/WebAssembly/select.ll
@@ -4,7 +4,7 @@
 ; Test that wasm select instruction is selected from LLVM select instruction.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; CHECK-LABEL: select_i32_bool:
 ; CHECK-NEXT: .param     i32, i32, i32{{$}}
Index: test/CodeGen/WebAssembly/signext-arg.ll
===================================================================
--- test/CodeGen/WebAssembly/signext-arg.ll
+++ test/CodeGen/WebAssembly/signext-arg.ll
@@ -2,7 +2,7 @@
 ; RUN: llc < %s -asm-verbose=false -disable-wasm-explicit-locals | FileCheck %s
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 declare i32 @get_int(i16 %arg)
 
Index: test/CodeGen/WebAssembly/signext-inreg.ll
===================================================================
--- test/CodeGen/WebAssembly/signext-inreg.ll
+++ test/CodeGen/WebAssembly/signext-inreg.ll
@@ -2,7 +2,7 @@
 ; RUN: llc < %s -asm-verbose=false -disable-wasm-fallthrough-return-opt -disable-wasm-explicit-locals | FileCheck %s --check-prefix=NOSIGNEXT
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; CHECK-LABEL: i32_extend8_s:
 ; CHECK-NEXT: .param i32{{$}}
Index: test/CodeGen/WebAssembly/signext-zeroext.ll
===================================================================
--- test/CodeGen/WebAssembly/signext-zeroext.ll
+++ test/CodeGen/WebAssembly/signext-zeroext.ll
@@ -3,7 +3,7 @@
 ; Test zeroext and signext ABI keywords
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; CHECK-LABEL: z2s_func:
 ; CHECK-NEXT: .param i32{{$}}
Index: test/CodeGen/WebAssembly/simd-arith.ll
===================================================================
--- test/CodeGen/WebAssembly/simd-arith.ll
+++ test/CodeGen/WebAssembly/simd-arith.ll
@@ -6,7 +6,7 @@
 ; Test that basic SIMD128 arithmetic operations assemble as expected.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 declare i32 @llvm.ctlz.i32(i32, i1)
 declare i32 @llvm.cttz.i32(i32, i1)
Index: test/CodeGen/WebAssembly/stack-alignment.ll
===================================================================
--- test/CodeGen/WebAssembly/stack-alignment.ll
+++ test/CodeGen/WebAssembly/stack-alignment.ll
@@ -1,7 +1,7 @@
 ; RUN: llc < %s -asm-verbose=false -disable-wasm-fallthrough-return-opt | FileCheck %s
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 declare void @somefunc(i32*)
 
Index: test/CodeGen/WebAssembly/store-trunc.ll
===================================================================
--- test/CodeGen/WebAssembly/store-trunc.ll
+++ test/CodeGen/WebAssembly/store-trunc.ll
@@ -3,7 +3,7 @@
 ; Test that truncating stores are assembled properly.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; CHECK-LABEL: trunc_i8_i32:
 ; CHECK: i32.store8 0($0), $1{{$}}
Index: test/CodeGen/WebAssembly/store.ll
===================================================================
--- test/CodeGen/WebAssembly/store.ll
+++ test/CodeGen/WebAssembly/store.ll
@@ -4,7 +4,7 @@
 ; Test that basic stores are assembled properly.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; CHECK-LABEL: sti32:
 ; CHECK-NEXT: .param i32, i32{{$}}
Index: test/CodeGen/WebAssembly/switch.ll
===================================================================
--- test/CodeGen/WebAssembly/switch.ll
+++ test/CodeGen/WebAssembly/switch.ll
@@ -4,7 +4,7 @@
 ; the blocks in a way that isn't interesting here.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 declare void @foo0()
 declare void @foo1()
Index: test/CodeGen/WebAssembly/umulo-i64.ll
===================================================================
--- test/CodeGen/WebAssembly/umulo-i64.ll
+++ test/CodeGen/WebAssembly/umulo-i64.ll
@@ -1,7 +1,7 @@
 ; RUN: llc < %s -asm-verbose=false -disable-wasm-explicit-locals | FileCheck %s
 ; Test that UMULO works correctly on 64-bit operands.
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; CHECK-LABEL: _ZN4core3num21_$LT$impl$u20$u64$GT$15overflowing_mul17h07be88b4cbac028fE:
 ; CHECK:     __multi3
Index: test/CodeGen/WebAssembly/unreachable.ll
===================================================================
--- test/CodeGen/WebAssembly/unreachable.ll
+++ test/CodeGen/WebAssembly/unreachable.ll
@@ -5,7 +5,7 @@
 ; wasm unreachable
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 declare void @llvm.trap()
 declare void @llvm.debugtrap()
Index: test/CodeGen/WebAssembly/unsupported-function-bitcasts.ll
===================================================================
--- test/CodeGen/WebAssembly/unsupported-function-bitcasts.ll
+++ test/CodeGen/WebAssembly/unsupported-function-bitcasts.ll
@@ -5,7 +5,7 @@
 ; conversions are implemented.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; CHECK-LABEL: test:
 ; CHECK-NEXT: i32.const   $push[[L0:[0-9]+]]=, 0{{$}}
Index: test/CodeGen/WebAssembly/unused-argument.ll
===================================================================
--- test/CodeGen/WebAssembly/unused-argument.ll
+++ test/CodeGen/WebAssembly/unused-argument.ll
@@ -3,7 +3,7 @@
 ; Make sure that argument offsets are correct even if some arguments are unused.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; CHECK-LABEL: unused_first:
 ; CHECK-NEXT: .param i32, i32{{$}}
Index: test/CodeGen/WebAssembly/userstack.ll
===================================================================
--- test/CodeGen/WebAssembly/userstack.ll
+++ test/CodeGen/WebAssembly/userstack.ll
@@ -1,7 +1,7 @@
 ; RUN: llc < %s -asm-verbose=false -disable-wasm-fallthrough-return-opt | FileCheck %s
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 declare void @ext_func(i64* %ptr)
 declare void @ext_func_i32(i32* %ptr)
Index: test/CodeGen/WebAssembly/varargs.ll
===================================================================
--- test/CodeGen/WebAssembly/varargs.ll
+++ test/CodeGen/WebAssembly/varargs.ll
@@ -3,7 +3,7 @@
 ; Test varargs constructs.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; Test va_start.
 
Index: test/CodeGen/WebAssembly/vtable.ll
===================================================================
--- test/CodeGen/WebAssembly/vtable.ll
+++ test/CodeGen/WebAssembly/vtable.ll
@@ -12,7 +12,7 @@
 ; Each with a virtual dtor and method foo.
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 %struct.A = type { i32 (...)** }
 %struct.B = type { %struct.A }
Index: test/DebugInfo/WebAssembly/dbg-declare.ll
===================================================================
--- test/DebugInfo/WebAssembly/dbg-declare.ll
+++ test/DebugInfo/WebAssembly/dbg-declare.ll
@@ -1,5 +1,5 @@
-; RUN: llc < %s -verify-machineinstrs -mtriple=wasm32-unknown-unknown-wasm | FileCheck %s
-; RUN: llc < %s -verify-machineinstrs -mtriple=wasm32-unknown-unknown-wasm -fast-isel | FileCheck --check-prefix=CHECK-FAST %s
+; RUN: llc < %s -verify-machineinstrs -mtriple=wasm32-unknown-unknown | FileCheck %s
+; RUN: llc < %s -verify-machineinstrs -mtriple=wasm32-unknown-unknown -fast-isel | FileCheck --check-prefix=CHECK-FAST %s
 
 ; CHECK: DW_TAG_variable
 ; CHECK-FAST: DW_TAG_variable
@@ -8,7 +8,7 @@
 
 source_filename = "test/DebugInfo/WebAssembly/dbg-declare.ll"
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 @key = external global [15 x i8], align 1
 
Index: test/MC/WebAssembly/array-fill.ll
===================================================================
--- test/MC/WebAssembly/array-fill.ll
+++ test/MC/WebAssembly/array-fill.ll
@@ -3,7 +3,7 @@
 
 source_filename = "ws.c"
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 %struct.bd = type { i8 }
 
Index: test/MC/WebAssembly/bss.ll
===================================================================
--- test/MC/WebAssembly/bss.ll
+++ test/MC/WebAssembly/bss.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple wasm32-unknown-unknown-wasm -filetype=obj %s -o - | obj2yaml | FileCheck %s
+; RUN: llc -mtriple wasm32-unknown-unknown -filetype=obj %s -o - | obj2yaml | FileCheck %s
 
 @g0 = global i8* null, align 4
 @g1 = global i32 0, align 4
Index: test/MC/WebAssembly/comdat.ll
===================================================================
--- test/MC/WebAssembly/comdat.ll
+++ test/MC/WebAssembly/comdat.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple wasm32-unknown-unknown-wasm -filetype=obj %s -o - | obj2yaml | FileCheck %s
+; RUN: llc -mtriple wasm32-unknown-unknown -filetype=obj %s -o - | obj2yaml | FileCheck %s
 
 ; Import a function just so we can check the index arithmetic for
 ; WASM_COMDAT_FUNCTION entries is performed correctly
Index: test/MC/WebAssembly/custom-code-section.ll
===================================================================
--- test/MC/WebAssembly/custom-code-section.ll
+++ test/MC/WebAssembly/custom-code-section.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple wasm32-unknown-unknown-wasm -O2 -filetype=obj %s -o %t.o
+; RUN: llc -mtriple wasm32-unknown-unknown -O2 -filetype=obj %s -o %t.o
 
 ; Wasm silently ignores custom sections for code.
 ; We had a bug where this cause a crash
Index: test/MC/WebAssembly/debug-info.ll
===================================================================
--- test/MC/WebAssembly/debug-info.ll
+++ test/MC/WebAssembly/debug-info.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple wasm32-unknown-unknown-wasm -filetype=obj %s -o - | llvm-readobj -r -s -expand-relocs
+; RUN: llc -mtriple wasm32-unknown-unknown -filetype=obj %s -o - | llvm-readobj -r -s -expand-relocs
 
 ; Debug information is currently not supported.  This test simply verifies that
 ; a valid object generated.
Index: test/MC/WebAssembly/explicit-sections.ll
===================================================================
--- test/MC/WebAssembly/explicit-sections.ll
+++ test/MC/WebAssembly/explicit-sections.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple wasm32-unknown-unknown-wasm -filetype=obj %s -o - | obj2yaml | FileCheck %s
+; RUN: llc -mtriple wasm32-unknown-unknown -filetype=obj %s -o - | obj2yaml | FileCheck %s
 
 %struct.bd = type { i32, i8 }
 
Index: test/MC/WebAssembly/external-data.ll
===================================================================
--- test/MC/WebAssembly/external-data.ll
+++ test/MC/WebAssembly/external-data.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple wasm32-unknown-unknown-wasm -filetype=obj %s -o - | obj2yaml | FileCheck %s
+; RUN: llc -mtriple wasm32-unknown-unknown -filetype=obj %s -o - | obj2yaml | FileCheck %s
 ; Verify relocations are correctly generated for addresses of externals
 ; in the data section.
 
Index: test/MC/WebAssembly/external-func-address.ll
===================================================================
--- test/MC/WebAssembly/external-func-address.ll
+++ test/MC/WebAssembly/external-func-address.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple wasm32-unknown-unknown-wasm -filetype=obj %s -o - | obj2yaml | FileCheck %s
+; RUN: llc -mtriple wasm32-unknown-unknown -filetype=obj %s -o - | obj2yaml | FileCheck %s
 ; Verify that addresses of external functions generate correctly typed
 ; imports and relocations or type R_TABLE_INDEX_I32.
 
Index: test/MC/WebAssembly/file-headers.ll
===================================================================
--- test/MC/WebAssembly/file-headers.ll
+++ test/MC/WebAssembly/file-headers.ll
@@ -1,7 +1,7 @@
 ; RUN: llc -filetype=obj %s -o - | llvm-readobj -file-headers | FileCheck %s
 
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
-target triple = "wasm32-unknown-unknown-wasm"
+target triple = "wasm32-unknown-unknown"
 
 ; CHECK: Format: WASM{{$}}
 ; CHECK: Arch: wasm32{{$}}
Index: test/MC/WebAssembly/func-address.ll
===================================================================
--- test/MC/WebAssembly/func-address.ll
+++ test/MC/WebAssembly/func-address.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple wasm32-unknown-unknown-wasm -O2 -filetype=obj %s -o - | llvm-readobj -r -s -expand-relocs | FileCheck %s
+; RUN: llc -mtriple wasm32-unknown-unknown -O2 -filetype=obj %s -o - | llvm-readobj -r -s -expand-relocs | FileCheck %s
 
 declare i32 @import1()
 declare i32 @import2()
Index: test/MC/WebAssembly/global-ctor-dtor.ll
===================================================================
--- test/MC/WebAssembly/global-ctor-dtor.ll
+++ test/MC/WebAssembly/global-ctor-dtor.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple wasm32-unknown-unknown-wasm -filetype=obj %s -o - | obj2yaml | FileCheck %s
+; RUN: llc -mtriple wasm32-unknown-unknown -filetype=obj %s -o - | obj2yaml | FileCheck %s
 
 @global1 = global i32 1025, align 8
 
Index: test/MC/WebAssembly/reloc-code.ll
===================================================================
--- test/MC/WebAssembly/reloc-code.ll
+++ test/MC/WebAssembly/reloc-code.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple wasm32-unknown-unknown-wasm -filetype=obj %s -o - | llvm-readobj -r -expand-relocs | FileCheck %s
+; RUN: llc -mtriple wasm32-unknown-unknown -filetype=obj %s -o - | llvm-readobj -r -expand-relocs | FileCheck %s
 
 ; Pointers to functions of two different types
 @a = global i64 ()* inttoptr (i64 5 to i64 ()*), align 8
Index: test/MC/WebAssembly/reloc-data.ll
===================================================================
--- test/MC/WebAssembly/reloc-data.ll
+++ test/MC/WebAssembly/reloc-data.ll
@@ -1,4 +1,4 @@
-; RUN: llc -O0 -mtriple wasm32-unknown-unknown-wasm -filetype=obj %s -o - | llvm-readobj -r -expand-relocs | FileCheck %s
+; RUN: llc -O0 -mtriple wasm32-unknown-unknown -filetype=obj %s -o - | llvm-readobj -r -expand-relocs | FileCheck %s
 
 ; foo and bar are external and internal symbols.  a and b are pointers
 ; initialized to these locations offset by 2 and -2 elements respecitively.
Index: test/MC/WebAssembly/sections.ll
===================================================================
--- test/MC/WebAssembly/sections.ll
+++ test/MC/WebAssembly/sections.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple wasm32-unknown-unknown-wasm -filetype=obj %s -o - | llvm-readobj -s | FileCheck %s
+; RUN: llc -mtriple wasm32-unknown-unknown -filetype=obj %s -o - | llvm-readobj -s | FileCheck %s
 
 ; external function
 declare i32 @a()
Index: test/MC/WebAssembly/stack-ptr.ll
===================================================================
--- test/MC/WebAssembly/stack-ptr.ll
+++ test/MC/WebAssembly/stack-ptr.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple wasm32-unknown-unknown-wasm -filetype=obj %s -o - | obj2yaml | FileCheck %s
+; RUN: llc -mtriple wasm32-unknown-unknown -filetype=obj %s -o - | obj2yaml | FileCheck %s
 
 ; Function that uses explict stack, and should generate a reference to
 ; __stack_pointer, along with the corresponding reloction entry.
Index: test/MC/WebAssembly/unnamed-data.ll
===================================================================
--- test/MC/WebAssembly/unnamed-data.ll
+++ test/MC/WebAssembly/unnamed-data.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple wasm32-unknown-unknown-wasm -filetype=obj %s -o - | obj2yaml | FileCheck %s
+; RUN: llc -mtriple wasm32-unknown-unknown -filetype=obj %s -o - | obj2yaml | FileCheck %s
 
 @.str1 = private unnamed_addr constant [6 x i8] c"hello\00", align 1
 @.str2 = private unnamed_addr constant [6 x i8] c"world\00", align 1
Index: test/MC/WebAssembly/visibility.ll
===================================================================
--- test/MC/WebAssembly/visibility.ll
+++ test/MC/WebAssembly/visibility.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple wasm32-unknown-unknown-wasm -filetype=obj %s -o - | obj2yaml | FileCheck %s
+; RUN: llc -mtriple wasm32-unknown-unknown -filetype=obj %s -o - | obj2yaml | FileCheck %s
 
 ; Function with __attribute__((visibility("default")))
 define void @defaultVis() #0 {
Index: test/MC/WebAssembly/weak-alias.ll
===================================================================
--- test/MC/WebAssembly/weak-alias.ll
+++ test/MC/WebAssembly/weak-alias.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple wasm32-unknown-unknown-wasm -filetype=obj %s -o %t.o
+; RUN: llc -mtriple wasm32-unknown-unknown -filetype=obj %s -o %t.o
 ; RUN: obj2yaml %t.o | FileCheck %s
 ; RUN: llvm-objdump -t %t.o | FileCheck --check-prefix=CHECK-SYMS %s
 
Index: test/MC/WebAssembly/weak.ll
===================================================================
--- test/MC/WebAssembly/weak.ll
+++ test/MC/WebAssembly/weak.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple wasm32-unknown-unknown-wasm -filetype=obj %s -o - | obj2yaml | FileCheck %s
+; RUN: llc -mtriple wasm32-unknown-unknown -filetype=obj %s -o - | obj2yaml | FileCheck %s
 
 ; Weak external data reference
 @weak_external_data = extern_weak global i32, align 4
Index: test/Object/Inputs/trivial.ll
===================================================================
--- test/Object/Inputs/trivial.ll
+++ test/Object/Inputs/trivial.ll
@@ -1,5 +1,5 @@
 ; Input used for generating checked-in binaries (trivial-object-test.*)
-; llc -mtriple=wasm32-unknown-unknown-wasm trivial.ll -filetype=obj -o trivial-object-test.wasm
+; llc -mtriple=wasm32-unknown-unknown trivial.ll -filetype=obj -o trivial-object-test.wasm
 
 @.str = private unnamed_addr constant [13 x i8] c"Hello World\0A\00", align 1
 
Index: test/tools/llvm-nm/wasm/local-symbols.ll
===================================================================
--- test/tools/llvm-nm/wasm/local-symbols.ll
+++ test/tools/llvm-nm/wasm/local-symbols.ll
@@ -1,4 +1,4 @@
-; RUN: llc -filetype=obj -mtriple=wasm32-unknown-unknown-wasm -o %t.o %s
+; RUN: llc -filetype=obj -mtriple=wasm32-unknown-unknown -o %t.o %s
 ; RUN: llvm-nm %t.o | FileCheck %s
 
 @foo = internal global i32 1, align 4
Index: test/tools/llvm-objdump/Inputs/trivial.ll
===================================================================
--- test/tools/llvm-objdump/Inputs/trivial.ll
+++ test/tools/llvm-objdump/Inputs/trivial.ll
@@ -1,5 +1,5 @@
 ; Input used for generating checked-in binaries (trivial.obj.*)
-; llc -mtriple=wasm32-unknown-unknown-wasm trivial.ll -filetype=obj -o trivial.obj.wasm
+; llc -mtriple=wasm32-unknown-unknown trivial.ll -filetype=obj -o trivial.obj.wasm
 
 @.str = private unnamed_addr constant [13 x i8] c"Hello World\0A\00", align 1
 
Index: test/tools/llvm-objdump/WebAssembly/relocations.test
===================================================================
--- test/tools/llvm-objdump/WebAssembly/relocations.test
+++ test/tools/llvm-objdump/WebAssembly/relocations.test
@@ -1,4 +1,4 @@
-; RUN: llc -mtriple=wasm32-unknown-unknown-wasm -filetype=obj %s -o - | llvm-objdump -r - | FileCheck %s
+; RUN: llc -mtriple=wasm32-unknown-unknown -filetype=obj %s -o - | llvm-objdump -r - | FileCheck %s
 
 @foo1 = hidden global i32 1, align 4
 @foo2 = hidden global i32 1, align 4
Index: test/tools/llvm-readobj/Inputs/trivial.ll
===================================================================
--- test/tools/llvm-readobj/Inputs/trivial.ll
+++ test/tools/llvm-readobj/Inputs/trivial.ll
@@ -5,7 +5,7 @@
 ; llc -mtriple=x86_64-linux-gnu trivial.ll -filetype=obj -o trivial.obj.elf-x86-64 -relocation-model=pic
 ; llc -mtriple=i386-apple-darwin10 trivial.ll -filetype=obj -o trivial.obj.macho-i386 -relocation-model=pic
 ; llc -mtriple=x86_64-apple-darwin10 trivial.ll -filetype=obj -o trivial.obj.macho-x86-64 -relocation-model=pic
-; llc -mtriple=wasm32-unknown-unknown-wasm trivial.ll -filetype=obj -o trivial.obj.wasm
+; llc -mtriple=wasm32-unknown-unknown trivial.ll -filetype=obj -o trivial.obj.wasm
 
 @.str = private unnamed_addr constant [13 x i8] c"Hello World\0A\00", align 1