[lld] r218429 - [mach-o] fix test case to work with latest llvm-objdump output

[Nick Kledzik]

Author: kledzik
Date: Wed Sep 24 18:55:06 2014
New Revision: 218429

URL: http://llvm.org/viewvc/llvm-project?rev=218429&view=rev
Log:
[mach-o] fix test case to work with latest llvm-objdump output

Take opporunity to clean up test to only run llvm-objdump once now that
llvm-objdump can disassemble mixed thumb and arm code.

Modified:
    lld/trunk/test/mach-o/arm-interworking-movw.yaml

Modified: lld/trunk/test/mach-o/arm-interworking-movw.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/arm-interworking-movw.yaml?rev=218429&r1=218428&r2=218429&view=diff
==============================================================================
--- lld/trunk/test/mach-o/arm-interworking-movw.yaml (original)
+++ lld/trunk/test/mach-o/arm-interworking-movw.yaml Wed Sep 24 18:55:06 2014
@@ -1,9 +1,8 @@
 # REQUIRES: arm
-# RUN: lld -flavor darwin -arch armv7 -r -print_atoms %s -o %t  | FileCheck %s \
-# RUN: && lld -flavor darwin -arch armv7 -dylib -print_atoms %t -o %t2 \
-# RUN:     %p/Inputs/libSystem.yaml -sectalign __TEXT __text 0x1000  | FileCheck %s \
-# RUN: && llvm-objdump -d -macho -triple=armv7-apple-ios %t2 | FileCheck -check-prefix=ACODE %s \
-# RUN: && llvm-objdump -d -macho -triple=thumbv7-apple-ios %t2 | FileCheck -check-prefix=TCODE %s 
+# RUN: lld -flavor darwin -arch armv7 -r -print_atoms %s -o %t  | FileCheck %s
+# RUN: lld -flavor darwin -arch armv7 -dylib -print_atoms %t -o %t2 \
+# RUN:     %p/Inputs/libSystem.yaml -sectalign __TEXT __text 0x1000  | FileCheck %s
+# RUN: llvm-objdump -d -macho %t2 | FileCheck -check-prefix=CODE %s
 #
 # Test thumb and arm branches round trip through -r.
 # Test movw/movt pairs have low bit set properly for thumb vs arm.
@@ -326,26 +325,26 @@ local-symbols:
 # CHECK:   - name:            _a2
 
 
-# TCODE: _t1:
-# TCODE-NEXT:                 	movw	r0, #4133
-# TCODE-NEXT:                   movt	r0, #0
-# TCODE-NEXT:                   movw	r1, #1
-# TCODE-NEXT:                   movt	r1, #0
-# TCODE-NEXT:                   movw	r2, #4174
-# TCODE-NEXT:                   movt	r2, #0
-# TCODE-NEXT:                   movw	r3, #42
-# TCODE-NEXT:                   movt	r3, #0
+# CODE: _t1:
+# CODE-NEXT:                 	 movw	r0, #4133
+# CODE-NEXT:                   movt	r0, #0
+# CODE-NEXT:                   movw	r1, #1
+# CODE-NEXT:                   movt	r1, #0
+# CODE-NEXT:                   movw	r2, #4174
+# CODE-NEXT:                   movt	r2, #0
+# CODE-NEXT:                   movw	r3, #42
+# CODE-NEXT:                   movt	r3, #0
 
 
-# ACODE: _a1:
-# ACODE-NEXT:                 	movw	r0, #4133
-# ACODE-NEXT:                   movt	r0, #0
-# ACODE-NEXT:                   movw	r1, #65495
-# ACODE-NEXT:                   movt	r1, #65535
-# ACODE-NEXT:                   movw	r2, #4174
-# ACODE-NEXT:                   movt	r2, #0
-# ACODE-NEXT:                   movw	r3, #0
-# ACODE-NEXT:                   movt	r3, #0
+# CODE: _a1:
+# CODE-NEXT:                 	 movw	r0, #4133
+# CODE-NEXT:                   movt	r0, #0
+# CODE-NEXT:                   movw	r1, #65495
+# CODE-NEXT:                   movt	r1, #65535
+# CODE-NEXT:                   movw	r2, _a2
+# CODE-NEXT:                   movt	r2, #0
+# CODE-NEXT:                   movw	r3, #0
+# CODE-NEXT:                   movt	r3, #0