aboutsummaryrefslogtreecommitdiffstats
path: root/test/MC/ELF/merge.s
diff options
context:
space:
mode:
authorEric Christopher <echristo@apple.com>2010-10-19 00:19:49 +0000
committerEric Christopher <echristo@apple.com>2010-10-19 00:19:49 +0000
commit1dcb1eafbc0c94dc0cb9cd0d3f002524de8a5a92 (patch)
treea0211d7591ae98a122deeb82bc3fc081200b8283 /test/MC/ELF/merge.s
parent3454ed9545d10064d84e45ad9a9ea26dddc255ba (diff)
downloadexternal_llvm-1dcb1eafbc0c94dc0cb9cd0d3f002524de8a5a92.zip
external_llvm-1dcb1eafbc0c94dc0cb9cd0d3f002524de8a5a92.tar.gz
external_llvm-1dcb1eafbc0c94dc0cb9cd0d3f002524de8a5a92.tar.bz2
Speculatively revert 116753 and 116756 to attempt to fix the bots.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@116777 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/MC/ELF/merge.s')
-rw-r--r--test/MC/ELF/merge.s66
1 files changed, 33 insertions, 33 deletions
diff --git a/test/MC/ELF/merge.s b/test/MC/ELF/merge.s
index 12a9438..f9cbc1e 100644
--- a/test/MC/ELF/merge.s
+++ b/test/MC/ELF/merge.s
@@ -23,75 +23,75 @@ zed:
foo:
// Section 4 is "sec1"
-// CHECK: # Section 0x4
-// CHECK-NEXT: (('sh_name', 0x12) # '.sec1'
+// CHECK: # Section 4
+// CHECK-NEXT: (('sh_name', 18) # '.sec1'
// Symbol number 1 is .Lfoo
-// CHECK: # Symbol 0x1
-// CHECK-NEXT: (('st_name', 0x1) # '.Lfoo'
+// CHECK: # Symbol 1
+// CHECK-NEXT: (('st_name', 1) # '.Lfoo'
// Symbol number 2 is foo
-// CHECK: # Symbol 0x2
-// CHECK-NEXT: (('st_name', 0x7) # 'foo'
+// CHECK: # Symbol 2
+// CHECK-NEXT: (('st_name', 7) # 'foo'
// Symbol number 6 is section 4
-// CHECK: # Symbol 0x6
-// CHECK-NEXT: (('st_name', 0x0) # ''
-// CHECK-NEXT: ('st_bind', 0x0)
-// CHECK-NEXT: ('st_type', 0x3)
-// CHECK-NEXT: ('st_other', 0x0)
-// CHECK-NEXT: ('st_shndx', 0x4)
+// CHECK: # Symbol 6
+// CHECK-NEXT: (('st_name', 0) # ''
+// CHECK-NEXT: ('st_bind', 0)
+// CHECK-NEXT: ('st_type', 3)
+// CHECK-NEXT: ('st_other', 0)
+// CHECK-NEXT: ('st_shndx', 4)
// Symbol number 8 is zed
-// CHECK: # Symbol 0x8
-// CHECK-NEXT: (('st_name', 0xb) # 'zed'
+// CHECK: # Symbol 8
+// CHECK-NEXT: (('st_name', 11) # 'zed'
// Relocation 0 refers to symbol 1
// CHECK: ('_relocations', [
// CHECK-NEXT: # Relocation 0
// CHECK-NEXT: (('r_offset',
-// CHECK-NEXT: ('r_sym', 0x1)
-// CHECK-NEXT: ('r_type', 0x2
+// CHECK-NEXT: ('r_sym', 1)
+// CHECK-NEXT: ('r_type', 2
// CHECK-NEXT: ('r_addend',
// CHECK-NEXT: ),
// Relocation 1 refers to symbol 6
-// CHECK-NEXT: # Relocation 0x1
+// CHECK-NEXT: # Relocation 1
// CHECK-NEXT: (('r_offset',
-// CHECK-NEXT: ('r_sym', 0x6)
-// CHECK-NEXT: ('r_type', 0xa)
+// CHECK-NEXT: ('r_sym', 6)
+// CHECK-NEXT: ('r_type', 10)
// CHECK-NEXT: ('r_addend',
// CHECK-NEXT: ),
// Relocation 2 refers to symbol 1
-// CHECK-NEXT: # Relocation 0x2
+// CHECK-NEXT: # Relocation 2
// CHECK-NEXT: (('r_offset',
-// CHECK-NEXT: ('r_sym', 0x1)
-// CHECK-NEXT: ('r_type', 0xa
+// CHECK-NEXT: ('r_sym', 1)
+// CHECK-NEXT: ('r_type', 10
// CHECK-NEXT: ('r_addend',
// CHECK-NEXT: ),
// Relocation 3 refers to symbol 2
-// CHECK-NEXT: # Relocation 0x3
+// CHECK-NEXT: # Relocation 3
// CHECK-NEXT: (('r_offset',
-// CHECK-NEXT: ('r_sym', 0x2)
-// CHECK-NEXT: ('r_type', 0x4
+// CHECK-NEXT: ('r_sym', 2)
+// CHECK-NEXT: ('r_type', 4
// CHECK-NEXT: ('r_addend',
// CHECK-NEXT: ),
// Relocation 4 refers to symbol 2
-// CHECK-NEXT: # Relocation 0x4
+// CHECK-NEXT: # Relocation 4
// CHECK-NEXT: (('r_offset',
-// CHECK-NEXT: ('r_sym', 0x2)
-// CHECK-NEXT: ('r_type', 0x9
+// CHECK-NEXT: ('r_sym', 2)
+// CHECK-NEXT: ('r_type', 9
// CHECK-NEXT: ('r_addend',
// CHECK-NEXT: ),
// Relocation 5 refers to symbol 8
-// CHECK-NEXT: # Relocation 0x5
-// CHECK-NEXT: (('r_offset', 0x23)
-// CHECK-NEXT: ('r_sym', 0x8)
-// CHECK-NEXT: ('r_type', 0xb)
-// CHECK-NEXT: ('r_addend', 0x0)
+// CHECK-NEXT: # Relocation 5
+// CHECK-NEXT: (('r_offset', 35)
+// CHECK-NEXT: ('r_sym', 8)
+// CHECK-NEXT: ('r_type', 11)
+// CHECK-NEXT: ('r_addend', 0)
// CHECK-NEXT: ),
// CHECK-NEXT: ])