Revert accidental commit.

[oota-llvm.git] / test / MC / ELF / merge.s

diff --git a/test/MC/ELF/merge.s b/test/MC/ELF/merge.s
index f9cbc1eb797c79e900857017aea81ec0f879f37f..11a80ad0350d2a1043643e2dfe635f16a9bdf36e 100644 (file)
--- a/test/MC/ELF/merge.s
+++ b/test/MC/ELF/merge.s
@@ -22,76 +22,76 @@ zed:
         .section       bar,"ax",@progbits
 foo:
 
-// Section 4 is "sec1"
-// CHECK: # Section 4
-// CHECK-NEXT:  (('sh_name', 18) # '.sec1'
-
-// Symbol number 1 is .Lfoo
-// CHECK:      # Symbol 1
-// CHECK-NEXT: (('st_name', 1) # '.Lfoo'
-
-// Symbol number 2 is foo
-// CHECK:      # Symbol 2
-// CHECK-NEXT: (('st_name', 7) # 'foo'
-
-// Symbol number 6 is section 4
-// 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 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', 1)
-// CHECK-NEXT:    ('r_type', 2
+// CHECK-NEXT:    ('r_sym', 0x00000001)
+// CHECK-NEXT:    ('r_type', 0x00000002
 // CHECK-NEXT:    ('r_addend',
 // CHECK-NEXT:   ),
 
 // Relocation 1 refers to symbol 6
 // CHECK-NEXT:  # Relocation 1
 // CHECK-NEXT: (('r_offset',
-// CHECK-NEXT:  ('r_sym', 6)
-// CHECK-NEXT:  ('r_type', 10)
+// CHECK-NEXT:  ('r_sym', 0x00000006)
+// CHECK-NEXT:  ('r_type', 0x0000000a)
 // CHECK-NEXT:  ('r_addend',
 // CHECK-NEXT: ),
 
 // Relocation 2 refers to symbol 1
 // CHECK-NEXT:   # Relocation 2
 // CHECK-NEXT:   (('r_offset',
-// CHECK-NEXT:    ('r_sym', 1)
-// CHECK-NEXT:    ('r_type', 10
+// CHECK-NEXT:    ('r_sym', 0x00000001)
+// CHECK-NEXT:    ('r_type', 0x0000000a
 // CHECK-NEXT:    ('r_addend',
 // CHECK-NEXT:   ),
 
 // Relocation 3 refers to symbol 2
 // CHECK-NEXT:   # Relocation 3
 // CHECK-NEXT:   (('r_offset',
-// CHECK-NEXT:    ('r_sym', 2)
-// CHECK-NEXT:    ('r_type', 4
+// CHECK-NEXT:    ('r_sym', 0x00000002)
+// CHECK-NEXT:    ('r_type', 0x00000004
 // CHECK-NEXT:    ('r_addend',
 // CHECK-NEXT:   ),
 
 // Relocation 4 refers to symbol 2
 // CHECK-NEXT:   # Relocation 4
 // CHECK-NEXT:   (('r_offset',
-// CHECK-NEXT:    ('r_sym', 2)
-// CHECK-NEXT:    ('r_type', 9
+// CHECK-NEXT:    ('r_sym', 0x00000002)
+// CHECK-NEXT:    ('r_type', 0x00000009
 // CHECK-NEXT:    ('r_addend',
 // CHECK-NEXT:   ),
 
 // Relocation 5 refers to symbol 8
 // 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:   (('r_offset', 0x0000000000000023)
+// CHECK-NEXT:    ('r_sym', 0x00000008)
+// CHECK-NEXT:    ('r_type', 0x0000000b)
+// CHECK-NEXT:    ('r_addend', 0x0000000000000000)
 // CHECK-NEXT:   ),
 // CHECK-NEXT:  ])
+
+// Section 5 is "sec1"
+// CHECK: # Section 5
+// CHECK-NEXT:  (('sh_name', 0x00000035) # '.sec1'
+
+// Symbol number 1 is .Lfoo
+// CHECK:      # Symbol 1
+// CHECK-NEXT: (('st_name', 0x00000001) # '.Lfoo'
+
+// Symbol number 2 is foo
+// CHECK:      # Symbol 2
+// CHECK-NEXT: (('st_name', 0x00000007) # 'foo'
+
+// Symbol number 6 is section 5
+// CHECK:        # Symbol 6
+// CHECK-NEXT:    (('st_name', 0x00000000) # ''
+// CHECK-NEXT:     ('st_bind', 0x0)
+// CHECK-NEXT:     ('st_type', 0x3)
+// CHECK-NEXT:     ('st_other', 0x00)
+// CHECK-NEXT:     ('st_shndx', 0x0005)
+
+// Symbol number 8 is zed
+// CHECK:        # Symbol 8
+// CHECK-NEXT:    (('st_name', 0x0000000b) # 'zed'