Index: test/CodeGen/Thumb/iabs.ll
===================================================================
--- test/CodeGen/Thumb/iabs.ll
+++ test/CodeGen/Thumb/iabs.ll
@@ -9,8 +9,8 @@
 
 ; This test just checks that 4 instructions were emitted
 
-; CHECK:      {{text}}
-; CHECK:      0:
+; CHECK:      test:
+; CHECK-NEXT: 0:
 ; CHECK-NEXT: 2:
 ; CHECK-NEXT: 4:
 ; CHECK-NEXT: 6:
Index: test/MC/AMDGPU/labels-with-same-address.s
===================================================================
--- test/MC/AMDGPU/labels-with-same-address.s
+++ test/MC/AMDGPU/labels-with-same-address.s
@@ -0,0 +1,13 @@
+// RUN: llvm-mc -arch=amdgcn -mcpu=gfx803 -filetype=obj < %s | llvm-objdump -arch=amdgcn -mcpu=gfx803 --disassemble - | FileCheck %s
+
+
+// CHECK: s_branch BB0_1
+// CHECK: BB0_1:
+// CHECK: BB0_2:
+// CHECK: s_endpgm
+
+s_branch BB0_1
+
+BB0_1:
+BB0_2:
+s_endpgm
Index: test/MC/ARM/elf-movt.s
===================================================================
--- test/MC/ARM/elf-movt.s
+++ test/MC/ARM/elf-movt.s
@@ -30,7 +30,7 @@
 @ ASM-NEXT:     movt    r0, :upper16:((foo-bar)+1234)
 
 @OBJ:      Disassembly of section .text:
-@OBJ-NEXT: barf:
+@OBJ:      barf:
 @OBJ-NEXT: 0:             f0 0f 0f e3     movw    r0, #65520
 @OBJ-NEXT: 00000000:         R_ARM_MOVW_PREL_NC   GOT
 @OBJ-NEXT: 4:             f4 0f 4f e3     movt    r0, #65524
@@ -43,7 +43,7 @@
 @OBJ-NEXT: 14:            00 00 40 e3     movt    r0, #0
 
 @THUMB:      Disassembly of section .text:
-@THUMB-NEXT: barf:
+@THUMB:      barf:
 @THUMB-NEXT: 0:             4f f6 f0 70     movw    r0, #65520
 @THUMB-NEXT: 00000000:         R_ARM_THM_MOVW_PREL_NC GOT
 @THUMB-NEXT: 4:             cf f6 f4 70     movt    r0, #65524
Index: test/MC/Mips/set-defined-symbol.s
===================================================================
--- test/MC/Mips/set-defined-symbol.s
+++ test/MC/Mips/set-defined-symbol.s
@@ -8,11 +8,11 @@
   .set foo, a
 a:
   nop
-# CHECK-NOT: a:
+# CHECK: a:
 # CHECK: foo:
 
 b:
   nop
-# CHECK-NOT: b:
+# CHECK: b:
 # CHECK-NOT: foo:
 # CHECK: bar:
Index: test/tools/llvm-objdump/X86/disasm-specific-funcs.test
===================================================================
--- test/tools/llvm-objdump/X86/disasm-specific-funcs.test
+++ test/tools/llvm-objdump/X86/disasm-specific-funcs.test
@@ -2,7 +2,7 @@
 // RUN: llvm-objdump -d %t.out -df=main | FileCheck %s
 
 // CHECK:              Disassembly of section .anothertext:
-// CHECK-NEXT:         main:
+// CHECK:              main:
 // CHECK-NEXT:         10:       55      pushq   %rbp
 // CHECK-NEXT:         11:       48 89 e5        movq    %rsp, %rbp
 // CHECK-NEXT:         14:       48 83 ec 20     subq    $32, %rsp
Index: test/tools/llvm-objdump/X86/out-of-section-sym.test
===================================================================
--- test/tools/llvm-objdump/X86/out-of-section-sym.test
+++ test/tools/llvm-objdump/X86/out-of-section-sym.test
@@ -3,8 +3,10 @@
 // RUN: llvm-objdump -d -t %p/Inputs/out-of-section-sym.elf-i386 | FileCheck %s
 
 CHECK: Disassembly of section .text:
-CHECK-NEXT: _start:
+CHECK:      _start:
 CHECK-NEXT:   10:  c3  retl
+
+CHECK:      _fdata:
 CHECK-NEXT: SYMBOL TABLE:
 CHECK-NEXT: 00000000         *UND*  00000000
 CHECK-NEXT: 00000010 l    d  .text  00000000 .text
Index: test/tools/llvm-objdump/X86/start-stop-address.test
===================================================================
--- test/tools/llvm-objdump/X86/start-stop-address.test
+++ test/tools/llvm-objdump/X86/start-stop-address.test
@@ -4,7 +4,7 @@
 // RUN: llvm-objdump -d %t.out --start-address=0x40 --stop-address=0x47 | FileCheck %s --check-prefix "CROSSDATA"
 
 // CHECK:              Disassembly of section .anothertext:
-// CHECK-NEXT:         main:
+// CHECK:              main:
 // CHECK-NEXT:         18:	48 8d 04 25 a8 00 00 00 	leaq	168, %rax
 // CHECK-NEXT:         20:	c7 45 fc 00 00 00 00 	movl	$0, -4(%rbp)
 // CHECK-NEXT:         27:	48 89 45 f0 	movq	%rax, -16(%rbp)
@@ -12,11 +12,11 @@
 // CHECK-NOT:          2f:
 
 // CROSSSECTION:       Disassembly of section .text:
-// CROSSSECTION-NEXT:  foo:
+// CROSSSECTION:       foo:
 // CROSSSECTION-NEXT:  c:	c3 	retq
 // CROSSSECTION-NEXT:  d:	0f 1f 00 	nopl	(%rax)
-// CROSSSECTION-NEXT:  Disassembly of section .anothertext:
-// CROSSSECTION-NEXT:  main:
+// CROSSSECTION:  Disassembly of section .anothertext:
+// CROSSSECTION:  main:
 // CROSSSECTION-NEXT:  10:	55 	pushq	%rbp
 // CROSSSECTION-NOT:   11:
 
Index: tools/llvm-objdump/llvm-objdump.cpp
===================================================================
--- tools/llvm-objdump/llvm-objdump.cpp
+++ tools/llvm-objdump/llvm-objdump.cpp
@@ -1430,9 +1430,6 @@
       // Don't try to disassemble beyond the end of section contents.
       if (End > SectSize)
         End = SectSize;
-      // If this symbol has the same address as the next symbol, then skip it.
-      if (Start >= End)
-        continue;
 
       // Check if we need to skip symbol
       // Skip if the symbol's data is not between StartAddress and StopAddress
@@ -1479,6 +1476,10 @@
 
       outs() << '\n' << std::get<1>(Symbols[si]) << ":\n";
 
+      // If this symbol has the same address as the next symbol, then skip it.
+      if (Start >= End)
+        continue;
+
 #ifndef NDEBUG
       raw_ostream &DebugOut = DebugFlag ? dbgs() : nulls();
 #else