diff --git a/llvm/test/CodeGen/X86/dllexport-x86_64.ll b/llvm/test/CodeGen/X86/dllexport-x86_64.ll
@@ -58,23 +58,23 @@ define weak_odr dllexport void @weak1() {
 
 
 ; CHECK: .globl alias
-; CHECK: alias = notExported
+; CHECK: .set alias, notExported
 @alias = dllexport alias void(), void()* @notExported
 
 ; CHECK: .globl aliasNotExported
-; CHECK: aliasNotExported = f1
+; CHECK: .set aliasNotExported, f1
 @aliasNotExported = alias void(), void()* @f1
 
 ; CHECK: .globl alias2
-; CHECK: alias2 = f1
+; CHECK: .set alias2, f1
 @alias2 = dllexport alias void(), void()* @f1
 
 ; CHECK: .globl alias3
-; CHECK: alias3 = notExported
+; CHECK: .set alias3, notExported
 @alias3 = dllexport alias void(), void()* @notExported
 
 ; CHECK: .weak weak_alias
-; CHECK: weak_alias = f1
+; CHECK: .set weak_alias, f1
 @weak_alias = weak_odr dllexport alias void(), void()* @f1
 
 @blob = global [6 x i8] c"\B8*\00\00\00\C3", section ".text", align 16

diff --git a/llvm/test/CodeGen/X86/dllexport.ll b/llvm/test/CodeGen/X86/dllexport.ll
@@ -79,19 +79,19 @@ define weak_odr dllexport void @weak1() {
 
 
 ; CHECK: .globl _alias
-; CHECK: _alias = _notExported
+; CHECK: .set _alias, _notExported
 @alias = dllexport alias void(), void()* @notExported
 
 ; CHECK: .globl _alias2
-; CHECK: _alias2 = _f1
+; CHECK: .set _alias2, _f1
 @alias2 = dllexport alias void(), void()* @f1
 
 ; CHECK: .globl _alias3
-; CHECK: _alias3 = _notExported
+; CHECK: .set _alias3, _notExported
 @alias3 = dllexport alias void(), void()* @notExported
 
 ; CHECK: .weak _weak_alias
-; CHECK: _weak_alias = _f1
+; CHECK: .set _weak_alias, _f1
 @weak_alias = weak_odr dllexport alias void(), void()* @f1
 
 ; Verify items that should not be exported do not appear in the export table.

diff --git a/llvm/test/CodeGen/X86/ifunc-asm.ll b/llvm/test/CodeGen/X86/ifunc-asm.ll
@@ -12,4 +12,4 @@ entry:
 @foo = ifunc i32 (i32), i64 ()* @foo_ifunc
 ; CHECK: .type foo,@function
 ; CHECK-NEXT: .type foo,@gnu_indirect_function
-; CHECK-NEXT: foo = foo_ifunc
+; CHECK-NEXT: .set foo, foo_ifunc
diff --git a/llvm/test/CodeGen/X86/lea-opt-memop-check-1.ll b/llvm/test/CodeGen/X86/lea-opt-memop-check-1.ll
@@ -48,9 +48,9 @@ entry:
   call fastcc void @"\01?fin$0@0@test2@@"(i8* %tmp0)
   ret void
 ; CHECK-LABEL: test2:
-; CHECK:	Ltest2$frame_escape_0 = 8
-; CHECK:	Ltest2$frame_escape_1 = 4
-; CHECK:	Ltest2$frame_escape_2 = 0
+; CHECK:	.set Ltest2$frame_escape_0, 8
+; CHECK:	.set Ltest2$frame_escape_1, 4
+; CHECK:	.set Ltest2$frame_escape_2, 0
 ; CHECK:	calll "?fin$0@0@test2@@"
 }
 

diff --git a/llvm/test/CodeGen/X86/localescape.ll b/llvm/test/CodeGen/X86/localescape.ll
@@ -78,8 +78,8 @@ define void @alloc_func(i32 %n) {
 ; X64: .seh_stackalloc 16
 ; X64: leaq    16(%rsp), %rbp
 ; X64: .seh_setframe 5, 16
-; X64: .Lalloc_func$frame_escape_0 = -4
-; X64: .Lalloc_func$frame_escape_1 = -12
+; X64: .set .Lalloc_func$frame_escape_0, -4
+; X64: .set .Lalloc_func$frame_escape_1, -12
 ; X64: movl $42, -4(%rbp)
 ; X64: movl $13, -12(%rbp)
 ; X64: movq 	%rbp, %rcx
@@ -90,8 +90,8 @@ define void @alloc_func(i32 %n) {
 ; X86: pushl   %ebp
 ; X86: movl    %esp, %ebp
 ; X86: subl    $12, %esp
-; X86: Lalloc_func$frame_escape_0 = -4
-; X86: Lalloc_func$frame_escape_1 = -12
+; X86: .set Lalloc_func$frame_escape_0, -4
+; X86: .set Lalloc_func$frame_escape_1, -12
 ; X86: movl    $42, -4(%ebp)
 ; X86: movl    $13, -12(%ebp)
 ; X86: pushl   %ebp
@@ -120,8 +120,8 @@ define void @alloc_func_no_frameaddr() {
 ; X64: subq    $40, %rsp
 ; X64: .seh_stackalloc 40
 ; X64: .seh_endprologue
-; X64: .Lalloc_func_no_frameaddr$frame_escape_0 = 36
-; X64: .Lalloc_func_no_frameaddr$frame_escape_1 = 32
+; X64: .set .Lalloc_func_no_frameaddr$frame_escape_0, 36
+; X64: .set .Lalloc_func_no_frameaddr$frame_escape_1, 32
 ; X64: movl $42, 36(%rsp)
 ; X64: movl $13, 32(%rsp)
 ; X64: xorl %ecx, %ecx
@@ -131,8 +131,8 @@ define void @alloc_func_no_frameaddr() {
 
 ; X86-LABEL: alloc_func_no_frameaddr:
 ; X86: subl    $8, %esp
-; X86: Lalloc_func_no_frameaddr$frame_escape_0 = 4
-; X86: Lalloc_func_no_frameaddr$frame_escape_1 = 0
+; X86: .set Lalloc_func_no_frameaddr$frame_escape_0, 4
+; X86: .set Lalloc_func_no_frameaddr$frame_escape_1, 0
 ; X86: movl $42, 4(%esp)
 ; X86: movl $13, (%esp)
 ; X86: pushl $0

diff --git a/llvm/test/CodeGen/X86/pr22019.ll b/llvm/test/CodeGen/X86/pr22019.ll
@@ -5,9 +5,9 @@ target triple = "x86_64-unknown-linux-gnu"
 module asm "pselect = __pselect"
 module asm "var = __var"
 module asm "alias = __alias"
-; CHECK: pselect = __pselect
-; CHECK: var = __var
-; CHECK: alias = __alias
+; CHECK: .set pselect, __pselect
+; CHECK: .set var, __var
+; CHECK: .set alias, __alias
 
 ; CHECK: pselect:
 ; CHECK: retq
@@ -19,5 +19,5 @@ define void @pselect() {
 ; CHECK: .long 0
 @var = global i32 0
 
-; CHECK: alias = var
+; CHECK: .set alias, var
 @alias = alias i32, i32* @var
diff --git a/llvm/test/CodeGen/X86/seh-catch-all-win32.ll b/llvm/test/CodeGen/X86/seh-catch-all-win32.ll
@@ -60,7 +60,7 @@ entry:
 ; CHECK: pushl %edi
 ; CHECK: pushl %esi
 
-; CHECK: Lmain$frame_escape_0 = [[code_offs:[-0-9]+]]
+; CHECK: .set Lmain$frame_escape_0, [[code_offs:[-0-9]+]]
 ; CHECK: movl %esp, [[reg_offs:[-0-9]+]](%ebp)
 ; CHECK: movl $L__ehtable$main,
 ;       EH state 0
@@ -80,7 +80,7 @@ entry:
 ; CHECK: calll _printf
 
 ; CHECK: .section .xdata,"dr"
-; CHECK: Lmain$parent_frame_offset = [[reg_offs]]
+; CHECK: .set Lmain$parent_frame_offset, [[reg_offs]]
 ; CHECK: .p2align 2
 ; CHECK: L__ehtable$main
 ; CHECK-NEXT: .long -1

diff --git a/llvm/test/CodeGen/X86/seh-catchpad.ll b/llvm/test/CodeGen/X86/seh-catchpad.ll
@@ -117,7 +117,7 @@ __except.ret:                                     ; preds = %catch.dispatch.7
 ; CHECK:         jmp     .LBB1_[[epilogue]]
 
 ; CHECK:         .seh_handlerdata
-; CHECK-NEXT:         .Lmain$parent_frame_offset = 32
+; CHECK-NEXT:         .set .Lmain$parent_frame_offset, 32
 ; CHECK-NEXT:         .long   (.Llsda_end0-.Llsda_begin0)/16
 ; CHECK-NEXT: .Llsda_begin0:
 ; CHECK-NEXT:         .long   .Ltmp0@IMGREL+1

diff --git a/llvm/test/CodeGen/X86/seh-finally.ll b/llvm/test/CodeGen/X86/seh-finally.ll
@@ -26,7 +26,7 @@ lpad:                                             ; preds = %entry
 ; X64: retq
 
 ; X64: .seh_handlerdata
-; X64-NEXT: .Lmain$parent_frame_offset = 32
+; X64-NEXT: .set .Lmain$parent_frame_offset, 32
 ; X64-NEXT: .long   (.Llsda_end0-.Llsda_begin0)/16 # Number of call sites
 ; X64-NEXT: .Llsda_begin0:
 ; X64-NEXT: .long   .Ltmp0@IMGREL+1 # LabelStart

diff --git a/llvm/test/CodeGen/X86/seh-no-invokes.ll b/llvm/test/CodeGen/X86/seh-no-invokes.ll
@@ -15,7 +15,7 @@
 ; label. This was PR30431.
 
 ; CHECK-LABEL: _f:                                     # @f
-; CHECK: Lf$parent_frame_offset = 0
+; CHECK: .set Lf$parent_frame_offset, 0
 ; CHECK: retl
 
 ; CHECK-LABEL: "?filt$0@0@f@@":                        # @"\01?filt$0@0@f@@"

diff --git a/llvm/test/CodeGen/X86/seh-stack-realign.ll b/llvm/test/CodeGen/X86/seh-stack-realign.ll
@@ -53,7 +53,7 @@ entry:
 ; Check that we can get the exception code from eax to the printf.
 
 ; CHECK-LABEL: _main:
-; CHECK: Lmain$frame_escape_0 = [[code_offs:[-0-9]+]]
+; CHECK: .set Lmain$frame_escape_0, [[code_offs:[-0-9]+]]
 ; CHECK: movl %esp, [[reg_offs:[-0-9]+]](%esi)
 ; CHECK: movl $L__ehtable$main,
 ;       EH state 0
@@ -73,7 +73,7 @@ entry:
 ; CHECK: calll _printf
 
 ; CHECK: .section .xdata,"dr"
-; CHECK: Lmain$parent_frame_offset = [[reg_offs]]
+; CHECK: .set Lmain$parent_frame_offset, [[reg_offs]]
 ; CHECK: L__ehtable$main
 ; CHECK-NEXT: .long -1
 ; CHECK-NEXT: .long _filt$main

diff --git a/llvm/test/CodeGen/XCore/globals.ll b/llvm/test/CodeGen/XCore/globals.ll
@@ -126,4 +126,4 @@ entry:
 
 @array = global [10 x i16] zeroinitializer, align 2
 ; CHECK: .globl  array.globound
-; CHECK:  array.globound = 10
+; CHECK: .set array.globound, 10
diff --git a/llvm/test/CodeGen/XCore/linkage.ll b/llvm/test/CodeGen/XCore/linkage.ll
@@ -19,14 +19,14 @@ define protected void @test_protected() {
 }
 
 ; CHECK: .globl array.globound
-; CHECK: array.globound = 2
+; CHECK: .set array.globound, 2
 ; CHECK: .weak array.globound
 ; CHECK: .globl array
 ; CHECK: .weak array
 @array = weak global [2 x i32] zeroinitializer
 
 ; CHECK: .globl ac.globound
-; CHECK: ac.globound = 2
+; CHECK: .set ac.globound, 2
 ; CHECK: .weak ac.globound
 ; CHECK: .globl ac
 ; CHECK: .weak ac

diff --git a/llvm/test/DebugInfo/X86/dbg-value-range.ll b/llvm/test/DebugInfo/X86/dbg-value-range.ll
@@ -50,9 +50,9 @@ declare void @llvm.dbg.value(metadata, metadata, metadata) nounwind readnone
 ;CHECK-NEXT: [[CLOBBER:Ltmp[0-9]*]]
 
 ;CHECK:Ldebug_loc0:
-;CHECK-NEXT: Lset{{.*}} =
+;CHECK-NEXT: .set Lset{{.*}},
 ;CHECK-NEXT:	.quad
-;CHECK-NEXT: [[CLOBBER_OFF:Lset.*]] = [[CLOBBER]]-{{.*}}
+;CHECK-NEXT: .set [[CLOBBER_OFF:Lset.*]], [[CLOBBER]]-{{.*}}
 ;CHECK-NEXT:	.quad	[[CLOBBER_OFF]]
 ;CHECK-NEXT:  .short 1 ## Loc expr size
 ;CHECK-NEXT:	.byte	85 ## DW_OP_reg

diff --git a/llvm/test/DebugInfo/X86/stmt-list-multiple-compile-units.ll b/llvm/test/DebugInfo/X86/stmt-list-multiple-compile-units.ll
@@ -64,11 +64,11 @@
 ; PR15408
 ; ASM: Lcu_begin0:
 ; ASM-NOT: Lcu_begin
-; ASM: Lset[[LT:[0-9]+]] = Lline_table_start0-Lsection_line ## DW_AT_stmt_list
+; ASM: .set Lset[[LT:[0-9]+]], Lline_table_start0-Lsection_line ## DW_AT_stmt_list
 ; ASM-NEXT: .long   Lset[[LT]]
 ; ASM: Lcu_begin1:
 ; ASM-NOT: Lcu_begin
-; ASM: Lset[[LT:[0-9]+]] = Lline_table_start0-Lsection_line ## DW_AT_stmt_list
+; ASM: .set Lset[[LT:[0-9]+]], Lline_table_start0-Lsection_line ## DW_AT_stmt_list
 ; ASM-NEXT: .long   Lset[[LT]]
 define i32 @test(i32 %a) nounwind uwtable ssp !dbg !5 {
 entry:

diff --git a/llvm/test/MC/AsmParser/assignment.s b/llvm/test/MC/AsmParser/assignment.s
@@ -1,11 +1,22 @@
 # RUN: llvm-mc -triple i386-unknown-unknown %s | FileCheck %s
 
 # CHECK: TEST0:
-# CHECK: a = 0
+# CHECK: .set a, 0
 TEST0:
         a = 0
 
+# CHECK: TEST1:
+# CHECK: .set b, 0
+TEST1:
+        .set b, 0
+
 # CHECK: .globl	_f1
-# CHECK: _f1 = 0
+# CHECK: .set _f1, 0
         .globl _f1
         _f1 = 0
+
+# CHECK: .globl	_f2
+# CHECK: .set _f2, 0
+        .globl _f2
+        .set _f2, 0
+
diff --git a/llvm/test/MC/AsmParser/directive_include.s b/llvm/test/MC/AsmParser/directive_include.s
@@ -2,7 +2,7 @@
 
 # CHECK: TESTA:
 # CHECK: TEST0:
-# CHECK: a = 0
+# CHECK: .set a, 0
 # CHECK: TESTB:
 TESTA:  
 	.include       "directive\137set.s"   # "\137" is underscore "_"

diff --git a/llvm/test/MC/AsmParser/directive_set.s b/llvm/test/MC/AsmParser/directive_set.s
@@ -1,13 +1,13 @@
 # RUN: llvm-mc -triple i386-unknown-elf %s | FileCheck %s
 
 # CHECK: TEST0:
-# CHECK: a = 0
+# CHECK: .set a, 0
 # CHECK-NOT: .no_dead_strip a
 TEST0:  
         .set a, 0
 
 # CHECK: TEST1:
-# CHECK: a = 0
+# CHECK: .set a, 0
 # CHECK-NOT: .no_dead_strip a
 TEST1:  
         .equ a, 0

diff --git a/llvm/test/MC/AsmParser/include.ll b/llvm/test/MC/AsmParser/include.ll
@@ -9,5 +9,5 @@ entry:
   ret void
 }
 
-; CHECK: MODULE = 1
-; CHECK: FUNCTION = 1
+; CHECK: .set MODULE, 1
+; CHECK: .set FUNCTION, 1
diff --git a/llvm/test/MC/AsmParser/labels.s b/llvm/test/MC/AsmParser/labels.s
@@ -18,12 +18,12 @@ foo:
 // CHECK: addl $24, a$b+10(%eax)
         addl $24, ("a$b" + 10)(%eax)
 
-// CHECK: b$c = 10
+// CHECK: .set b$c, 10
 "b$c" = 10
 // CHECK: addl $10, %eax
         addl $"b$c", %eax
 
-// CHECK: "a 0" = 11
+// CHECK: .set "a 0", 11
         .set "a 0", 11
 
 // CHECK: .long 11
@@ -49,7 +49,7 @@ foo:
 // CHECX: .lsym "a 8",1
 //        .lsym "a 8", 1
 
-// CHECK: "a 9" = a-b
+// CHECK: .set "a 9", a-b
         .set "a 9", a - b
 
 // CHECK: .long "a 9"

diff --git a/llvm/test/MC/AsmParser/macro-args.s b/llvm/test/MC/AsmParser/macro-args.s
@@ -49,7 +49,7 @@ top bar, 42
 // CHECK: _foo:
 // CHECK-NOT: fred
 // CHECK: _bar
-// CHECK-NEXT: fred = 42
+// CHECK-NEXT: .set fred, 42
 
 
 .macro foo

diff --git a/llvm/test/MC/Mips/cpsetup.s b/llvm/test/MC/Mips/cpsetup.s
@@ -172,7 +172,7 @@ IMM_8 = 8
         nop
 
 # ALL-LABEL: t1b:
-# ASM-NEXT: IMM_8 = 8
+# ASM-NEXT: .set IMM_8, 8
 
 # O32-NOT: __cerror