[llvm-readobj] - For SHT_REL relocations, don't display an addend.

[grimar]

Summary

This is https://bugs.llvm.org/show_bug.cgi?id=44257.

In LLVM style we always print 0 as addend when dumping
SHT_REL relocations. It is confusing, this patch stops
printing it as the first comment on the bug page suggests.

[grimar]

• Fix failing LLD test case.

[arichardson]

Thanks, this is a lot less confusing that printing 0. Ideally, we'd read the REL addend from the offset, but that's obviously a lot more effort.

My only concern about removing the 0x0 from the CHECK lines is that these tests will still pass if we do add support for reading REL addends. I see that many of the tests now contain {{$}}, maybe add this for all of them?

[grimar]

In D93033#2445785, @arichardson wrote:

My only concern about removing the 0x0 from the CHECK lines is that these tests will still pass if we do add support for reading REL addends. I see that many of the tests now contain {{$}}, maybe add this for all of them?

I've updated those that are related to llvm-readobj (i.e. tests from test/tools/llvm-readobj). I haven't updated others because they are not testing llvm-readobj output or relocation addend values (they were always 0x0 previously,
what is simply wrong technically). Given that I feel that spreading of {{$}} past the test/tools/llvm-readobj folder is perhaps a bit excessive.

[jhenderson]

Seems reasonable to me. I guess in some of the existing tests, they should be checking the addend in the relocated data, but if they don't already, we aren't making the situation worse. LGTM, with nits.

llvm/test/MC/ARM/thumb-far-jump.s

27

Nit: no new line at EOF.

llvm/test/tools/llvm-readobj/ELF/relr-relocs.test

15

[MaskRay]

Looks great! I agree that {{$}} outside of test/tools/llvm-readobj may be too excessive.

[arichardson]

In D93033#2447955, @grimar wrote:

In D93033#2445785, @arichardson wrote:

My only concern about removing the 0x0 from the CHECK lines is that these tests will still pass if we do add support for reading REL addends. I see that many of the tests now contain {{$}}, maybe add this for all of them?

I've updated those that are related to llvm-readobj (i.e. tests from test/tools/llvm-readobj). I haven't updated others because they are not testing llvm-readobj output or relocation addend values (they were always 0x0 previously,
what is simply wrong technically). Given that I feel that spreading of {{$}} past the test/tools/llvm-readobj folder is perhaps a bit excessive.

I only skimmed the testsuite changes and didn't notice that this was deliberate based on the folder. Adding {{$}} it in test/tools/llvm-readobj only makes sense to me.

lld/test/ELF/arm-abs32-dyn.s

 
 // RUN: ld.lld -shared -o %t.so %t.o
 // RUN: llvm-readobj --symbols --dyn-relocations %t.so | FileCheck %s
 // RUN: llvm-readelf -x .data %t.so | FileCheck --check-prefix=HEX %s
 
 // CHECK:      Dynamic Relocations {
 // CHECK-NEXT:   0x30204 R_ARM_RELATIVE
 // CHECK-NEXT:   0x30208 R_ARM_RELATIVE
-// CHECK-NEXT:   0x30200 R_ARM_ABS32 foo 0x0
+// CHECK-NEXT:   0x30200 R_ARM_ABS32 foo
 // CHECK-NEXT: }
 
 // CHECK:      Symbols [
 // CHECK:        Symbol {
 // CHECK:          Name: bar
 // CHECK-NEXT:     Value: 0x101A8
 
 // CHECK:        Symbol {
 // CHECK:          Name: foo
 // CHECK-NEXT:     Value: 0x101A8
 
 // HEX: 0x00030200 00000000 a8010100 a8010100

lld/test/ELF/arm-copy.s

 // CHECK-NEXT:     AddressAlignment: 16
 
 // CHECK: Relocations [
 // CHECK-NEXT:  Section {{.*}} .rel.dyn {
 // CHECK-NEXT:    Relocation {
 // CHECK-NEXT:      Offset: 0x40220
 // CHECK-NEXT:      Type: R_ARM_COPY
 // CHECK-NEXT:      Symbol: y
-// CHECK-NEXT:      Addend: 0x0
 // CHECK-NEXT:    }
 // CHECK-NEXT:    Relocation {
 // CHECK-NEXT:      Offset: 0x40224
 // CHECK-NEXT:      Type: R_ARM_COPY
 // CHECK-NEXT:      Symbol: z
-// CHECK-NEXT:      Addend: 0x0
 // CHECK-NEXT:    }
 // CHECK-NEXT:  }
 
 // CHECK: Symbols [
 // CHECK:     Name: y
 // CHECK-NEXT:    Value: 0x40220
 // CHECK-NEXT:    Size: 4
 // CHECK-NEXT:    Binding: Global

lld/test/ELF/arm-gnu-ifunc-plt.s

 // REQUIRES: arm
 // RUN: llvm-mc -filetype=obj -triple=armv7a-linux-gnueabihf %S/Inputs/arm-shared.s -o %t1.o
 // RUN: ld.lld %t1.o --shared -soname=t.so -o %t.so
 // RUN: llvm-mc -filetype=obj -triple=armv7a-linux-gnueabihf %s -o %t.o
 // RUN: ld.lld %t.so %t.o -o %tout
 // RUN: llvm-objdump --triple=armv7a-linux-gnueabihf -d --no-show-raw-insn %tout | FileCheck %s --check-prefix=DISASM
 // RUN: llvm-objdump -s %tout | FileCheck %s --check-prefix=GOTPLT
 // RUN: llvm-readobj -r --dynamic-table %tout | FileCheck %s
 
 // Check that the IRELATIVE relocations are last in the .got
 // CHECK: Relocations [
 // CHECK-NEXT:   Section (5) .rel.dyn {
-// CHECK-NEXT:     0x302E0 R_ARM_GLOB_DAT bar2 0x0
-// CHECK-NEXT:     0x302E4 R_ARM_GLOB_DAT zed2 0x0
-// CHECK-NEXT:     0x302E8 R_ARM_IRELATIVE - 0x0
-// CHECK-NEXT:     0x302EC R_ARM_IRELATIVE - 0x0
+// CHECK-NEXT:     0x302E0 R_ARM_GLOB_DAT bar2
+// CHECK-NEXT:     0x302E4 R_ARM_GLOB_DAT zed2
+// CHECK-NEXT:     0x302E8 R_ARM_IRELATIVE -
+// CHECK-NEXT:     0x302EC R_ARM_IRELATIVE -
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Section (6) .rel.plt {
-// CHECK-NEXT:     0x402FC R_ARM_JUMP_SLOT bar2 0x0
-// CHECK-NEXT:     0x40300 R_ARM_JUMP_SLOT zed2 0x0
+// CHECK-NEXT:     0x402FC R_ARM_JUMP_SLOT bar2
+// CHECK-NEXT:     0x40300 R_ARM_JUMP_SLOT zed2
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
 
 // Check that the GOT entries refer back to the ifunc resolver
 // GOTPLT: Contents of section .got:
 // GOTPLT-NEXT:  302e0 00000000 00000000 dc010200 e0010200
 // GOTPLT: Contents of section .got.plt:
 // GOTPLT-NEXT:  402f0 00000000 00000000 00000000 00020200

lld/test/ELF/arm-got-relative.s

 
  .globl function
  .align 2
 function:
  .type function, %function
  bx lr
 
 // CHECK: Dynamic Relocations {
-// CHECK-NEXT:  0x2020C R_ARM_GLOB_DAT function 0x0
+// CHECK-NEXT:  0x2020C R_ARM_GLOB_DAT function
 
 // CHECK: Name: _GLOBAL_OFFSET_TABLE_
 // CHECK-NEXT:    Value: 0x2020C
 // CHECK-NEXT:    Size:
 // CHECK-NEXT:    Binding: Local
 // CHECK-NEXT:    Type: None
 // CHECK-NEXT:    Other [
 // CHECK-NEXT:      STV_HIDDEN

lld/test/ELF/arm-plt-reloc.s

 // DSOREL-NEXT:    Offset:
 // DSOREL-NEXT:    Size: 24
 // DSOREL-NEXT:    Link:
 // DSOREL-NEXT:    Info:
 // DSOREL-NEXT:    AddressAlignment: 4
 // DSOREL-NEXT:    EntrySize:
 // DSOREL:  Relocations [
 // DSOREL-NEXT:  Section {{.*}} .rel.plt {
-// DSOREL-NEXT:    0x302E4 R_ARM_JUMP_SLOT func1 0x0
-// DSOREL-NEXT:    0x302E8 R_ARM_JUMP_SLOT func2 0x0
-// DSOREL-NEXT:    0x302EC R_ARM_JUMP_SLOT func3 0x0
+// DSOREL-NEXT:    0x302E4 R_ARM_JUMP_SLOT func1
+// DSOREL-NEXT:    0x302E8 R_ARM_JUMP_SLOT func2
+// DSOREL-NEXT:    0x302EC R_ARM_JUMP_SLOT func3
 
 // Test a large separation between the .plt and .got.plt
 // The .got.plt and .plt displacement is large but still within the range
 // of the short plt sequence.
 // RUN: echo "SECTIONS { \
 // RUN:       .text 0x1000 : { *(.text) } \
 // RUN:       .plt  0x2000 : { *(.plt) *(.plt.*) } \
 // RUN:       .got.plt 0x1100000 : { *(.got.plt) } \

 // DSORELHIGH-NEXT:     Type: SHT_PROGBITS
 // DSORELHIGH-NEXT:     Flags [
 // DSORELHIGH-NEXT:       SHF_ALLOC
 // DSORELHIGH-NEXT:       SHF_WRITE
 // DSORELHIGH-NEXT:     ]
 // DSORELHIGH-NEXT:     Address: 0x1100000
 // DSORELHIGH: Relocations [
 // DSORELHIGH-NEXT:   Section {{.*}} .rel.plt {
-// DSORELHIGH-NEXT:     0x110000C R_ARM_JUMP_SLOT func1 0x0
-// DSORELHIGH-NEXT:     0x1100010 R_ARM_JUMP_SLOT func2 0x0
-// DSORELHIGH-NEXT:     0x1100014 R_ARM_JUMP_SLOT func3 0x0
+// DSORELHIGH-NEXT:     0x110000C R_ARM_JUMP_SLOT func1
+// DSORELHIGH-NEXT:     0x1100010 R_ARM_JUMP_SLOT func2
+// DSORELHIGH-NEXT:     0x1100014 R_ARM_JUMP_SLOT func3
 
 // Test a very large separation between the .plt and .got.plt so we must use
 // large plt entries that do not have any range restriction.
 // RUN: echo "SECTIONS { \
 // RUN:       .text 0x1000 : { *(.text) } \
 // RUN:       .plt  0x2000 : { *(.plt) *(.plt.*) } \
 // RUN:       .got.plt 0x11111100 : { *(.got.plt) } \
 // RUN:       }" > %t2.script

 // DSORELLONG-NEXT:     Type: SHT_PROGBITS
 // DSORELLONG-NEXT:     Flags [
 // DSORELLONG-NEXT:       SHF_ALLOC
 // DSORELLONG-NEXT:       SHF_WRITE
 // DSORELLONG-NEXT:     ]
 // DSORELLONG-NEXT:     Address: 0x11111100
 // DSORELLONG: Relocations [
 // DSORELLONG-NEXT:   Section {{.*}} .rel.plt {
-// DSORELLONG-NEXT:     0x1111110C R_ARM_JUMP_SLOT func1 0x0
-// DSORELLONG-NEXT:     0x11111110 R_ARM_JUMP_SLOT func2 0x0
-// DSORELLONG-NEXT:     0x11111114 R_ARM_JUMP_SLOT func3 0x0
+// DSORELLONG-NEXT:     0x1111110C R_ARM_JUMP_SLOT func1
+// DSORELLONG-NEXT:     0x11111110 R_ARM_JUMP_SLOT func2
+// DSORELLONG-NEXT:     0x11111114 R_ARM_JUMP_SLOT func3
 
 // Test a separation between the .plt and .got.plt that is part in range of
 // short table entries and part needing long entries. We use the long entries
 // only when we need to.
 // RUN: echo "SECTIONS { \
 // RUN:       .text 0x1000 : { *(.text) } \
 // RUN:       .plt  0x2000 : { *(.plt) *(.plt.*) } \
 // RUN:       .got.plt 0x8002020 : { *(.got.plt) } \

 // DSORELMIX:    Name: .got.plt
 // DSORELMIX-NEXT:     Type: SHT_PROGBITS
 // DSORELMIX-NEXT:     Flags [
 // DSORELMIX-NEXT:       SHF_ALLOC
 // DSORELMIX-NEXT:       SHF_WRITE
 // DSORELMIX-NEXT:     ]
 // DSORELMIX-NEXT:     Address: 0x8002020
 // DSORELMIX:   Section {{.*}} .rel.plt {
-// DSORELMIX-NEXT:     0x800202C R_ARM_JUMP_SLOT func1 0x0
-// DSORELMIX-NEXT:     0x8002030 R_ARM_JUMP_SLOT func2 0x0
-// DSORELMIX-NEXT:     0x8002034 R_ARM_JUMP_SLOT func3 0x0
+// DSORELMIX-NEXT:     0x800202C R_ARM_JUMP_SLOT func1
+// DSORELMIX-NEXT:     0x8002030 R_ARM_JUMP_SLOT func2
+// DSORELMIX-NEXT:     0x8002034 R_ARM_JUMP_SLOT func3

lld/test/ELF/arm-target1.s

 // RUN: ld.lld -shared %t.o -o %t2.so --target1-abs --target1-rel
 // RUN: llvm-objdump -t -d %t2.so | FileCheck %s \
 // RUN:   --check-prefix=RELATIVE
 // RUN: not ld.lld -shared %t.o -o /dev/null --target1-rel --target1-abs 2>&1 \
 // RUN:   | FileCheck %s --check-prefix=ABS
 
 // RELOC: Relocations [
 // RELOC:   .rel.text {
-// RELOC:     0x0 R_ARM_TARGET1 patatino 0x0
+// RELOC:     0x0 R_ARM_TARGET1 patatino
 // RELOC:   }
 // RELOC: ]
 
 .text
   .word patatino(target1)
   patatino:
         .word 32
 // Force generation of $d.0 as section is not all data

lld/test/ELF/arm-thumb-plt-reloc.s

 // DSOREL-NEXT:    Offset:
 // DSOREL-NEXT:    Size: 24
 // DSOREL-NEXT:    Link:
 // DSOREL-NEXT:    Info:
 // DSOREL-NEXT:    AddressAlignment: 4
 // DSOREL-NEXT:    EntrySize:
 // DSOREL:  Relocations [
 // DSOREL-NEXT:  Section (5) .rel.plt {
-// DSOREL-NEXT:    0x302E4 R_ARM_JUMP_SLOT func1 0x0
-// DSOREL-NEXT:    0x302E8 R_ARM_JUMP_SLOT func2 0x0
-// DSOREL-NEXT:    0x302EC R_ARM_JUMP_SLOT func3 0x0
+// DSOREL-NEXT:    0x302E4 R_ARM_JUMP_SLOT func1
+// DSOREL-NEXT:    0x302E8 R_ARM_JUMP_SLOT func2
+// DSOREL-NEXT:    0x302EC R_ARM_JUMP_SLOT func3

lld/test/ELF/arm-tls-ldm32.s

 // SEC-NEXT:   SHF_ALLOC
 // SEC-NEXT:   SHF_TLS
 // SEC-NEXT:   SHF_WRITE
 // SEC-NEXT: ]
 // SEC-NEXT: Address: 0x201D4
 // SEC:      Size: 4
 
 // SEC: Dynamic Relocations {
-// SEC-NEXT:  0x20224 R_ARM_TLS_DTPMOD32 - 0x0
+// SEC-NEXT:  0x20224 R_ARM_TLS_DTPMOD32 -
 
 // CHECK: Disassembly of section .text:
 // CHECK-EMPTY:
 // CHECK-NEXT: <_start>:
 // CHECK-NEXT: 101c0:       00 f0 20 e3     nop
 
 /// (0x20224 - 0x101c4) + (0x101c4 - 0x101c0 - 8) = 0x1005c
 // CHECK:      101c4:       5c 00 01 00
 // CHECK-NEXT: 101c8:       00 00 00 00
 // CHECK-NEXT: 101cc:       04 00 00 00
 
 // CHECK-EXE:      <_start>:
 // CHECK-EXE-NEXT:   20114:       00 f0 20 e3     nop
 // CHECK-EXE:        20118:       0c 00 01 00
 // CHECK-EXE-NEXT:   2011c:       00 00 00 00
 // CHECK-EXE-NEXT:   20120:       04 00 00 00

lld/test/ELF/dynamic-got.s

 
 // CHECK:      Type: PT_DYNAMIC
 // CHECK-NEXT: Offset: 0x174
 // CHECK-NEXT: VirtualAddress: 0x2174
 // CHECK-NEXT: PhysicalAddress: 0x2174
 
 // CHECK:      Relocations [
 // CHECK-NEXT:   Section ({{.*}}) .rel.dyn {
-// CHECK-NEXT:     0x21C4 R_386_RELATIVE - 0x0
+// CHECK-NEXT:     0x21C4 R_386_RELATIVE -
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
 
         calll   .L0$pb
 .L0$pb:
         popl    %eax
 .Ltmp0:
         addl    $_GLOBAL_OFFSET_TABLE_+(.Ltmp0-.L0$pb), %eax
         movl    _DYNAMIC@GOT(%eax), %eax

lld/test/ELF/gnu-ifunc-plt-i386.s

 // CHECK: DynamicSection [
 // CHECK:  0x00000012 RELSZ                24 (bytes)
 // CHECK:  0x00000002 PLTRELSZ             16 (bytes)
 
 /// Check that the IRELATIVE relocations are placed to the .rel.dyn section after
 /// other regular relocations (e.g. GLOB_DAT).
 // CHECK: Relocations [
 // CHECK-NEXT:   Section (4) .rel.dyn {
-// CHECK-NEXT:     0x4022C8 R_386_GLOB_DAT bar3 0x0
-// CHECK-NEXT:     0x4032E0 R_386_IRELATIVE - 0x0
-// CHECK-NEXT:     0x4032E4 R_386_IRELATIVE - 0x0
+// CHECK-NEXT:     0x4022C8 R_386_GLOB_DAT bar3
+// CHECK-NEXT:     0x4032E0 R_386_IRELATIVE -
+// CHECK-NEXT:     0x4032E4 R_386_IRELATIVE -
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Section (5) .rel.plt {
-// CHECK-NEXT:     0x4032D8 R_386_JUMP_SLOT bar2 0x0
-// CHECK-NEXT:     0x4032DC R_386_JUMP_SLOT zed2 0x0
+// CHECK-NEXT:     0x4032D8 R_386_JUMP_SLOT bar2
+// CHECK-NEXT:     0x4032DC R_386_JUMP_SLOT zed2
 // CHECK-NEXT:   }
 
 // Check that IRELATIVE .got.plt entries point to ifunc resolver and not
 // back to the plt entry + 6.
 // GOTPLT: Contents of section .got.plt:
 // GOTPLT:       4032cc 50224000 00000000 00000000 16124000
 // GOTPLT-NEXT:  4032dc 26124000 dc114000 dd114000
 //                                  ^        ^-- <bar> (0x4011dd)

lld/test/ELF/i386-got-value.s

 # CHECK-NEXT: Link:
 # CHECK-NEXT: Info:
 # CHECK-NEXT: AddressAlignment:
 # CHECK-NEXT: EntrySize:
 # CHECK-NEXT: SectionData (
 # CHECK-NEXT:   0000: 00000000
 # CHECK-NEXT: )
 
-# CHECK: R_386_GLOB_DAT bar 0x0
+# CHECK: R_386_GLOB_DAT bar
 
         movl    bar@GOT(%eax), %eax
 
         .data
         .globl  bar
 bar:
         .long   42

lld/test/ELF/i386-plt.s

 // CHECK-NEXT: AddressAlignment: 4
 // CHECK-NEXT: EntrySize: 0
 
 // First 3 slots of .got.plt are reserved.
 // &.got.plt[3] = 0x403278 + 12 = 0x403284
 // &.got.plt[4] = 0x403278 + 16 = 0x403288
 // CHECK:      Relocations [
 // CHECK-NEXT:   Section ({{.*}}) .rel.plt {
-// CHECK-NEXT:     0x403284 R_386_JUMP_SLOT bar 0x0
-// CHECK-NEXT:     0x403288 R_386_JUMP_SLOT zed 0x0
+// CHECK-NEXT:     0x403284 R_386_JUMP_SLOT bar
+// CHECK-NEXT:     0x403288 R_386_JUMP_SLOT zed
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
 
 // DISASM:       <local>:
 // DISASM-NEXT:  4011bc:
 // DISASM-NEXT:  4011be:
 // DISASM:       <_start>:
 // DISASM-NEXT: 4011c0:       jmp 0x4011f0 <bar@plt>

 // CHECKSHARED-NEXT:   AddressAlignment: 4
 // CHECKSHARED-NEXT:   EntrySize: 0
 // CHECKSHARED-NEXT:   }
 
 // 0x3000 + got.plt.reserved(12) = 0x300C
 // 0x3000 + got.plt.reserved(12) + 4 = 0x3010
 // CHECKSHARED:        Relocations [
 // CHECKSHARED-NEXT:     Section ({{.*}}) .rel.plt {
-// CHECKSHARED-NEXT:       0x329C R_386_JUMP_SLOT bar 0x0
-// CHECKSHARED-NEXT:       0x32A0 R_386_JUMP_SLOT zed 0x0
+// CHECKSHARED-NEXT:       0x329C R_386_JUMP_SLOT bar
+// CHECKSHARED-NEXT:       0x32A0 R_386_JUMP_SLOT zed
 // CHECKSHARED-NEXT:     }
 // CHECKSHARED-NEXT:   ]
 
 // DISASMSHARED:      <local>:
 // DISASMSHARED-NEXT: 11e0:
 // DISASMSHARED-NEXT: 11e2:
 // DISASMSHARED:      <_start>:
 // DISASMSHARED-NEXT: 11e4:       jmp 0x1210 <bar@plt>

lld/test/ELF/i386-relative.s

 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=i386-pc-linux %s -o %t.o
 // RUN: ld.lld -shared %t.o -o %t.so
 // RUN: llvm-readobj -r %t.so | FileCheck %s
 
 // CHECK:      Relocations [
 // CHECK-NEXT:   Section ({{.*}}) .rel.dyn {
-// CHECK-NEXT:     R_386_RELATIVE - 0x0
+// CHECK-NEXT:     R_386_RELATIVE -
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
 
         .data
 foo:
         .long foo

lld/test/ELF/i386-tls-dynamic.s

 # CHECK-NEXT: Size: 32
 # CHECK-NEXT: Link: 0
 # CHECK-NEXT: Info: 0
 # CHECK-NEXT: AddressAlignment: 4
 # CHECK-NEXT: EntrySize: 0
 
 # CHECK: Relocations [
 # CHECK:      Section ({{.+}}) .rel.dyn {
-# CHECK-NEXT: 0x2368 R_386_TLS_DTPMOD32 - 0x0
-# CHECK-NEXT: 0x2358 R_386_TLS_DTPMOD32 tls0 0x0
-# CHECK-NEXT: 0x235C R_386_TLS_DTPOFF32 tls0 0x0
-# CHECK-NEXT: 0x2370 R_386_TLS_TPOFF tls0 0x0
-# CHECK-NEXT: 0x2360 R_386_TLS_DTPMOD32 tls1 0x0
-# CHECK-NEXT: 0x2364 R_386_TLS_DTPOFF32 tls1 0x0
-# CHECK-NEXT: 0x2374 R_386_TLS_TPOFF tls1 0x0
+# CHECK-NEXT: 0x2368 R_386_TLS_DTPMOD32 -
+# CHECK-NEXT: 0x2358 R_386_TLS_DTPMOD32 tls0
+# CHECK-NEXT: 0x235C R_386_TLS_DTPOFF32 tls0
+# CHECK-NEXT: 0x2370 R_386_TLS_TPOFF tls0
+# CHECK-NEXT: 0x2360 R_386_TLS_DTPMOD32 tls1
+# CHECK-NEXT: 0x2364 R_386_TLS_DTPOFF32 tls1
+# CHECK-NEXT: 0x2374 R_386_TLS_TPOFF tls1
 # CHECK-NEXT: }
 
 # DIS:      Disassembly of section .text:
 # DIS-EMPTY:
 # DIS-NEXT: <_start>:
 ## General dynamic model:
 ## -4128 and -4120 are first and second GOT entries offsets.
 ## Each one is a pair of records.

lld/test/ELF/i386-tls-gdiele.s

 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=i686 %p/Inputs/tls-opt-gdiele-i686.s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=i686 %s -o %t1.o
 // RUN: ld.lld -shared %t.o -soname=t.so -o %t.so
 // RUN: ld.lld --hash-style=sysv %t1.o %t.so -o %tout
 // RUN: llvm-readobj -r %tout | FileCheck --check-prefix=NORELOC %s
 // RUN: llvm-objdump -d --no-show-raw-insn %tout | FileCheck --check-prefix=DISASM %s
 
 // NORELOC:      Relocations [
 // NORELOC-NEXT: Section ({{.*}}) .rel.dyn {
-// NORELOC-NEXT:   0x402258 R_386_TLS_TPOFF tlsshared0 0x0
-// NORELOC-NEXT:   0x40225C R_386_TLS_TPOFF tlsshared1 0x0
+// NORELOC-NEXT:   0x402258 R_386_TLS_TPOFF tlsshared0
+// NORELOC-NEXT:   0x40225C R_386_TLS_TPOFF tlsshared1
 // NORELOC-NEXT:   }
 // NORELOC-NEXT: ]
 
 // DISASM:      Disassembly of section .text:
 // DISASM-EMPTY:
 // DISASM-NEXT: <_start>:
 // DISASM-NEXT: 4011d0:       movl %gs:0, %eax
 // DISASM-NEXT:               addl -4104(%ebx), %eax

lld/test/ELF/i386-tls-ie-local.s

 # CHECK-NEXT: Link:
 # CHECK-NEXT: Info:
 # CHECK-NEXT: AddressAlignment:
 # CHECK-NEXT: EntrySize:
 # CHECK-NEXT: SectionData (
 # CHECK-NEXT:   0000: 00000000 04000000
 # CHECK-NEXT: )
 
-# CHECK:      R_386_TLS_TPOFF - 0x0
-# CHECK-NEXT: R_386_TLS_TPOFF - 0x0
+# CHECK:      R_386_TLS_TPOFF -
+# CHECK-NEXT: R_386_TLS_TPOFF -
 
   movl  bar1@GOTNTPOFF(%eax), %ecx
   movl  bar2@GOTNTPOFF(%eax), %eax
 
   .section  .tdata,"awT",@progbits
 bar1:
   .long 42
 
 bar2:
   .long 42

lld/test/ELF/i386-tls-ie-shared.s

 // GOTRELSHARED-NEXT:   Link: 0
 // GOTRELSHARED-NEXT:   Info: 0
 // GOTRELSHARED-NEXT:   AddressAlignment: 4
 // GOTRELSHARED-NEXT:   EntrySize: 0
 // GOTRELSHARED-NEXT: }
 // GOTRELSHARED:      0x6FFFFFFA RELCOUNT             8
 // GOTRELSHARED:      Relocations [
 // GOTRELSHARED-NEXT:   Section ({{.*}}) .rel.dyn {
-// GOTRELSHARED-NEXT:     0x22DA R_386_RELATIVE - 0x0
-// GOTRELSHARED-NEXT:     0x22E2 R_386_RELATIVE - 0x0
-// GOTRELSHARED-NEXT:     0x22EB R_386_RELATIVE - 0x0
-// GOTRELSHARED-NEXT:     0x22F4 R_386_RELATIVE - 0x0
-// GOTRELSHARED-NEXT:     0x22FC R_386_RELATIVE - 0x0
-// GOTRELSHARED-NEXT:     0x2305 R_386_RELATIVE - 0x0
-// GOTRELSHARED-NEXT:     0x230E R_386_RELATIVE - 0x0
-// GOTRELSHARED-NEXT:     0x2317 R_386_RELATIVE - 0x0
-// GOTRELSHARED-NEXT:     0x3390 R_386_TLS_TPOFF tlsshared0 0x0
-// GOTRELSHARED-NEXT:     0x3394 R_386_TLS_TPOFF tlsshared1 0x0
-// GOTRELSHARED-NEXT:     0x3388 R_386_TLS_TPOFF tlslocal0 0x0
-// GOTRELSHARED-NEXT:     0x338C R_386_TLS_TPOFF tlslocal1 0x0
+// GOTRELSHARED-NEXT:     0x22DA R_386_RELATIVE -
+// GOTRELSHARED-NEXT:     0x22E2 R_386_RELATIVE -
+// GOTRELSHARED-NEXT:     0x22EB R_386_RELATIVE -
+// GOTRELSHARED-NEXT:     0x22F4 R_386_RELATIVE -
+// GOTRELSHARED-NEXT:     0x22FC R_386_RELATIVE -
+// GOTRELSHARED-NEXT:     0x2305 R_386_RELATIVE -
+// GOTRELSHARED-NEXT:     0x230E R_386_RELATIVE -
+// GOTRELSHARED-NEXT:     0x2317 R_386_RELATIVE -
+// GOTRELSHARED-NEXT:     0x3390 R_386_TLS_TPOFF tlsshared0
+// GOTRELSHARED-NEXT:     0x3394 R_386_TLS_TPOFF tlsshared1
+// GOTRELSHARED-NEXT:     0x3388 R_386_TLS_TPOFF tlslocal0
+// GOTRELSHARED-NEXT:     0x338C R_386_TLS_TPOFF tlslocal1
 // GOTRELSHARED-NEXT:   }
 // GOTRELSHARED-NEXT: ]
 
 // DISASMSHARED:       Disassembly of section test:
 // DISASMSHARED-EMPTY:
 // DISASMSHARED-NEXT:  <_start>:
 // (.got)[0] = 0x3388 = 13192
 // (.got)[1] = 13196

lld/test/ELF/i386-tls-le.s

 # DISSHARED-NEXT: 2232:       subl    %edx, %eax
 # DISSHARED-NEXT: 2234:       movl    %gs:0, %ecx
 # DISSHARED-NEXT: 223b:       leal    (%ecx), %eax
 # DISSHARED-NEXT: 2241:       movl    %gs:0, %ecx
 # DISSHARED-NEXT: 2248:       leal    123(%ecx), %eax
 
 # RELOCSHARED:      Relocations [
 # RELOCSHARED-NEXT: Section (5) .rel.dyn {
-# RELOCSHARED-NEXT:   0x2219 R_386_TLS_TPOFF32 var 0x0
-# RELOCSHARED-NEXT:   0x223D R_386_TLS_TPOFF var 0x0
-# RELOCSHARED-NEXT:   0x2227 R_386_TLS_TPOFF32 var1 0x0
-# RELOCSHARED-NEXT:   0x224A R_386_TLS_TPOFF var1 0x0
+# RELOCSHARED-NEXT:   0x2219 R_386_TLS_TPOFF32 var
+# RELOCSHARED-NEXT:   0x223D R_386_TLS_TPOFF var
+# RELOCSHARED-NEXT:   0x2227 R_386_TLS_TPOFF32 var1
+# RELOCSHARED-NEXT:   0x224A R_386_TLS_TPOFF var1
 # RELOCSHARED-NEXT:  }
 # RELOCSHARED-NEXT: ]

lld/test/ELF/i386-tls-opt-iele-nopic.s

 // GOTREL-NEXT:   Size: 8
 // GOTREL-NEXT:   Link: 0
 // GOTREL-NEXT:   Info: 0
 // GOTREL-NEXT:   AddressAlignment: 4
 // GOTREL-NEXT:   EntrySize: 0
 // GOTREL-NEXT: }
 // GOTREL:      Relocations [
 // GOTREL-NEXT: Section ({{.*}}) .rel.dyn {
-// GOTREL-NEXT:   0x402258 R_386_TLS_TPOFF tlsshared0 0x0
-// GOTREL-NEXT:   0x40225C R_386_TLS_TPOFF tlsshared1 0x0
+// GOTREL-NEXT:   0x402258 R_386_TLS_TPOFF tlsshared0
+// GOTREL-NEXT:   0x40225C R_386_TLS_TPOFF tlsshared1
 // GOTREL-NEXT:  }
 // GOTREL-NEXT: ]
 
 // DISASM:      Disassembly of section .text:
 // DISASM-EMPTY:
 // DISASM-NEXT: <_start>:
 // DISASM-NEXT: 4011b0:       movl $0xfffffff8, %ecx
 // DISASM-NEXT:               movl %gs:(%ecx), %eax

lld/test/ELF/i386-zrel-zrela.s

 # REL-NEXT: RELSZ    32 (bytes)
 # REL-NEXT: RELENT   8 (bytes)
 # REL-NEXT: RELCOUNT 1
 # REL-NEXT: JMPREL   {{.*}}
 # REL-NEXT: PLTRELSZ 8 (bytes)
 # REL-NEXT: PLTGOT   {{.*}}
 # REL-NEXT: PLTREL   REL{{$}}
 # REL:      .rel.dyn {
-# REL-NEXT:   R_386_RELATIVE - 0x0
-# REL-NEXT:   R_386_GLOB_DAT func 0x0
-# REL-NEXT:   R_386_TLS_TPOFF tls 0x0
-# REL-NEXT:   R_386_32 _start 0x0
+# REL-NEXT:   R_386_RELATIVE -
+# REL-NEXT:   R_386_GLOB_DAT func
+# REL-NEXT:   R_386_TLS_TPOFF tls
+# REL-NEXT:   R_386_32 _start
 # REL-NEXT: }
 # REL-NEXT: .rel.plt {
-# REL-NEXT:   R_386_JUMP_SLOT func 0x0
+# REL-NEXT:   R_386_JUMP_SLOT func
 # REL-NEXT: }
 
 # REL:      Hex dump of section '.data':
 # REL-NEXT: 0x000042cc cc420000 2a000000
 
 # RUN: ld.lld -shared -z rel -z rela %t.o -o %t2.so
 # RUN: llvm-readobj -d -r %t2.so | FileCheck --check-prefix=RELA %s
 

lld/test/ELF/mips-26.s

 # REL-NEXT:   SHF_WRITE
 # REL-NEXT: ]
 # REL-NEXT: Address: 0x[[GOTPLTADDR:[0-9A-F]+]]
 
 # REL: 0x70000032  MIPS_PLTGOT  0x[[GOTPLTADDR]]
 
 # REL: Relocations [
 # REL-NEXT:   Section (7) .rel.plt {
-# REL-NEXT:     0x[[PLTSLOT:[0-9A-F]+]] R_MIPS_JUMP_SLOT foo0 0x0
+# REL-NEXT:     0x[[PLTSLOT:[0-9A-F]+]] R_MIPS_JUMP_SLOT foo0
 # REL-NEXT:   }
 # REL-NEXT: ]
 
 # REL:      Primary GOT {
 # REL:        Local entries [
 # REL-NEXT:   ]
 # REL-NEXT:   Global entries [
 # REL-NEXT:   ]

lld/test/ELF/mips-eh_frame-pic.s

 
 ## For -fPIC, .eh_frame should contain DW_EH_PE_pcrel | DW_EH_PE_sdata4 values:
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux --position-independent %s -o %t-pic32.o
 # RUN: llvm-readobj -r %t-pic32.o | FileCheck %s --check-prefixes=RELOCS,PIC32-RELOCS
 # RUN: ld.lld -shared %t-pic32.o -o %t-pic32.so
 # RUN: llvm-dwarfdump --eh-frame %t-pic32.so | FileCheck %s --check-prefix=PIC-EH-FRAME
 
 # RELOCS:            .rel{{a?}}.eh_frame {
-# ABS32-RELOCS-NEXT:   0x1C R_MIPS_32 .text 0x0
-# ABS64-RELOCS-NEXT:   0x1C R_MIPS_64/R_MIPS_NONE/R_MIPS_NONE .text 0x0
-# PIC64-RELOCS-NEXT:   0x1C R_MIPS_PC32/R_MIPS_NONE/R_MIPS_NONE - 0x0
-# PIC32-RELOCS-NEXT:   0x1C R_MIPS_PC32 - 0x0
+# ABS32-RELOCS-NEXT:   0x1C R_MIPS_32 .text
+# ABS64-RELOCS-NEXT:   0x1C R_MIPS_64/R_MIPS_NONE/R_MIPS_NONE .text
+# PIC64-RELOCS-NEXT:   0x1C R_MIPS_PC32/R_MIPS_NONE/R_MIPS_NONE -
+# PIC32-RELOCS-NEXT:   0x1C R_MIPS_PC32 -
 # RELOCS-NEXT:       }
 
 # ABS64-EH-FRAME: Augmentation data: 0C
 ##                                   ^^ fde pointer encoding: DW_EH_PE_sdata8
 # ABS32-EH-FRAME: Augmentation data: 0B
 ##                                   ^^ fde pointer encoding: DW_EH_PE_sdata4
 # PIC-EH-FRAME: Augmentation data: 1B
 ##                                 ^^ fde pointer encoding: DW_EH_PE_pcrel | DW_EH_PE_sdata4

lld/test/ELF/mips-lo16-not-relative.s

 # REQUIRES: mips
 # Check that R_MIPS_LO16 relocation is handled as non-relative,
 # and if a target symbol is a DSO data symbol, LLD create a copy
 # relocation.
 
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux \
 # RUN:         %S/Inputs/mips-dynamic.s -o %t.so.o
 # RUN: ld.lld %t.so.o -shared -o %t.so
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
 # RUN: ld.lld %t.o %t.so -o %t.exe
 # RUN: llvm-readobj -r %t.exe | FileCheck %s
 
 # CHECK:      Relocations [
 # CHECK-NEXT:   Section (7) .rel.dyn {
-# CHECK-NEXT:     0x{{[0-9A-F]+}} R_MIPS_COPY data0 0x0
+# CHECK-NEXT:     0x{{[0-9A-F]+}} R_MIPS_COPY data0
 # CHECK-NEXT:   }
 # CHECK-NEXT: ]
 
   .text
   .global __start
 __start:
   addi   $t0, $t0, %lo(data0)

lld/test/ELF/mips-mgot.s

 # CHECK-NEXT:  70000 00000000 80000000 [[FOO0]] [[FOO2]]
 # CHECK-NEXT:  70010 00000000 00000004 00010000 00020000
 # CHECK-NEXT:  70020 00030000 00040000 00050000 00060000
 # CHECK-NEXT:  70030 00000000 00000000 00000000 00000000
 # CHECK-NEXT:  70040 00000000 00000000 00000000
 
 # GOT:      Relocations [
 # GOT-NEXT:   Section (7) .rel.dyn {
-# GOT-NEXT:     0x70018 R_MIPS_REL32 - 0x0
-# GOT-NEXT:     0x7001C R_MIPS_REL32 - 0x0
-# GOT-NEXT:     0x70020 R_MIPS_REL32 - 0x0
-# GOT-NEXT:     0x70024 R_MIPS_REL32 - 0x0
-# GOT-NEXT:     0x70028 R_MIPS_REL32 - 0x0
-# GOT-NEXT:     0x7002C R_MIPS_REL32 - 0x0
-# GOT-NEXT:     0x70030 R_MIPS_REL32 foo0 0x0
-# GOT-NEXT:     0x70034 R_MIPS_REL32 foo2 0x0
-# GOT-NEXT:     0x70044 R_MIPS_TLS_DTPMOD32 - 0x0
-# GOT-NEXT:     0x70010 R_MIPS_TLS_TPREL32 tls0 0x0
-# GOT-NEXT:     0x70038 R_MIPS_TLS_TPREL32 tls0 0x0
-# GOT-NEXT:     0x7003C R_MIPS_TLS_DTPMOD32 tls0 0x0
-# GOT-NEXT:     0x70040 R_MIPS_TLS_DTPREL32 tls0 0x0
-# GOT-NEXT:     0x70014 R_MIPS_TLS_TPREL32 tls1 0x0
+# GOT-NEXT:     0x70018 R_MIPS_REL32 -
+# GOT-NEXT:     0x7001C R_MIPS_REL32 -
+# GOT-NEXT:     0x70020 R_MIPS_REL32 -
+# GOT-NEXT:     0x70024 R_MIPS_REL32 -
+# GOT-NEXT:     0x70028 R_MIPS_REL32 -
+# GOT-NEXT:     0x7002C R_MIPS_REL32 -
+# GOT-NEXT:     0x70030 R_MIPS_REL32 foo0
+# GOT-NEXT:     0x70034 R_MIPS_REL32 foo2
+# GOT-NEXT:     0x70044 R_MIPS_TLS_DTPMOD32 -
+# GOT-NEXT:     0x70010 R_MIPS_TLS_TPREL32 tls0
+# GOT-NEXT:     0x70038 R_MIPS_TLS_TPREL32 tls0
+# GOT-NEXT:     0x7003C R_MIPS_TLS_DTPMOD32 tls0
+# GOT-NEXT:     0x70040 R_MIPS_TLS_DTPREL32 tls0
+# GOT-NEXT:     0x70014 R_MIPS_TLS_TPREL32 tls1
 # GOT-NEXT:   }
 # GOT-NEXT: ]
 
 # GOT:      DynamicSymbols [
 # GOT:        Symbol {
 # GOT:          Name: foo0
 # GOT-NEXT:     Value: 0x[[FOO0:[0-9A-F]+]]
 # GOT:        }

lld/test/ELF/mips-plt-copy.s

 # REQUIRES: mips
 # Check creating of R_MIPS_COPY and R_MIPS_JUMP_SLOT dynamic relocations
 # and corresponding PLT entries.
 
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
 # RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux \
 # RUN:         %S/Inputs/mips-dynamic.s -o %t.so.o
 # RUN: ld.lld %t.so.o -shared -soname=t.so -o %t.so
 # RUN: ld.lld %t.o %t.so -o %t.exe
 # RUN: llvm-readobj -r -A %t.exe | FileCheck %s
 
 # CHECK:      Relocations [
 # CHECK-NEXT:   Section ({{.*}}) .rel.dyn {
-# CHECK-DAG:      0x{{[0-9A-F]+}} R_MIPS_COPY data0 0x0
-# CHECK-DAG:      0x{{[0-9A-F]+}} R_MIPS_COPY data1 0x0
+# CHECK-DAG:      0x{{[0-9A-F]+}} R_MIPS_COPY data0
+# CHECK-DAG:      0x{{[0-9A-F]+}} R_MIPS_COPY data1
 # CHECK-NEXT:   }
 # CHECK-NEXT:   Section ({{.*}}) .rel.plt {
-# CHECK-DAG:      0x{{[0-9A-F]+}} R_MIPS_JUMP_SLOT foo0 0x0
-# CHECK-DAG:      0x{{[0-9A-F]+}} R_MIPS_JUMP_SLOT foo1 0x0
+# CHECK-DAG:      0x{{[0-9A-F]+}} R_MIPS_JUMP_SLOT foo0
+# CHECK-DAG:      0x{{[0-9A-F]+}} R_MIPS_JUMP_SLOT foo1
 # CHECK-NEXT:   }
 # CHECK-NEXT: ]
 
 # CHECK:      Primary GOT {
 # CHECK:        Local entries [
 # CHECK-NEXT:   ]
 # CHECK-NEXT:   Global entries [
 # CHECK-NEXT:   ]

lld/test/ELF/mips-tls-64.s

 # DIS-NEXT:    addiu   $2, $3, -32720
 # DIS-NEXT:    addiu   $2, $3, -32736
 # DIS-NEXT:    addiu   $2, $3, -32704
 # DIS-NEXT:    addiu   $2, $3, -32688
 # DIS-NEXT:    addiu   $2, $3, -32728
 
 # CHECK:      Relocations [
 # CHECK-NEXT:   Section (7) .rel.dyn {
-# CHECK-NEXT:     0x30010 R_MIPS_TLS_TPREL64/R_MIPS_NONE/R_MIPS_NONE foo 0x0
-# CHECK-NEXT:     0x30020 R_MIPS_TLS_DTPMOD64/R_MIPS_NONE/R_MIPS_NONE foo 0x0
-# CHECK-NEXT:     0x30028 R_MIPS_TLS_DTPREL64/R_MIPS_NONE/R_MIPS_NONE foo 0x0
+# CHECK-NEXT:     0x30010 R_MIPS_TLS_TPREL64/R_MIPS_NONE/R_MIPS_NONE foo
+# CHECK-NEXT:     0x30020 R_MIPS_TLS_DTPMOD64/R_MIPS_NONE/R_MIPS_NONE foo
+# CHECK-NEXT:     0x30028 R_MIPS_TLS_DTPREL64/R_MIPS_NONE/R_MIPS_NONE foo
 # CHECK-NEXT:   }
 # CHECK-NEXT: ]
 # CHECK:      Primary GOT {
 # CHECK-NEXT:   Canonical gp value: 0x37FF0
 # CHECK-NEXT:   Reserved entries [
 # CHECK:        ]
 # CHECK-NEXT:   Local entries [
 # CHECK-NEXT:   ]

 # DIS-SO-NEXT:  30000 00000000 00000000 80000000 00000000
 # DIS-SO-NEXT:  30010 00000000 00000000 00000000 00000004
 # DIS-SO-NEXT:  30020 00000000 00000000 00000000 00000000
 # DIS-SO-NEXT:  30030 00000000 00000000 00000000 00000000
 # DIS-SO-NEXT:  30040 00000000 00000000 00000000 00000000
 
 # SO:      Relocations [
 # SO-NEXT:   Section (7) .rel.dyn {
-# SO-NEXT:     0x30030 R_MIPS_TLS_DTPMOD64/R_MIPS_NONE/R_MIPS_NONE - 0x0
-# SO-NEXT:     0x30018 R_MIPS_TLS_TPREL64/R_MIPS_NONE/R_MIPS_NONE bar 0x0
-# SO-NEXT:     0x30040 R_MIPS_TLS_DTPMOD64/R_MIPS_NONE/R_MIPS_NONE bar 0x0
-# SO-NEXT:     0x30048 R_MIPS_TLS_DTPREL64/R_MIPS_NONE/R_MIPS_NONE bar 0x0
-# SO-NEXT:     0x30010 R_MIPS_TLS_TPREL64/R_MIPS_NONE/R_MIPS_NONE foo 0x0
-# SO-NEXT:     0x30020 R_MIPS_TLS_DTPMOD64/R_MIPS_NONE/R_MIPS_NONE foo 0x0
-# SO-NEXT:     0x30028 R_MIPS_TLS_DTPREL64/R_MIPS_NONE/R_MIPS_NONE foo 0x0
+# SO-NEXT:     0x30030 R_MIPS_TLS_DTPMOD64/R_MIPS_NONE/R_MIPS_NONE -
+# SO-NEXT:     0x30018 R_MIPS_TLS_TPREL64/R_MIPS_NONE/R_MIPS_NONE bar
+# SO-NEXT:     0x30040 R_MIPS_TLS_DTPMOD64/R_MIPS_NONE/R_MIPS_NONE bar
+# SO-NEXT:     0x30048 R_MIPS_TLS_DTPREL64/R_MIPS_NONE/R_MIPS_NONE bar
+# SO-NEXT:     0x30010 R_MIPS_TLS_TPREL64/R_MIPS_NONE/R_MIPS_NONE foo
+# SO-NEXT:     0x30020 R_MIPS_TLS_DTPMOD64/R_MIPS_NONE/R_MIPS_NONE foo
+# SO-NEXT:     0x30028 R_MIPS_TLS_DTPREL64/R_MIPS_NONE/R_MIPS_NONE foo
 # SO-NEXT:   }
 # SO-NEXT: ]
 # SO:      Primary GOT {
 # SO-NEXT:   Canonical gp value: 0x37FF0
 # SO-NEXT:   Reserved entries [
 # SO:        ]
 # SO-NEXT:   Local entries [
 # SO-NEXT:   ]

lld/test/ELF/mips64-eh-abs-reloc.s

 # OBJ-NEXT:    0x0 R_MIPS_GPREL16/R_MIPS_SUB/R_MIPS_HI16 foo 0x0
 # OBJ-NEXT:  }
 # OBJ-NEXT:  Section ({{.*}}) .rela.eh_frame {
 # OBJ-NEXT:    0x1C R_MIPS_64/R_MIPS_NONE/R_MIPS_NONE .text 0x0
 # OBJ-NEXT:  }
 
 # PIC-RELOCS: Relocations [
 # PIC-RELOCS-NEXT:  Section (7) .rel.dyn {
-# PIC-RELOCS-NEXT:    {{0x.+}} R_MIPS_REL32/R_MIPS_64/R_MIPS_NONE - 0x0
+# PIC-RELOCS-NEXT:    {{0x.+}} R_MIPS_REL32/R_MIPS_64/R_MIPS_NONE -
 # PIC-RELOCS-NEXT:  }
 # PIC-RELOCS-NEXT:]
 
 
 .globl foo
 
 bar:
 .cfi_startproc
 lui  $11, %hi(%neg(%gp_rel(foo)))
 .cfi_endproc
 
 .globl __start
 __start:
 b bar

lld/test/ELF/pack-dyn-relocs-arm2.s

 // REQUIRES: arm
 
 // RUN: llvm-mc -filetype=obj -triple=armv7a-none-linux-gnueabi %p/Inputs/arm-shared.s -o %t.so.o
 // RUN: ld.lld -shared %t.so.o -soname=t.so -o %t.so
 
 // RUN: llvm-mc -filetype=obj -triple=armv7a-none-linux-gnueabi %s -o %t.o
 // RUN: ld.lld -pie --pack-dyn-relocs=relr %t.o %t.so -o %t.exe
 // RUN: llvm-readobj -r %t.exe | FileCheck %s
 
 // CHECK:      Section (5) .relr.dyn {
-// CHECK-NEXT:   0x301E8 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x301EC R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x301F0 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x301F4 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x301F8 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x301FC R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x30200 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x30204 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x30208 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x3020C R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x30210 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x30214 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x30218 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x3021C R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x30220 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x30224 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x30228 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x3022C R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x30230 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x30234 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x30238 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x3023C R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x30240 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x30244 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x30248 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x3024C R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x30250 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x30254 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x30258 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x3025C R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x30260 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x30264 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x30268 R_ARM_RELATIVE - 0x0
-// CHECK-NEXT:   0x3026C R_ARM_RELATIVE - 0x0
+// CHECK-NEXT:   0x301E8 R_ARM_RELATIVE -
+// CHECK-NEXT:   0x301EC R_ARM_RELATIVE -
+// CHECK-NEXT:   0x301F0 R_ARM_RELATIVE -
+// CHECK-NEXT:   0x301F4 R_ARM_RELATIVE -
+// CHECK-NEXT:   0x301F8 R_ARM_RELATIVE -
+// CHECK-NEXT:   0x301FC R_ARM_RELATIVE -
+// CHECK-NEXT:   0x30200 R_ARM_RELATIVE -
+// CHECK-NEXT:   0x30204 R_ARM_RELATIVE -
+// CHECK-NEXT:   0x30208 R_ARM_RELATIVE -
+// CHECK-NEXT:   0x3020C R_ARM_RELATIVE -
+// CHECK-NEXT:   0x30210 R_ARM_RELATIVE -
+// CHECK-NEXT:   0x30214 R_ARM_RELATIVE -
+// CHECK-NEXT:   0x30218 R_ARM_RELATIVE -
+// CHECK-NEXT:   0x3021C R_ARM_RELATIVE -
+// CHECK-NEXT:   0x30220 R_ARM_RELATIVE -
+// CHECK-NEXT:   0x30224 R_ARM_RELATIVE -
+// CHECK-NEXT:   0x30228 R_ARM_RELATIVE -
+// CHECK-NEXT:   0x3022C R_ARM_RELATIVE -
+// CHECK-NEXT:   0x30230 R_ARM_RELATIVE -
+// CHECK-NEXT:   0x30234 R_ARM_RELATIVE -
+// CHECK-NEXT:   0x30238 R_ARM_RELATIVE -
+// CHECK-NEXT:   0x3023C R_ARM_RELATIVE -
+// CHECK-NEXT:   0x30240 R_ARM_RELATIVE -
+// CHECK-NEXT:   0x30244 R_ARM_RELATIVE -
+// CHECK-NEXT:   0x30248 R_ARM_RELATIVE -
+// CHECK-NEXT:   0x3024C R_ARM_RELATIVE -
+// CHECK-NEXT:   0x30250 R_ARM_RELATIVE -
+// CHECK-NEXT:   0x30254 R_ARM_RELATIVE -
+// CHECK-NEXT:   0x30258 R_ARM_RELATIVE -
+// CHECK-NEXT:   0x3025C R_ARM_RELATIVE -
+// CHECK-NEXT:   0x30260 R_ARM_RELATIVE -
+// CHECK-NEXT:   0x30264 R_ARM_RELATIVE -
+// CHECK-NEXT:   0x30268 R_ARM_RELATIVE -
+// CHECK-NEXT:   0x3026C R_ARM_RELATIVE -
 // CHECK-NEXT: }
 
 // RUN: llvm-readobj -S --dynamic-table %t.exe | FileCheck --check-prefix=HEADER %s
 // HEADER: 0x00000023 RELRSZ 0xC
 
 .data
 .align 2
 .dc.a __ehdr_start

lld/test/ELF/pack-dyn-relocs-relr-loop.s

 # REQUIRES: aarch64
 # RUN: llvm-mc -filetype=obj -triple=aarch64 %s -o %t.o
 # RUN: ld.lld -pie --pack-dyn-relocs=relr -z max-page-size=4096 --verbose %t.o -o %t 2>&1 | FileCheck %s
 # RUN: llvm-readobj -r %t | FileCheck --check-prefix=RELR %s
 
 ## This test makes sure we don't shrink .relr.dyn, otherwise its size may
 ## oscillate between 2 words and 3 words.
 
 ## The test is very sensitive to the exact section sizes and offsets,
 ## make sure .data is located at a page boundary.
 
 # CHECK: .relr.dyn needs 1 padding word(s)
 
 # RELR:      .relr.dyn {
-# RELR-NEXT:   0x2F30 R_AARCH64_RELATIVE - 0x0
-# RELR-NEXT:   0x2F38 R_AARCH64_RELATIVE - 0x0
-# RELR-NEXT:   0x3000 R_AARCH64_RELATIVE - 0x0
+# RELR-NEXT:   0x2F30 R_AARCH64_RELATIVE -
+# RELR-NEXT:   0x2F38 R_AARCH64_RELATIVE -
+# RELR-NEXT:   0x3000 R_AARCH64_RELATIVE -
 # RELR-NEXT: }
 
 .section .data.rel.ro
 .align 3
 .space 0xcd0
 foo:
 ## Encoded by the first word of .relr.dyn
 .quad foo

lld/test/ELF/pack-dyn-relocs.s

 // REQUIRES: arm, aarch64
 
 // RUN: llvm-mc -filetype=obj -triple=armv7a-none-linux-gnueabi %p/Inputs/arm-shared.s -o %t.a32.so.o
 // RUN: ld.lld -shared %t.a32.so.o -soname=so -o %t.a32.so
 // RUN: llvm-mc -filetype=obj -triple=armv7a-none-linux-gnueabi %s -o %t.a32.o
 // RUN: ld.lld -pie --pack-dyn-relocs=none %t.a32.o %t.a32.so -o %t2.a32
 // RUN: llvm-readobj -r %t2.a32 | FileCheck --check-prefix=UNPACKED32 %s
 
 /// Unpacked should have the relative relocations in their natural order.
 /// UNPACKED32:          Section ({{.+}}) .rel.dyn {
-// UNPACKED32-NEXT:     0x30324 R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x30328 R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x3032C R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x30330 R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x30334 R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x30338 R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x3033C R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x30340 R_ARM_RELATIVE - 0x0
-
-// UNPACKED32-NEXT:     0x30348 R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x3034C R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x30350 R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x30354 R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x30358 R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x3035C R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x30360 R_ARM_RELATIVE - 0x0
-
-// UNPACKED32-NEXT:     0x3036C R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x30370 R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x30374 R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x30378 R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x3037C R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x30380 R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x30384 R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x30388 R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x3038C R_ARM_RELATIVE - 0x0
-// UNPACKED32-NEXT:     0x30391 R_ARM_RELATIVE - 0x0
-
-// UNPACKED32-NEXT:     0x30344 R_ARM_ABS32 bar2 0x0
-// UNPACKED32-NEXT:     0x30368 R_ARM_ABS32 bar2 0x0
-// UNPACKED32-NEXT:     0x30395 R_ARM_ABS32 bar2 0x0
-// UNPACKED32-NEXT:     0x30399 R_ARM_ABS32 bar2 0x0
-// UNPACKED32-NEXT:     0x3039D R_ARM_ABS32 bar2 0x0
-// UNPACKED32-NEXT:     0x303A1 R_ARM_ABS32 bar2 0x0
-// UNPACKED32-NEXT:     0x303A5 R_ARM_ABS32 bar2 0x0
-// UNPACKED32-NEXT:     0x30364 R_ARM_ABS32 zed2 0x0
+// UNPACKED32-NEXT:     0x30324 R_ARM_RELATIVE -
+// UNPACKED32-NEXT:     0x30328 R_ARM_RELATIVE -
+// UNPACKED32-NEXT:     0x3032C R_ARM_RELATIVE -
+// UNPACKED32-NEXT:     0x30330 R_ARM_RELATIVE -
+// UNPACKED32-NEXT:     0x30334 R_ARM_RELATIVE -
+// UNPACKED32-NEXT:     0x30338 R_ARM_RELATIVE -
+// UNPACKED32-NEXT:     0x3033C R_ARM_RELATIVE -
+// UNPACKED32-NEXT:     0x30340 R_ARM_RELATIVE -
+
+// UNPACKED32-NEXT:     0x30348 R_ARM_RELATIVE -
+// UNPACKED32-NEXT:     0x3034C R_ARM_RELATIVE -
+// UNPACKED32-NEXT:     0x30350 R_ARM_RELATIVE -
+// UNPACKED32-NEXT:     0x30354 R_ARM_RELATIVE -
+// UNPACKED32-NEXT:     0x30358 R_ARM_RELATIVE -
+// UNPACKED32-NEXT:     0x3035C R_ARM_RELATIVE -
+// UNPACKED32-NEXT:     0x30360 R_ARM_RELATIVE -
+
+// UNPACKED32-NEXT:     0x3036C R_ARM_RELATIVE -
+// UNPACKED32-NEXT:     0x30370 R_ARM_RELATIVE -
+// UNPACKED32-NEXT:     0x30374 R_ARM_RELATIVE -
+// UNPACKED32-NEXT:     0x30378 R_ARM_RELATIVE -
+// UNPACKED32-NEXT:     0x3037C R_ARM_RELATIVE -
+// UNPACKED32-NEXT:     0x30380 R_ARM_RELATIVE -
+// UNPACKED32-NEXT:     0x30384 R_ARM_RELATIVE -
+// UNPACKED32-NEXT:     0x30388 R_ARM_RELATIVE -
+// UNPACKED32-NEXT:     0x3038C R_ARM_RELATIVE -
+// UNPACKED32-NEXT:     0x30391 R_ARM_RELATIVE -
+
+// UNPACKED32-NEXT:     0x30344 R_ARM_ABS32 bar2
+// UNPACKED32-NEXT:     0x30368 R_ARM_ABS32 bar2
+// UNPACKED32-NEXT:     0x30395 R_ARM_ABS32 bar2
+// UNPACKED32-NEXT:     0x30399 R_ARM_ABS32 bar2
+// UNPACKED32-NEXT:     0x3039D R_ARM_ABS32 bar2
+// UNPACKED32-NEXT:     0x303A1 R_ARM_ABS32 bar2
+// UNPACKED32-NEXT:     0x303A5 R_ARM_ABS32 bar2
+// UNPACKED32-NEXT:     0x30364 R_ARM_ABS32 zed2
 // UNPACKED32-NEXT:     }
 
 // RUN: ld.lld -pie --pack-dyn-relocs=android %t.a32.o %t.a32.so -o %t3.a32
 // RUN: llvm-readobj -S --dynamic-table %t3.a32 | FileCheck --check-prefix=ANDROID32-HEADERS %s
 // RUN: llvm-readobj -r %t3.a32 | FileCheck --check-prefix=ANDROID32 %s
 
 // ANDROID32-HEADERS:       Index: 1
 // ANDROID32-HEADERS-NEXT:  Name: .dynsym

 
 // ANDROID32-HEADERS: 0x6000000F ANDROID_REL          [[ADDR]]
 // ANDROID32-HEADERS: 0x60000010 ANDROID_RELSZ        [[SIZE]]
 
 /// Packed should have the groups of non-relative relocations first, followed
 /// by the larger groups of relative relocations (i.e. the 8 and 9 followed
 /// by the 7.)
 // ANDROID32:          Section ({{.+}}) .rel.dyn {
-// ANDROID32-NEXT:     0x30254 R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x30258 R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x3025C R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x30260 R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x30264 R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x30268 R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x3026C R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x30270 R_ARM_RELATIVE - 0x0
-
-// ANDROID32-NEXT:     0x3029C R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x302A0 R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x302A4 R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x302A8 R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x302AC R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x302B0 R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x302B4 R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x302B8 R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x302BC R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x30278 R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x3027C R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x30280 R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x30284 R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x30288 R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x3028C R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x30290 R_ARM_RELATIVE - 0x0
-// ANDROID32-NEXT:     0x302C1 R_ARM_RELATIVE - 0x0
-
-// ANDROID32-NEXT:     0x30274 R_ARM_ABS32 bar2 0x0
-// ANDROID32-NEXT:     0x30298 R_ARM_ABS32 bar2 0x0
-// ANDROID32-NEXT:     0x302C5 R_ARM_ABS32 bar2 0x0
-// ANDROID32-NEXT:     0x302C9 R_ARM_ABS32 bar2 0x0
-// ANDROID32-NEXT:     0x302CD R_ARM_ABS32 bar2 0x0
-// ANDROID32-NEXT:     0x302D1 R_ARM_ABS32 bar2 0x0
-// ANDROID32-NEXT:     0x302D5 R_ARM_ABS32 bar2 0x0
+// ANDROID32-NEXT:     0x30254 R_ARM_RELATIVE -
+// ANDROID32-NEXT:     0x30258 R_ARM_RELATIVE -
+// ANDROID32-NEXT:     0x3025C R_ARM_RELATIVE -
+// ANDROID32-NEXT:     0x30260 R_ARM_RELATIVE -
+// ANDROID32-NEXT:     0x30264 R_ARM_RELATIVE -
+// ANDROID32-NEXT:     0x30268 R_ARM_RELATIVE -
+// ANDROID32-NEXT:     0x3026C R_ARM_RELATIVE -
+// ANDROID32-NEXT:     0x30270 R_ARM_RELATIVE -
+
+// ANDROID32-NEXT:     0x3029C R_ARM_RELATIVE -
+// ANDROID32-NEXT:     0x302A0 R_ARM_RELATIVE -
+// ANDROID32-NEXT:     0x302A4 R_ARM_RELATIVE -
+// ANDROID32-NEXT:     0x302A8 R_ARM_RELATIVE -
+// ANDROID32-NEXT:     0x302AC R_ARM_RELATIVE -
+// ANDROID32-NEXT:     0x302B0 R_ARM_RELATIVE -
+// ANDROID32-NEXT:     0x302B4 R_ARM_RELATIVE -
+// ANDROID32-NEXT:     0x302B8 R_ARM_RELATIVE -
+// ANDROID32-NEXT:     0x302BC R_ARM_RELATIVE -
+// ANDROID32-NEXT:     0x30278 R_ARM_RELATIVE -
+// ANDROID32-NEXT:     0x3027C R_ARM_RELATIVE -
+// ANDROID32-NEXT:     0x30280 R_ARM_RELATIVE -
+// ANDROID32-NEXT:     0x30284 R_ARM_RELATIVE -
+// ANDROID32-NEXT:     0x30288 R_ARM_RELATIVE -
+// ANDROID32-NEXT:     0x3028C R_ARM_RELATIVE -
+// ANDROID32-NEXT:     0x30290 R_ARM_RELATIVE -
+// ANDROID32-NEXT:     0x302C1 R_ARM_RELATIVE -
+
+// ANDROID32-NEXT:     0x30274 R_ARM_ABS32 bar2
+// ANDROID32-NEXT:     0x30298 R_ARM_ABS32 bar2
+// ANDROID32-NEXT:     0x302C5 R_ARM_ABS32 bar2
+// ANDROID32-NEXT:     0x302C9 R_ARM_ABS32 bar2
+// ANDROID32-NEXT:     0x302CD R_ARM_ABS32 bar2
+// ANDROID32-NEXT:     0x302D1 R_ARM_ABS32 bar2
+// ANDROID32-NEXT:     0x302D5 R_ARM_ABS32 bar2
 
 // ANDROID32-NEXT:     0x30294 R_ARM_ABS32 zed2 0x0
 // ANDROID32-NEXT:     }
 
 // RUN: ld.lld -pie --pack-dyn-relocs=relr %t.a32.o %t.a32.so -o %t4.a32
 // RUN: llvm-readobj -S --dynamic-table %t4.a32 | FileCheck --check-prefix=RELR32-HEADERS %s
 // RUN: llvm-readobj -r --raw-relr %t4.a32 | FileCheck --check-prefix=RAW-RELR32 %s
 // RUN: llvm-readobj -r %t4.a32 | FileCheck --check-prefix=RELR32 %s

 // RAW-RELR32-NEXT:      0x30284
 // RAW-RELR32-NEXT:      0x7FCFEFF
 // RAW-RELR32-NEXT:      }
 
 /// Decoded SHT_RELR section is same as UNPACKED,
 /// but contains only the relative relocations.
 /// Any relative relocations with odd offset stay in SHT_REL.
 // RELR32:               Section ({{.+}}) .rel.dyn {
-// RELR32-NEXT:          0x302F1 R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x302A4 R_ARM_ABS32 bar2 0x0
-// RELR32-NEXT:          0x302C8 R_ARM_ABS32 bar2 0x0
-// RELR32-NEXT:          0x302F5 R_ARM_ABS32 bar2 0x0
-// RELR32-NEXT:          0x302F9 R_ARM_ABS32 bar2 0x0
-// RELR32-NEXT:          0x302FD R_ARM_ABS32 bar2 0x0
-// RELR32-NEXT:          0x30301 R_ARM_ABS32 bar2 0x0
-// RELR32-NEXT:          0x30305 R_ARM_ABS32 bar2 0x0
-// RELR32-NEXT:          0x302C4 R_ARM_ABS32 zed2 0x0
+// RELR32-NEXT:          0x302F1 R_ARM_RELATIVE -
+// RELR32-NEXT:          0x302A4 R_ARM_ABS32 bar2
+// RELR32-NEXT:          0x302C8 R_ARM_ABS32 bar2
+// RELR32-NEXT:          0x302F5 R_ARM_ABS32 bar2
+// RELR32-NEXT:          0x302F9 R_ARM_ABS32 bar2
+// RELR32-NEXT:          0x302FD R_ARM_ABS32 bar2
+// RELR32-NEXT:          0x30301 R_ARM_ABS32 bar2
+// RELR32-NEXT:          0x30305 R_ARM_ABS32 bar2
+// RELR32-NEXT:          0x302C4 R_ARM_ABS32 zed2
 // RELR32-NEXT:          }
 // RELR32-NEXT:          Section ({{.+}}) .relr.dyn {
-// RELR32-NEXT:          0x30284 R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x30288 R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x3028C R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x30290 R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x30294 R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x30298 R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x3029C R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x302A0 R_ARM_RELATIVE - 0x0
-
-// RELR32-NEXT:          0x302A8 R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x302AC R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x302B0 R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x302B4 R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x302B8 R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x302BC R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x302C0 R_ARM_RELATIVE - 0x0
-
-// RELR32-NEXT:          0x302CC R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x302D0 R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x302D4 R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x302D8 R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x302DC R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x302E0 R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x302E4 R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x302E8 R_ARM_RELATIVE - 0x0
-// RELR32-NEXT:          0x302EC R_ARM_RELATIVE - 0x0
+// RELR32-NEXT:          0x30284 R_ARM_RELATIVE -
+// RELR32-NEXT:          0x30288 R_ARM_RELATIVE -
+// RELR32-NEXT:          0x3028C R_ARM_RELATIVE -
+// RELR32-NEXT:          0x30290 R_ARM_RELATIVE -
+// RELR32-NEXT:          0x30294 R_ARM_RELATIVE -
+// RELR32-NEXT:          0x30298 R_ARM_RELATIVE -
+// RELR32-NEXT:          0x3029C R_ARM_RELATIVE -
+// RELR32-NEXT:          0x302A0 R_ARM_RELATIVE -
+
+// RELR32-NEXT:          0x302A8 R_ARM_RELATIVE -
+// RELR32-NEXT:          0x302AC R_ARM_RELATIVE -
+// RELR32-NEXT:          0x302B0 R_ARM_RELATIVE -
+// RELR32-NEXT:          0x302B4 R_ARM_RELATIVE -
+// RELR32-NEXT:          0x302B8 R_ARM_RELATIVE -
+// RELR32-NEXT:          0x302BC R_ARM_RELATIVE -
+// RELR32-NEXT:          0x302C0 R_ARM_RELATIVE -
+
+// RELR32-NEXT:          0x302CC R_ARM_RELATIVE -
+// RELR32-NEXT:          0x302D0 R_ARM_RELATIVE -
+// RELR32-NEXT:          0x302D4 R_ARM_RELATIVE -
+// RELR32-NEXT:          0x302D8 R_ARM_RELATIVE -
+// RELR32-NEXT:          0x302DC R_ARM_RELATIVE -
+// RELR32-NEXT:          0x302E0 R_ARM_RELATIVE -
+// RELR32-NEXT:          0x302E4 R_ARM_RELATIVE -
+// RELR32-NEXT:          0x302E8 R_ARM_RELATIVE -
+// RELR32-NEXT:          0x302EC R_ARM_RELATIVE -
 // RELR32-NEXT:          }
 
 // RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-linux %p/Inputs/shared2.s -o %t.a64.so.o
 // RUN: ld.lld -shared %t.a64.so.o -soname=so -o %t.a64.so
 // RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-linux %s -o %t.a64.o
 // RUN: ld.lld -pie --pack-dyn-relocs=none %t.a64.o %t.a64.so -o %t2.a64
 // RUN: llvm-readobj -r %t2.a64 | FileCheck --check-prefix=UNPACKED64 %s
 

 // RELR64-NEXT:   0x30571 R_AARCH64_ABS64 bar2 0x0
 // RELR64-NEXT:   0x30579 R_AARCH64_ABS64 bar2 0x0
 // RELR64-NEXT:   0x30581 R_AARCH64_ABS64 bar2 0x1
 // RELR64-NEXT:   0x30589 R_AARCH64_ABS64 bar2 0x1
 // RELR64-NEXT:   0x30591 R_AARCH64_ABS64 bar2 0x0
 // RELR64-NEXT:   0x30510 R_AARCH64_ABS64 zed2 0x0
 // RELR64-NEXT: }
 // RELR64-NEXT: Section ({{.+}}) .relr.dyn {
-// RELR64-NEXT:   0x30490 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:   0x30498 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:   0x304A0 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:   0x304A8 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:   0x304B0 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:   0x304B8 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:   0x304C0 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:   0x304C8 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:   0x304D8 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:   0x304E0 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:   0x304E8 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:   0x304F0 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:   0x304F8 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:   0x30500 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:   0x30508 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:   0x30520 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:   0x30528 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:   0x30530 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:   0x30538 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:   0x30540 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:   0x30548 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:   0x30550 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:   0x30558 R_AARCH64_RELATIVE - 0x0
-// RELR64-NEXT:   0x30560 R_AARCH64_RELATIVE - 0x0
+// RELR64-NEXT:   0x30490 R_AARCH64_RELATIVE -
+// RELR64-NEXT:   0x30498 R_AARCH64_RELATIVE -
+// RELR64-NEXT:   0x304A0 R_AARCH64_RELATIVE -
+// RELR64-NEXT:   0x304A8 R_AARCH64_RELATIVE -
+// RELR64-NEXT:   0x304B0 R_AARCH64_RELATIVE -
+// RELR64-NEXT:   0x304B8 R_AARCH64_RELATIVE -
+// RELR64-NEXT:   0x304C0 R_AARCH64_RELATIVE -
+// RELR64-NEXT:   0x304C8 R_AARCH64_RELATIVE -
+// RELR64-NEXT:   0x304D8 R_AARCH64_RELATIVE -
+// RELR64-NEXT:   0x304E0 R_AARCH64_RELATIVE -
+// RELR64-NEXT:   0x304E8 R_AARCH64_RELATIVE -
+// RELR64-NEXT:   0x304F0 R_AARCH64_RELATIVE -
+// RELR64-NEXT:   0x304F8 R_AARCH64_RELATIVE -
+// RELR64-NEXT:   0x30500 R_AARCH64_RELATIVE -
+// RELR64-NEXT:   0x30508 R_AARCH64_RELATIVE -
+// RELR64-NEXT:   0x30520 R_AARCH64_RELATIVE -
+// RELR64-NEXT:   0x30528 R_AARCH64_RELATIVE -
+// RELR64-NEXT:   0x30530 R_AARCH64_RELATIVE -
+// RELR64-NEXT:   0x30538 R_AARCH64_RELATIVE -
+// RELR64-NEXT:   0x30540 R_AARCH64_RELATIVE -
+// RELR64-NEXT:   0x30548 R_AARCH64_RELATIVE -
+// RELR64-NEXT:   0x30550 R_AARCH64_RELATIVE -
+// RELR64-NEXT:   0x30558 R_AARCH64_RELATIVE -
+// RELR64-NEXT:   0x30560 R_AARCH64_RELATIVE -
 // RELR64-NEXT: }
 
 .data
 .align 2
 .dc.a __ehdr_start + 1
 .dc.a __ehdr_start + 2
 .dc.a __ehdr_start + 3
 .dc.a __ehdr_start + 4

lld/test/ELF/rel-addend-with-rela-input.s

 # RELA-TO-REL:  Section {
 # RELA-TO-REL:       Name: .data
 # RELA-TO-REL:       Address: 0x[[DATA:[0-9A-F]+]]
 # RELA-TO-REL:       SectionData (
 # RELA-TO-REL-NEXT:    0000: 00000000 00005544 ABCDEF00 12345678
 #                                     ^--- Addend for relocation in .rel.dyn
 # RELA-TO-REL:     Relocations [
 # RELA-TO-REL-NEXT:  Section ({{.+}}) .rel.dyn {
-# RELA-TO-REL-NEXT:     0x[[DATA]] R_MIPS_REL32/R_MIPS_64/R_MIPS_NONE foo 0x0
+# RELA-TO-REL-NEXT:     0x[[DATA]] R_MIPS_REL32/R_MIPS_64/R_MIPS_NONE foo
 # RELA-TO-REL-NEXT:  }
 # RELA-TO-REL-NEXT: ]
 
 .extern foo
 
 .data
 .quad foo + 0x5544
 .quad 0xabcdef0012345678

lld/test/ELF/relocatable-section-symbol.s

 # REL-NEXT:   SectionData (
 # REL-NEXT:     0000: 01000000 05000000                    |
 # REL-NEXT:   )
 # REL-NEXT: }
 
 
 # REL:      Relocations [
 # REL-NEXT:   Section ({{.*}}) .rel.data {
-# REL-NEXT:     0x0 R_386_32 .text 0x0
-# REL-NEXT:     0x4 R_386_32 .text 0x0
+# REL-NEXT:     0x0 R_386_32 .text
+# REL-NEXT:     0x4 R_386_32 .text
 # REL-NEXT:   }
 # REL-NEXT: ]
 
 
 .long 42
 .data
 .long .text + 1

lld/test/ELF/relocation-copy-i686.s

 // CHECK-NEXT:  EntrySize: 0
 
 // CHECK:      Relocations [
 // CHECK-NEXT:   Section ({{.*}}) .rel.dyn {
 // CHECK-NEXT:     Relocation {
 // CHECK-NEXT:       Offset:
 // CHECK-NEXT:       Type: R_386_COPY
 // CHECK-NEXT:       Symbol: x
-// CHECK-NEXT:       Addend: 0x0
 // CHECK-NEXT:     }
 // CHECK-NEXT:     Relocation {
 // CHECK-NEXT:       Offset:
 // CHECK-NEXT:       Type: R_386_COPY
 // CHECK-NEXT:       Symbol: y
-// CHECK-NEXT:       Addend: 0x0
 // CHECK-NEXT:     }
 // CHECK-NEXT:     Relocation {
 // CHECK-NEXT:       Offset:
 // CHECK-NEXT:       Type: R_386_COPY
 // CHECK-NEXT:       Symbol: z
-// CHECK-NEXT:       Addend: 0x0
 // CHECK-NEXT:     }
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
 
 // 16 is alignment here
 // CODE: Disassembly of section .text:
 // CODE-EMPTY:
 // CODE-NEXT: <main>:
 /// .bss + 0 = 0x403270
 // CODE-NEXT: 4011f0:       movl $0x5, 0x403270
 /// .bss + 16 = 0x403270 + 16 = 0x403280
 // CODE-NEXT: 4011fa:       movl $0x7, 0x403280
 /// .bss + 20 = 0x403270 + 20 = 0x403284
 // CODE-NEXT: 401204:       movl $0x9, 0x403284

lld/test/ELF/relocation-none-arm.s

 # REQUIRES: arm
 
 # RUN: llvm-mc -filetype=obj -triple=armv7-linux-musl %s -o %t.o
 # RUN: ld.lld --gc-sections %t.o -o %t
 # RUN: llvm-readelf -S -r %t | FileCheck %s
 
 # Test that we discard R_ARM_NONE, but respect the references it creates among
 # sections.
 
 # CHECK: .data
 # CHECK: There are no relocations in this file.
 
 # RUN: ld.lld -r %t.o -o %t
 # RUN: llvm-readobj -r %t | FileCheck --check-prefix=RELOC %s
 
 # RELOC:      Section ({{.*}}) .rel.text {
-# RELOC-NEXT:   0x0 R_ARM_NONE .data 0x0
+# RELOC-NEXT:   0x0 R_ARM_NONE .data
 # RELOC-NEXT: }
 
 .globl _start
 _start:
   nop
   .reloc 0, R_ARM_NONE, .data
 
 .data
   .long 0

lld/test/ELF/relocation-none-i386.s

 # REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -triple=i386-linux-musl %s -o %t.o
 # RUN: ld.lld --gc-sections %t.o -o %t
 # RUN: llvm-readelf -S -r %t | FileCheck %s
 
 # Test that we discard R_386_NONE, but respect the
 # references it creates among sections.
 
 # CHECK: .data
 # CHECK: There are no relocations in this file.
 
 # RUN: ld.lld -r %t.o -o %t
 # RUN: llvm-readobj -r %t | FileCheck --check-prefix=RELOC %s
 
 # RELOC:      Section ({{.*}}) .rel.text {
-# RELOC-NEXT:   0x0 R_386_NONE .data 0x0
+# RELOC-NEXT:   0x0 R_386_NONE .data
 # RELOC-NEXT: }
 
 .globl _start
 _start:
   ret
   .reloc 0, R_386_NONE, .data
 
 .data
   .long 0

lld/test/ELF/x86-64-zrel-zrela.s

 # REL-NEXT: RELSZ    48 (bytes)
 # REL-NEXT: RELENT   16 (bytes)
 # REL-NEXT: RELCOUNT 1
 # REL-NEXT: JMPREL   {{.*}}
 # REL-NEXT: PLTRELSZ 16 (bytes)
 # REL-NEXT: PLTGOT   {{.*}}
 # REL-NEXT: PLTREL   REL{{$}}
 # REL:      .rel.dyn {
-# REL-NEXT:   R_X86_64_RELATIVE - 0x0
-# REL-NEXT:   R_X86_64_GLOB_DAT func 0x0
-# REL-NEXT:   R_X86_64_64 _start 0
+# REL-NEXT:   R_X86_64_RELATIVE
+# REL-NEXT:   R_X86_64_GLOB_DAT func
+# REL-NEXT:   R_X86_64_64 _start
 # REL-NEXT: }
 # REL-NEXT: .rel.plt {
-# REL-NEXT:   R_X86_64_JUMP_SLOT func 0x0
+# REL-NEXT:   R_X86_64_JUMP_SLOT func
 # REL-NEXT: }
 
 # REL:      Hex dump of section '.data':
 # REL-NEXT: 0x00003408 08340000 00000000 2a000000 00000000
 
 .globl _start
 _start:
   call func@PLT
   movq func@GOTPCREL(%rip), %rax
 
 .data
   .quad .data
   .quad _start+42

llvm/test/CodeGen/AMDGPU/amdgpu-reloc-const.ll

 ; RUN: llc -march=amdgcn -verify-machineinstrs < %s | FileCheck -check-prefix=GCN %s
 ; RUN: llc -mtriple=amdgcn--amdpal -mcpu=gfx900 -filetype=obj -o %t.o < %s && llvm-readobj -relocations %t.o | FileCheck --check-prefix=ELF %s
 
 ; RUN: llc -global-isel -march=amdgcn -verify-machineinstrs < %s | FileCheck -check-prefix=GCN %s
 ; RUN: llc -global-isel -mtriple=amdgcn--amdpal -mcpu=gfx900 -filetype=obj -o %t.o < %s && llvm-readobj -relocations %t.o | FileCheck --check-prefix=ELF %s
 
 ; GCN-LABEL: {{^}}ps_main:
 ; GCN: v_mov_b32_{{.*}} v[[relocreg:[0-9]+]], doff_0_0_b@abs32@lo
 ; GCN-NEXT: exp {{.*}} v[[relocreg]], {{.*}}
 ; GCN-NEXT: s_endpgm
 ; GCN-NEXT: .Lfunc_end
 
 ; ELF: Relocations [
 ; ELF-NEXT: Section (3) .rel.text {
-; ELF-NEXT: 0x{{[0-9]+}} R_AMDGPU_ABS32 doff_0_0_b {{.*}}
+; ELF-NEXT: 0x{{[0-9]+}} R_AMDGPU_ABS32 doff_0_0_b{{$}}
 
 define amdgpu_ps void @ps_main(i32 %arg, i32 inreg %arg1, i32 inreg %arg2) local_unnamed_addr #0 {
   %rc = call i32 @llvm.amdgcn.reloc.constant(metadata !1)
   %rcf = bitcast i32 %rc to float
   call void @llvm.amdgcn.exp.f32(i32 immarg 40, i32 immarg 15, float %rcf, float undef, float undef, float undef, i1 immarg false, i1 immarg false) #0
   ret void
 }
 

llvm/test/CodeGen/AMDGPU/lds-relocs.ll

 ; RUN: llc -mtriple=amdgcn-mesa-mesa3d -mcpu=gfx900 -verify-machineinstrs -show-mc-encoding < %s | FileCheck -check-prefixes=GCN %s
 ; RUN: llc -mtriple=amdgcn-mesa-mesa3d -mcpu=gfx900 -filetype=obj < %s | llvm-readobj -r -t - | FileCheck -check-prefixes=ELF %s
 
 @lds.external = external unnamed_addr addrspace(3) global [0 x i32]
 @lds.defined = unnamed_addr addrspace(3) global [8 x i32] undef, align 8
 
 ; ELF:      Relocations [
 ; ELF-NEXT:   Section (3) .rel.text {
-; ELF-NEXT:     0x{{[0-9a-f]*}} R_AMDGPU_ABS32 lds.external 0x0
-; ELF-NEXT:     0x{{[0-9a-f]*}} R_AMDGPU_ABS32 lds.defined 0x0
+; ELF-NEXT:     0x{{[0-9a-f]*}} R_AMDGPU_ABS32 lds.external
+; ELF-NEXT:     0x{{[0-9a-f]*}} R_AMDGPU_ABS32 lds.defined
 ; ELF-NEXT:   }
 ; ELF-NEXT: ]
 
 ; ELF:      Symbol {
 ; ELF:        Name: lds.defined
 ; ELF-NEXT:   Value: 0x8
 ; ELF-NEXT:   Size: 32
 ; ELF-NEXT:   Binding: Global (0x1)

llvm/test/CodeGen/AMDGPU/no-initializer-constant-addrspace.ll

 ; RUN: llc -mtriple=amdgcn- -mcpu=tahiti -filetype=obj < %s | llvm-readobj -r --symbols - | FileCheck %s -check-prefix=GCN
 ; RUN: llc -mtriple=amdgcn- -mcpu=tonga -filetype=obj < %s | llvm-readobj -r --symbols - | FileCheck %s -check-prefix=GCN
 ; RUN: llc -mtriple=r600- -mcpu=cypress -filetype=obj < %s | llvm-readobj -r --symbols - | FileCheck %s -check-prefix=EG
 
-; GCN: R_AMDGPU_GOTPCREL32_LO extern_const_addrspace 0x0
+; GCN: R_AMDGPU_GOTPCREL32_LO extern_const_addrspace
 ; EG: R_AMDGPU_ABS32 extern_const_addrspace
 
 ; CHECK-DAG: Name: extern_const_addrspace
 @extern_const_addrspace = external unnamed_addr addrspace(4) constant [5 x i32], align 4
 
 ; CHECK-DAG: Name: load_extern_const_init
 define amdgpu_kernel void @load_extern_const_init(i32 addrspace(1)* %out) nounwind {
   %val = load i32, i32 addrspace(4)* getelementptr ([5 x i32], [5 x i32] addrspace(4)* @extern_const_addrspace, i64 0, i64 3), align 4

llvm/test/CodeGen/AMDGPU/r600-constant-array-fixup.ll

 ; RUN: llc -filetype=obj -mtriple=r600-mesa-mesa3d -mcpu=cypress -verify-machineinstrs < %s | llvm-readobj -r --symbols - | FileCheck %s
 
 @arr = internal unnamed_addr addrspace(4) constant [4 x i32] [i32 4, i32 5, i32 6, i32 7], align 4
 
 ; CHECK: Relocations [
 ; CHECK: Section (3) .rel.text {
-; CHECK: 0x58 R_AMDGPU_ABS32 .text 0x0
+; CHECK: 0x58 R_AMDGPU_ABS32 .text
 ; CHECK: }
 ; CHECK: ]
 
 ; CHECK: Symbol {
 ; CHECK: Name: arr (11)
 ; CHECK: Value: 0x70
 ; CHECK: Size: 16
 ; CHECK: Binding: Local (0x0)

llvm/test/CodeGen/AMDGPU/scratch-simple.ll

 ; RUN: llc -march=amdgcn -mtriple=amdgcn-- -mcpu=verde -amdgpu-use-divergent-register-indexing -verify-machineinstrs < %s | FileCheck --check-prefixes=GCN,SI,SIVI,MUBUF %s
 ; RUN: llc -march=amdgcn -mtriple=amdgcn-- -mcpu=gfx803 -mattr=-flat-for-global -amdgpu-use-divergent-register-indexing -verify-machineinstrs < %s | FileCheck --check-prefixes=GCN,VI,SIVI,MUBUF %s
 ; RUN: llc -march=amdgcn -mtriple=amdgcn-- -mcpu=gfx900 -mattr=-flat-for-global -amdgpu-use-divergent-register-indexing -verify-machineinstrs < %s | FileCheck --check-prefixes=GCN,GFX9,GFX9_10,MUBUF,GFX9-MUBUF,GFX9_10-MUBUF %s
 ; RUN: llc -march=amdgcn -mtriple=amdgcn-- -mcpu=gfx900 -filetype=obj -amdgpu-use-divergent-register-indexing < %s | llvm-readobj -r - | FileCheck --check-prefix=RELS %s
 ; RUN: llc -march=amdgcn -mtriple=amdgcn-- -mcpu=gfx1010 -mattr=-flat-for-global -amdgpu-use-divergent-register-indexing -verify-machineinstrs < %s | FileCheck --check-prefixes=GCN,GFX10_W32,GFX9_10,MUBUF,GFX10_W32-MUBUF,GFX9_10-MUBUF %s
 ; RUN: llc -march=amdgcn -mtriple=amdgcn-- -mcpu=gfx1010 -mattr=-flat-for-global,+wavefrontsize64 -amdgpu-use-divergent-register-indexing -verify-machineinstrs < %s | FileCheck --check-prefixes=GCN,GFX10_W64,GFX9_10,MUBUF,GFX10_W64-MUBUF,GFX9_10-MUBUF %s
 ; RUN: llc -march=amdgcn -mtriple=amdgcn-- -mcpu=gfx900 -mattr=-flat-for-global -amdgpu-use-divergent-register-indexing -amdgpu-enable-flat-scratch -verify-machineinstrs < %s | FileCheck --check-prefixes=GCN,GFX9,GFX9_10,FLATSCR,GFX9-FLATSCR %s
 ; RUN: llc -march=amdgcn -mtriple=amdgcn-- -mcpu=gfx1030 -mattr=-flat-for-global -amdgpu-use-divergent-register-indexing -amdgpu-enable-flat-scratch -verify-machineinstrs < %s | FileCheck --check-prefixes=GCN,GFX10_W32,GFX9_10,FLATSCR,GFX10-FLATSCR,GFX9_10-FLATSCR %s
 ; RUN: llc -march=amdgcn -mtriple=amdgcn--amdpal -mcpu=gfx900 -mattr=-flat-for-global -amdgpu-use-divergent-register-indexing -amdgpu-enable-flat-scratch -verify-machineinstrs < %s | FileCheck --check-prefixes=GCN,GFX9,GFX9_10,FLATSCR,GFX9-FLATSCR-PAL %s
 ; RUN: llc -march=amdgcn -mtriple=amdgcn--amdpal -mcpu=gfx1030 -mattr=-flat-for-global -amdgpu-use-divergent-register-indexing -amdgpu-enable-flat-scratch -verify-machineinstrs < %s | FileCheck --check-prefixes=GCN,GFX10_W32,GFX9_10,FLATSCR,GFX10-FLATSCR-PAL,GFX9_10-FLATSCR %s
 
-; RELS: R_AMDGPU_ABS32_LO SCRATCH_RSRC_DWORD0 0x0
-; RELS: R_AMDGPU_ABS32_LO SCRATCH_RSRC_DWORD1 0x0
+; RELS: R_AMDGPU_ABS32_LO SCRATCH_RSRC_DWORD0
+; RELS: R_AMDGPU_ABS32_LO SCRATCH_RSRC_DWORD1
 
 ; This used to fail due to a v_add_i32 instruction with an illegal immediate
 ; operand that was created during Local Stack Slot Allocation. Test case derived
 ; from https://bugs.freedesktop.org/show_bug.cgi?id=96602
 ;
 ; GCN-LABEL: {{^}}ps_main:
 
 ; GFX9-FLATSCR-DAG: s_add_u32 flat_scratch_lo, s0, s2

llvm/test/MC/AMDGPU/elf-lds.s

.Lfunc_end:
   ; No alignment or .globl directive, not mentioned anywhere
   .amdgpu_lds lds3, 16
 
   ; No alignment or .globl directive, size 0, but mentioned in .text
   .amdgpu_lds lds4, 0
 
 // CHECK:      Relocations [
 // CHECK:        Section (3) .rel.text {
-// CHECK-NEXT:     0x4 R_AMDGPU_ABS32 lds0 0x0
-// CHECK-NEXT:     0x1C R_AMDGPU_ABS32 lds4 0x0
+// CHECK-NEXT:     0x4 R_AMDGPU_ABS32 lds0
+// CHECK-NEXT:     0x1C R_AMDGPU_ABS32 lds4
 // CHECK-NEXT:   }
 // CHECK:      ]
 
 // CHECK:      Symbol {
 // CHECK:        Name: lds0 (54)
 // CHECK-NEXT:   Value: 0x10
 // CHECK-NEXT:   Size: 192
 // CHECK-NEXT:   Binding: Global (0x1)

llvm/test/MC/AMDGPU/reloc.s

 // RUN: llvm-mc -filetype=obj -triple amdgcn-- -mcpu=kaveri -show-encoding %s | llvm-readobj -relocations - | FileCheck %s
 
 // CHECK: Relocations [
 // CHECK: .rel.text {
-// CHECK: R_AMDGPU_ABS32_LO SCRATCH_RSRC_DWORD0 0x0
-// CHECK: R_AMDGPU_ABS32_LO SCRATCH_RSRC_DWORD1 0x0
-// CHECK: R_AMDGPU_GOTPCREL global_var0 0x0
-// CHECK: R_AMDGPU_GOTPCREL32_LO global_var1 0x0
-// CHECK: R_AMDGPU_GOTPCREL32_HI global_var2 0x0
-// CHECK: R_AMDGPU_REL32_LO global_var3 0x0
-// CHECK: R_AMDGPU_REL32_HI global_var4 0x0
-// CHECK: R_AMDGPU_ABS32 var 0x0
+// CHECK: R_AMDGPU_ABS32_LO SCRATCH_RSRC_DWORD0
+// CHECK: R_AMDGPU_ABS32_LO SCRATCH_RSRC_DWORD1
+// CHECK: R_AMDGPU_GOTPCREL global_var0
+// CHECK: R_AMDGPU_GOTPCREL32_LO global_var1
+// CHECK: R_AMDGPU_GOTPCREL32_HI global_var2
+// CHECK: R_AMDGPU_REL32_LO global_var3
+// CHECK: R_AMDGPU_REL32_HI global_var4
+// CHECK: R_AMDGPU_ABS32 var
 // CHECK: }
 // CHECK: .rel.data {
-// CHECK: R_AMDGPU_ABS64 temp 0x0
-// CHECK: R_AMDGPU_REL64 temp 0x0
+// CHECK: R_AMDGPU_ABS64 temp
+// CHECK: R_AMDGPU_REL64 temp
 // CHECK: }
 // CHECK: ]
 
 kernel:
   s_mov_b32 s0, SCRATCH_RSRC_DWORD0
   s_mov_b32 s1, SCRATCH_RSRC_DWORD1
   s_mov_b32 s2, global_var0@GOTPCREL
   s_mov_b32 s3, global_var1@gotpcrel32@lo

llvm/test/MC/ARM/arm-elf-relocations.s

 @ RUN: llvm-mc -triple armv7-eabi -filetype obj -o - %s | llvm-readobj -r - \
 @ RUN:     | FileCheck %s
 @ RUN: llvm-mc -triple thumbv7-eabi -filetype obj -o - %s | llvm-readobj -r - \
 @ RUN:     | FileCheck %s
 
   .syntax unified
 
   .section .text.r_arm_abs8
 
   .byte abs8_0 -128
   .byte abs8_1 +255
 
 @ CHECK: Section {{.*}} .rel.text.r_arm_abs8 {
-@ CHECK:   0x0 R_ARM_ABS8 abs8_0 0x0
-@ CHECK:   0x1 R_ARM_ABS8 abs8_1 0x0
+@ CHECK:   0x0 R_ARM_ABS8 abs8_0
+@ CHECK:   0x1 R_ARM_ABS8 abs8_1
 @ CHECK: }
 
   .section .text.r_arm_abs16
 
   .short abs16_0 -32768
   .short abs16_1 +65535
 
 @ CHECK: Section {{.*}} .rel.text.r_arm_abs16 {
-@ CHECK:   0x0 R_ARM_ABS16 abs16_0 0x0
-@ CHECK:   0x2 R_ARM_ABS16 abs16_1 0x0
+@ CHECK:   0x0 R_ARM_ABS16 abs16_0
+@ CHECK:   0x2 R_ARM_ABS16 abs16_1
 @ CHECK: }
 
   .section .text.r_arm_sbrel32
 
   .word target(sbrel)
   .word target(SBREL)
 
 @ CHECK: Section {{.*}} .rel.text.r_arm_sbrel32 {
-@ CHECK:   0x0 R_ARM_SBREL32 target 0x0
-@ CHECK:   0x4 R_ARM_SBREL32 target 0x0
+@ CHECK:   0x0 R_ARM_SBREL32 target
+@ CHECK:   0x4 R_ARM_SBREL32 target
 @ CHECK: }
 

llvm/test/MC/ARM/arm-elf-symver.s

defined3:
         .long undefined3
 
         .global global1
         .symver global1, g1@@zed
 global1:
 
 @ CHECK: Relocations [
 @ CHECK-NEXT:   Section {{.*}} .rel.text {
-@ CHECK-NEXT:     0x0 R_ARM_ABS32 .text 0x0
-@ CHECK-NEXT:     0x4 R_ARM_ABS32 bar2@zed 0x0
-@ CHECK-NEXT:     0x8 R_ARM_ABS32 .text 0x0
-@ CHECK-NEXT:     0xC R_ARM_ABS32 .text 0x0
-@ CHECK-NEXT:     0x10 R_ARM_ABS32 bar6@zed 0x0
+@ CHECK-NEXT:     0x0 R_ARM_ABS32 .text
+@ CHECK-NEXT:     0x4 R_ARM_ABS32 bar2@zed
+@ CHECK-NEXT:     0x8 R_ARM_ABS32 .text
+@ CHECK-NEXT:     0xC R_ARM_ABS32 .text
+@ CHECK-NEXT:     0x10 R_ARM_ABS32 bar6@zed
 @ CHECK-NEXT:   }
 @ CHECK-NEXT: ]
 
 @ CHECK:  Symbol {
 @ CHECK:    Name: bar1@zed
 @ CHECK-NEXT:     Value: 0x0
 @ CHECK-NEXT:     Size: 0
 @ CHECK-NEXT:     Binding: Local (0x0)

llvm/test/MC/ARM/arm-thumb-tail-call.ll

define internal i32 @thumb_fn() #2 {
   ret i32 %1
 }
 
 attributes #1 = { "target-features"="-thumb-mode" }
 attributes #2 = { "target-features"="+thumb-mode" }
 
 ; CHECK: Relocations [
 ; CHECK-NEXT: Section (3) .rel.text {
-; CHECK-NEXT: 0x0 R_ARM_JUMP24 thumb_fn 0x0
-; CHECK-NEXT: 0x4 R_ARM_THM_JUMP24 arm_fn 0x0
+; CHECK-NEXT: 0x0 R_ARM_JUMP24 thumb_fn
+; CHECK-NEXT: 0x4 R_ARM_THM_JUMP24 arm_fn
 ; CHECK-NEXT: }

llvm/test/MC/ARM/directive-tlsdescseq.s

 .tlsdescseq variable
   ldr r3, [r1, #4]
 .tlsdescseq variable
   blx r3
 2:
   .word variable(tlsdesc) + (. - 1b)
 
 @ CHECK: Relocations [
-@ CHECK:     0x4 R_ARM_TLS_DESCSEQ variable 0x0
-@ CHECK:     0x8 R_ARM_TLS_DESCSEQ variable 0x0
-@ CHECK:     0xC R_ARM_TLS_DESCSEQ variable 0x0
-@ CHECK:     0x10 R_ARM_TLS_GOTDESC variable 0x0
+@ CHECK:     0x4 R_ARM_TLS_DESCSEQ variable
+@ CHECK:     0x8 R_ARM_TLS_DESCSEQ variable
+@ CHECK:     0xC R_ARM_TLS_DESCSEQ variable
+@ CHECK:     0x10 R_ARM_TLS_GOTDESC variable
 @ CHECK: ]
 
 @ CHECK-ASM: ldr r1, [pc, #8]
 @ CHECK-ASM: .tlsdescseq variable
 @ CHECK-ASM-NEXT: add r2, pc, r1
 @ CHECK-ASM: .tlsdescseq variable
 @ CHECK-ASM-NEXT: ldr r3, [r1, #4]
 @ CHECK-ASM: .tlsdescseq variable
 @ CHECK-ASM-NEXT: blx r3
 

llvm/test/MC/ARM/eh-compact-pr0.s

 @-------------------------------------------------------------------------------
 @ The first word should be relocated to .TEST1 section.  Besides, on non-Android
 @ there is another relocation entry for __aeabi_unwind_cpp_pr0, so that the
 @ linker will keep __aeabi_unwind_cpp_pr0.
 @-------------------------------------------------------------------------------
 @ RELOC:        Section {
 @ RELOC:          Name: .rel.ARM.exidx.TEST1
 @ RELOC:          Relocations [
-@ RELOC-NOAND-NEXT: 0x0 R_ARM_NONE __aeabi_unwind_cpp_pr0 0x0
-@ RELOC-NEXT:       0x0 R_ARM_PREL31 .TEST1 0x0
+@ RELOC-NOAND-NEXT: 0x0 R_ARM_NONE __aeabi_unwind_cpp_pr0
+@ RELOC-NEXT:       0x0 R_ARM_PREL31 .TEST1
 @ RELOC-NEXT:     ]
 
 @-------------------------------------------------------------------------------
 @ Check .TEST2 section
 @-------------------------------------------------------------------------------
 @ CHECK:   Section {
 @ CHECK:     Name: .TEST2
 @ CHECK:     SectionData (

 @-------------------------------------------------------------------------------
 @ The first word should be relocated to .TEST2 section.  Besides, on non-Android
 @ there is another relocation entry for __aeabi_unwind_cpp_pr0, so that the
 @ linker will keep __aeabi_unwind_cpp_pr0.
 @-------------------------------------------------------------------------------
 @ RELOC:        Section {
 @ RELOC:          Name: .rel.ARM.exidx.TEST2
 @ RELOC:          Relocations [
-@ RELOC-NOAND-NEXT: 0x0 R_ARM_NONE __aeabi_unwind_cpp_pr0 0x0
-@ RELOC-NEXT:       0x0 R_ARM_PREL31 .TEST2 0x0
+@ RELOC-NOAND-NEXT: 0x0 R_ARM_NONE __aeabi_unwind_cpp_pr0
+@ RELOC-NEXT:       0x0 R_ARM_PREL31 .TEST2
 @ RELOC-NEXT:     ]

llvm/test/MC/ARM/eh-compact-pr1.s

 @ CHECK: ]
 @-------------------------------------------------------------------------------
 @ The first word should be relocated to .TEST1 section, and the second word
 @ should be relocated to .ARM.extab.TEST1 section.  Besides, there is
 @ another relocation entry for __aeabi_unwind_cpp_pr1, so that the linker
 @ will keep __aeabi_unwind_cpp_pr1.
 @-------------------------------------------------------------------------------
 @ CHECK:     Relocations [
-@ CHECK:       0x0 R_ARM_NONE __aeabi_unwind_cpp_pr1 0x0
-@ CHECK:       0x0 R_ARM_PREL31 .TEST1 0x0
-@ CHECK:       0x4 R_ARM_PREL31 .ARM.extab.TEST1 0x0
+@ CHECK:       0x0 R_ARM_NONE __aeabi_unwind_cpp_pr1
+@ CHECK:       0x0 R_ARM_PREL31 .TEST1
+@ CHECK:       0x4 R_ARM_PREL31 .ARM.extab.TEST1
 @ CHECK:     ]

llvm/test/MC/ARM/eh-directive-cantunwind.s

 @ The second word should be EXIDX_CANTUNWIND (01000000).
 @-------------------------------------------------------------------------------
 @ CHECK:     SectionData (
 @ CHECK:       0000: 00000000 01000000                    |........|
 @ CHECK:     )
 @ CHECK:   }
 @ CHECK: ]
 @ CHECK:     Relocations [
-@ CHECK:       0x0 R_ARM_PREL31 .text 0x0
+@ CHECK:       0x0 R_ARM_PREL31 .text
 @ CHECK:     ]

llvm/test/MC/ARM/eh-directive-handlerdata.s

 @ CHECK:}
 @-------------------------------------------------------------------------------
 @ We should see a relocation entry to __aeabi_unwind_cpp_pr0, so that the
 @ linker can keep __aeabi_unwind_cpp_pr0.
 @-------------------------------------------------------------------------------
 @ RELOC: Section {
 @ RELOC:  Name: .rel.ARM.exidx.TEST1
 @ RELOC:  Relocations [
-@ RELOC:    0x0 R_ARM_NONE __aeabi_unwind_cpp_pr0 0x0
-@ RELOC:    0x0 R_ARM_PREL31 .TEST1 0x0
-@ RELOC:    0x4 R_ARM_PREL31 .ARM.extab.TEST1 0x0
+@ RELOC:    0x0 R_ARM_NONE __aeabi_unwind_cpp_pr0
+@ RELOC:    0x0 R_ARM_PREL31 .TEST1
+@ RELOC:    0x4 R_ARM_PREL31 .ARM.extab.TEST1
 @ RELOC:  ]
 @ RELOC: }
 
 
 
 @-------------------------------------------------------------------------------
 @ TEST2
 @-------------------------------------------------------------------------------

 @ CHECK:}
 @-------------------------------------------------------------------------------
 @ We should see a relocation entry to __aeabi_unwind_cpp_pr0, so that the
 @ linker can keep __aeabi_unwind_cpp_pr0.
 @-------------------------------------------------------------------------------
 @ RELOC: Section {
 @ RELOC:  Name: .rel.ARM.exidx.TEST2
 @ RELOC:  Relocations [
-@ RELOC:    0x0 R_ARM_NONE __aeabi_unwind_cpp_pr1 0x0
-@ RELOC:    0x0 R_ARM_PREL31 .TEST2 0x0
-@ RELOC:    0x4 R_ARM_PREL31 .ARM.extab.TEST2 0x0
+@ RELOC:    0x0 R_ARM_NONE __aeabi_unwind_cpp_pr1
+@ RELOC:    0x0 R_ARM_PREL31 .TEST2
+@ RELOC:    0x4 R_ARM_PREL31 .ARM.extab.TEST2
 @ RELOC:  ]
 @ RELOC: }

llvm/test/MC/ARM/eh-directive-personality.s

 @ CHECK:   SectionData (
 @ CHECK:     0000: 00000000 B0B0B000                    |........|
 @ CHECK:   )
 @ CHECK: }
 
 @ RELOC: Section {
 @ RELOC:   Name: .rel.ARM.extab.TEST1
 @ RELOC:   Relocations [
-@ RELOC:     0x0 R_ARM_PREL31 __gxx_personality_v0 0x0
+@ RELOC:     0x0 R_ARM_PREL31 __gxx_personality_v0
 @ RELOC:   ]
 @ RELOC: }
 
 @ CHECK: Section {
 @ CHECK:   Name: .ARM.exidx.TEST1
 @ CHECK:   SectionData (
 @ CHECK:     0000: 00000000 00000000                    |........|
 @ CHECK:   )
 @ CHECK: }
 
 @ RELOC: Section {
 @ RELOC:   Name: .rel.ARM.exidx.TEST1
 @ RELOC:   Relocations [
-@ RELOC:     0x0 R_ARM_PREL31 .TEST1 0x0
-@ RELOC:     0x4 R_ARM_PREL31 .ARM.extab.TEST1 0x0
+@ RELOC:     0x0 R_ARM_PREL31 .TEST1
+@ RELOC:     0x4 R_ARM_PREL31 .ARM.extab.TEST1
 @ RELOC:   ]
 @ RELOC: }
 
 
 @-------------------------------------------------------------------------------
 @ TEST2
 @-------------------------------------------------------------------------------
   .section  .TEST2

 @ CHECK:   SectionData (
 @ CHECK:     0000: 00000000 B0B0B000                    |........|
 @ CHECK:   )
 @ CHECK: }
 
 @ RELOC: Section {
 @ RELOC:   Name: .rel.ARM.extab.TEST2
 @ RELOC:   Relocations [
-@ RELOC:     0x0 R_ARM_PREL31 __gxx_personality_v0 0x0
+@ RELOC:     0x0 R_ARM_PREL31 __gxx_personality_v0
 @ RELOC:   ]
 @ RELOC: }
 
 @ CHECK: Section {
 @ CHECK:   Name: .ARM.exidx.TEST2
 @ CHECK:   SectionData (
 @ CHECK:     0000: 00000000 00000000                    |........|
 @ CHECK:   )
 @ CHECK: }
 
 @ RELOC: Section {
 @ RELOC:   Name: .rel.ARM.exidx.TEST2
 @ RELOC:   Relocations [
-@ RELOC:     0x0 R_ARM_PREL31 .TEST2 0x0
-@ RELOC:     0x4 R_ARM_PREL31 .ARM.extab.TEST2 0x0
+@ RELOC:     0x0 R_ARM_PREL31 .TEST2
+@ RELOC:     0x4 R_ARM_PREL31 .ARM.extab.TEST2
 @ RELOC:   ]
 @ RELOC: }

llvm/test/MC/ARM/eh-directive-personalityindex.s

 @ CHECK:   SectionData (
 @ CHECK:     0000: 00000000 B0B0B080
 @ CHECK:   )
 @ CHECK: }
 
 @ RELOC: Section {
 @ RELOC:   Name: .rel.ARM.exidx.pr0
 @ RELOC:   Relocations [
-@ RELOC:     0x0 R_ARM_NONE __aeabi_unwind_cpp_pr0 0x0
-@ RELOC:     0x0 R_ARM_PREL31 .pr0 0x0
+@ RELOC:     0x0 R_ARM_NONE __aeabi_unwind_cpp_pr0
+@ RELOC:     0x0 R_ARM_PREL31 .pr0
 @ RELOC:   ]
 @ RELOC: }
 
   .section .pr0.nontrivial
 
   .global pr0_nontrivial
   .type pr0_nontrivial,%function
   .thumb_func

 @ CHECK:   SectionData (
 @ CHECK:     0000: 00000000 B0B00380
 @ CHECK:   )
 @ CHECK: }
 
 @ RELOC: Section {
 @ RELOC:   Name: .rel.ARM.exidx.pr0.nontrivial
 @ RELOC:   Relocations [
-@ RELOC:     0x0 R_ARM_NONE __aeabi_unwind_cpp_pr0 0x0
-@ RELOC:     0x0 R_ARM_PREL31 .pr0.nontrivial 0x0
+@ RELOC:     0x0 R_ARM_NONE __aeabi_unwind_cpp_pr0
+@ RELOC:     0x0 R_ARM_PREL31 .pr0.nontrivial
 @ RELOC:   ]
 @ RELOC: }
 
   .section .pr1
 
   .global pr1
   .type pr1,%function
   .thumb_func

 @ CHECK:   SectionData (
 @ CHECK:     0000: 00000000 00000000
 @ CHECK:   )
 @ CHECK: }
 
 @ RELOC: Section {
 @ RELOC:   Name: .rel.ARM.exidx.pr1
 @ RELOC:   Relocations [
-@ RELOC:     0x0 R_ARM_NONE __aeabi_unwind_cpp_pr1 0x0
-@ RELOC:     0x0 R_ARM_PREL31 .pr1 0x0
-@ RELOC:     0x4 R_ARM_PREL31 .ARM.extab.pr1 0x0
+@ RELOC:     0x0 R_ARM_NONE __aeabi_unwind_cpp_pr1
+@ RELOC:     0x0 R_ARM_PREL31 .pr1
+@ RELOC:     0x4 R_ARM_PREL31 .ARM.extab.pr1
 @ RELOC:   ]
 @ RELOC: }
 
   .section .pr1.nontrivial
 
   .global pr1_nontrivial
   .type pr1_nontrivial,%function
   .thumb_func

 @ CHECK:   SectionData (
 @ CHECK:     0000: 00000000 00000000
 @ CHECK:   )
 @ CHECK: }
 
 @ RELOC: Section {
 @ RELOC:   Name: .rel.ARM.exidx.pr1.nontrivial
 @ RELOC:   Relocations [
-@ RELOC:     0x0 R_ARM_NONE __aeabi_unwind_cpp_pr1 0x0
-@ RELOC:     0x0 R_ARM_PREL31 .pr1.nontrivial 0x0
-@ RELOC:     0x4 R_ARM_PREL31 .ARM.extab.pr1.nontrivial 0x0
+@ RELOC:     0x0 R_ARM_NONE __aeabi_unwind_cpp_pr1
+@ RELOC:     0x0 R_ARM_PREL31 .pr1.nontrivial
+@ RELOC:     0x4 R_ARM_PREL31 .ARM.extab.pr1.nontrivial
 @ RELOC:   ]
 @ RELOC: }
 
   .section .pr2
 
   .global pr2
   .type pr2,%function
   .thumb_func

 @ CHECK:   SectionData (
 @ CHECK:     0000: 00000000 00000000
 @ CHECK:   )
 @ CHECK: }
 
 @ RELOC: Section {
 @ RELOC:   Name: .rel.ARM.exidx.pr2
 @ RELOC:   Relocations [
-@ RELOC:     0x0 R_ARM_NONE __aeabi_unwind_cpp_pr2 0x0
-@ RELOC:     0x0 R_ARM_PREL31 .pr2 0x0
-@ RELOC:     0x4 R_ARM_PREL31 .ARM.extab.pr2 0x0
+@ RELOC:     0x0 R_ARM_NONE __aeabi_unwind_cpp_pr2
+@ RELOC:     0x0 R_ARM_PREL31 .pr2
+@ RELOC:     0x4 R_ARM_PREL31 .ARM.extab.pr2
 @ RELOC:   ]
 @ RELOC: }
 
   .section .pr2.nontrivial
   .type pr2_nontrivial,%function
   .thumb_func
 pr2_nontrivial:
   .fnstart

 @ CHECK:   SectionData (
 @ CHECK:     0000: 00000000 00000000
 @ CHECK:   )
 @ CHECK: }
 
 @ RELOC: Section {
 @ RELOC:   Name: .rel.ARM.exidx.pr2.nontrivial
 @ RELOC:   Relocations [
-@ RELOC:     0x0 R_ARM_NONE __aeabi_unwind_cpp_pr2 0x0
-@ RELOC:     0x0 R_ARM_PREL31 .pr2.nontrivial 0x0
-@ RELOC:     0x4 R_ARM_PREL31 .ARM.extab.pr2.nontrivial 0x0
+@ RELOC:     0x0 R_ARM_NONE __aeabi_unwind_cpp_pr2
+@ RELOC:     0x0 R_ARM_PREL31 .pr2.nontrivial
+@ RELOC:     0x4 R_ARM_PREL31 .ARM.extab.pr2.nontrivial
 @ RELOC:   ]
 @ RELOC: }

llvm/test/MC/ARM/eh-directive-section-multiple-func.s

 @ CHECK:     SectionData (
 @ CHECK:       0000: 00000000 B0B0B000 00000000 B0B0B000  |................|
 @ CHECK:     )
 @ CHECK:   }
 
 @ RELOC:   Section {
 @ RELOC:     Name: .rel.ARM.extab.TEST1
 @ RELOC:     Relocations [
-@ RELOC:       0x0 R_ARM_PREL31 __gxx_personality_v0 0x0
-@ RELOC:       0x8 R_ARM_PREL31 __gxx_personality_v0 0x0
+@ RELOC:       0x0 R_ARM_PREL31 __gxx_personality_v0
+@ RELOC:       0x8 R_ARM_PREL31 __gxx_personality_v0
 @ RELOC:     ]
 @ RELOC:   }
 
 
 @-------------------------------------------------------------------------------
 @ Check the .ARM.exidx.TEST1 section.
 @-------------------------------------------------------------------------------
 @ CHECK:   Section {

 @ The first word of each entry should be relocated to .TEST1 section.
 @ The second word of each entry should be relocated to
 @ .ARM.extab.TESET1 section.
 @-------------------------------------------------------------------------------
 
 @ RELOC:   Section {
 @ RELOC:     Name: .rel.ARM.exidx.TEST1
 @ RELOC:     Relocations [
-@ RELOC:       0x0 R_ARM_PREL31 .TEST1 0x0
-@ RELOC:       0x4 R_ARM_PREL31 .ARM.extab.TEST1 0x0
-@ RELOC:       0x8 R_ARM_PREL31 .TEST1 0x0
-@ RELOC:       0xC R_ARM_PREL31 .ARM.extab.TEST1 0x0
+@ RELOC:       0x0 R_ARM_PREL31 .TEST1
+@ RELOC:       0x4 R_ARM_PREL31 .ARM.extab.TEST1
+@ RELOC:       0x8 R_ARM_PREL31 .TEST1
+@ RELOC:       0xC R_ARM_PREL31 .ARM.extab.TEST1
 @ RELOC:     ]
 @ RELOC:   }
 
 
 @-------------------------------------------------------------------------------
 @ Check the symbols "func1" and "func2".  They should belong to .TEST1 section.
 @-------------------------------------------------------------------------------
 @ CHECK: Symbols [

llvm/test/MC/ARM/eh-directive-section.s

 @ CHECK:     SectionData (
 @ CHECK:       0000: 00000000 B0B0B000                    |........|
 @ CHECK:     )
 @ CHECK:   }
 
 @ RELOC:   Section {
 @ RELOC:     Name: .rel.ARM.extab.TEST1
 @ RELOC:     Relocations [
-@ RELOC:       0x0 R_ARM_PREL31 __gxx_personality_v0 0x0
+@ RELOC:       0x0 R_ARM_PREL31 __gxx_personality_v0
 @ RELOC:     ]
 @ RELOC:   }
 
 
 @-------------------------------------------------------------------------------
 @ Check the.ARM.exidx.TEST1 section, the EXIDX of .TEST1 section.
 @-------------------------------------------------------------------------------
 @ CHECK:   Section {

 @ CHECK:     SectionData (
 @ CHECK:       0000: 00000000 00000000                    |........|
 @ CHECK:     )
 @ CHECK:   }
 
 @ RELOC:   Section {
 @ RELOC:     Name: .rel.ARM.exidx.TEST1
 @ RELOC:     Relocations [
-@ RELOC:       0x0 R_ARM_PREL31 .TEST1 0x0
-@ RELOC:       0x4 R_ARM_PREL31 .ARM.extab.TEST1 0x0
+@ RELOC:       0x0 R_ARM_PREL31 .TEST1
+@ RELOC:       0x4 R_ARM_PREL31 .ARM.extab.TEST1
 @ RELOC:     ]
 @ RELOC:   }
 
 
 @-------------------------------------------------------------------------------
 @ Check the TEST2 section (without the dot in the beginning)
 @-------------------------------------------------------------------------------
 @ CHECK:   Section {

 @ CHECK:     SectionData (
 @ CHECK:       0000: 00000000 B0B0B000                    |........|
 @ CHECK:     )
 @ CHECK:   }
 
 @ RELOC:   Section {
 @ RELOC:     Name: .rel.ARM.extabTEST2
 @ RELOC:     Relocations [
-@ RELOC:       0x0 R_ARM_PREL31 __gxx_personality_v0 0x0
+@ RELOC:       0x0 R_ARM_PREL31 __gxx_personality_v0
 @ RELOC:     ]
 @ RELOC:   }
 
 
 @-------------------------------------------------------------------------------
 @ Check the .ARM.exidxTEST2 section, the EXIDX of TEST2 section.
 @-------------------------------------------------------------------------------
 @ CHECK:   Section {

 @ CHECK:     SectionData (
 @ CHECK:       0000: 00000000 00000000                    |........|
 @ CHECK:     )
 @ CHECK:   }
 
 @ RELOC:   Section {
 @ RELOC:     Name: .rel.ARM.exidxTEST2
 @ RELOC:     Relocations [
-@ RELOC:       0x0 R_ARM_PREL31 TEST2 0x0
-@ RELOC:       0x4 R_ARM_PREL31 .ARM.extabTEST2 0x0
+@ RELOC:       0x0 R_ARM_PREL31 TEST2
+@ RELOC:       0x4 R_ARM_PREL31 .ARM.extabTEST2
 @ RELOC:     ]
 @ RELOC:   }
 
 
 
 @-------------------------------------------------------------------------------
 @ Check the symbols and the sections they belong to
 @-------------------------------------------------------------------------------

llvm/test/MC/ARM/eh-directive-text-section-multiple-func.s

 @ CHECK:     )
 @ CHECK:   }
 @ CHECK: ]
 
 @-------------------------------------------------------------------------------
 @ The first word of each entry should be relocated to .text section.
 @-------------------------------------------------------------------------------
 @ CHECK:     Relocations [
-@ CHECK:       0x0 R_ARM_PREL31 .text 0x0
-@ CHECK:       0x0 R_ARM_NONE __aeabi_unwind_cpp_pr0 0x0
-@ CHECK:       0x8 R_ARM_PREL31 .text 0x0
+@ CHECK:       0x0 R_ARM_PREL31 .text
+@ CHECK:       0x0 R_ARM_NONE __aeabi_unwind_cpp_pr0
+@ CHECK:       0x8 R_ARM_PREL31 .text
 @ CHECK:     ]
 
 
 @-------------------------------------------------------------------------------
 @ Check the symbols "func1" and "func2".  They should belong to .text section.
 @-------------------------------------------------------------------------------
 @ CHECK: Symbols [
 @ CHECK:   Symbol {
 @ CHECK:     Name: func1
 @ CHECK:     Section: .text
 @ CHECK:   }
 @ CHECK:   Symbol {
 @ CHECK:     Name: func2
 @ CHECK:     Section: .text
 @ CHECK:   }
 @ CHECK: ]

llvm/test/MC/ARM/eh-directive-text-section.s

 @ CHECK: ]
 
 @-------------------------------------------------------------------------------
 @ The first word should be relocated to the code address in .text section.
 @ Besides, since this function is using compact model 0, thus we have to
 @ add an relocation to __aeabi_unwind_cpp_pr0.
 @-------------------------------------------------------------------------------
 @ CHECK:     Relocations [
-@ CHECK:       0x0 R_ARM_NONE __aeabi_unwind_cpp_pr0 0x0
-@ CHECK:       0x0 R_ARM_PREL31 .text 0x0
+@ CHECK:       0x0 R_ARM_NONE __aeabi_unwind_cpp_pr0
+@ CHECK:       0x0 R_ARM_PREL31 .text
 @ CHECK:     ]

llvm/test/MC/ARM/elf-reloc-condcall.s

 // RUN: llvm-mc -triple=armv7-linux-gnueabi -filetype=obj %s -o - | \
 // RUN:   llvm-readobj -r - | FileCheck -check-prefix=OBJ %s
 
         bleq some_label
         bl some_label
         blx some_label
         beq some_label
         b some_label
 
 // OBJ:      Relocations [
 // OBJ-NEXT:   Section {{.*}} .rel.text {
-// OBJ-NEXT:     0x0  R_ARM_JUMP24 some_label 0x0
-// OBJ-NEXT:     0x4  R_ARM_CALL   some_label 0x0
-// OBJ-NEXT:     0x8  R_ARM_CALL   some_label 0x0
-// OBJ-NEXT:     0xC  R_ARM_JUMP24 some_label 0x0
-// OBJ-NEXT:     0x10 R_ARM_JUMP24 some_label 0x0
+// OBJ-NEXT:     0x0  R_ARM_JUMP24 some_label
+// OBJ-NEXT:     0x4  R_ARM_CALL   some_label
+// OBJ-NEXT:     0x8  R_ARM_CALL   some_label
+// OBJ-NEXT:     0xC  R_ARM_JUMP24 some_label
+// OBJ-NEXT:     0x10 R_ARM_JUMP24 some_label
 // OBJ-NEXT:   }
 // OBJ-NEXT: ]

llvm/test/MC/ARM/elf-thumbfunc-reloc.s

f:
   .section  .data.rel.local,"aw",%progbits
 ptr:
   .long f
 
 
 @@ make sure an R_ARM_THM_CALL relocation is generated for the call to g
 @CHECK:      Relocations [
 @CHECK-NEXT:   Section {{.*}} .rel.text {
-@CHECK-NEXT:     0x4 R_ARM_THM_CALL g 0x0
+@CHECK-NEXT:     0x4 R_ARM_THM_CALL g
 @CHECK-NEXT:   }
 
 
 @@ make sure the relocation is with f. That is one way to make sure it includes
 @@ the thumb bit.
 @CHECK-NEXT:   Section ({{.*}}) .rel.data.rel.local {
-@CHECK-NEXT:     0x0 R_ARM_ABS32 f 0x0
+@CHECK-NEXT:     0x0 R_ARM_ABS32 f
 @CHECK-NEXT:   }
 @CHECK-NEXT: ]

llvm/test/MC/ARM/elf-thumbfunc-reloc2.s

 // CHECK: Sections [
 // CHECK:   SectionData (
 // CHECK:     0000: 704780B5 FFF7FEFF 80BD
 // CHECK:   )
 // CHECK: ]
 
 // CHECK:      Relocations [
 // CHECK-NEXT:   Section {{.*}} .rel.text {
-// CHECK-NEXT:     0x4 R_ARM_THM_CALL foo 0x0
+// CHECK-NEXT:     0x4 R_ARM_THM_CALL foo
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Section {{.*}} .rel.ARM.exidx {
-// CHECK-NEXT:     0x0 R_ARM_PREL31 .text 0x0
-// CHECK-NEXT:     0x8 R_ARM_PREL31 .text 0x0
+// CHECK-NEXT:     0x0 R_ARM_PREL31 .text
+// CHECK-NEXT:     0x8 R_ARM_PREL31 .text
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
 
 // make sure foo is thumb function: bit 0 = 1
 // CHECK:      Symbols [
 // CHECK:        Symbol {
 // CHECK:          Name: foo
 // CHECK-NEXT:     Value: 0x1

llvm/test/MC/ARM/mixed-arm-thumb-bl-fixup.ll

end:
   br label %end
   ret void
 }
 
 attributes #0 = { "target-features"="+thumb-mode" }
 attributes #1 = { "target-features"="-thumb-mode" }
 
 ; LINUX: Section (3) .rel.text {
-; LINUX-NEXT: 0x2 R_ARM_THM_CALL internal_arm_fn 0x0
-; LINUX-NEXT: 0x6 R_ARM_THM_CALL global_arm_fn 0x0
-; LINUX-NEXT: 0xE R_ARM_THM_CALL global_thumb_fn 0x0
-; LINUX-NEXT: 0x1C R_ARM_CALL internal_arm_fn 0x0
-; LINUX-NEXT: 0x20 R_ARM_CALL global_arm_fn 0x0
-; LINUX-NEXT: 0x24 R_ARM_CALL internal_thumb_fn 0x0
-; LINUX-NEXT: 0x28 R_ARM_CALL global_thumb_fn 0x0
+; LINUX-NEXT: 0x2 R_ARM_THM_CALL internal_arm_fn
+; LINUX-NEXT: 0x6 R_ARM_THM_CALL global_arm_fn
+; LINUX-NEXT: 0xE R_ARM_THM_CALL global_thumb_fn
+; LINUX-NEXT: 0x1C R_ARM_CALL internal_arm_fn
+; LINUX-NEXT: 0x20 R_ARM_CALL global_arm_fn
+; LINUX-NEXT: 0x24 R_ARM_CALL internal_thumb_fn
+; LINUX-NEXT: 0x28 R_ARM_CALL global_thumb_fn
 ; LINUX-NEXT: }
 
 ; IOS:   Section __text {
 ; IOS-NEXT: 0x2C 1 2 1 ARM_RELOC_BR24 0 _global_thumb_fn
 ; IOS-NEXT: 0x28 1 2 1 ARM_RELOC_BR24 0 _internal_thumb_fn
 ; IOS-NEXT: 0x24 1 2 1 ARM_RELOC_BR24 0 _global_arm_fn
 ; IOS-NEXT: 0x20 1 2 1 ARM_RELOC_BR24 0 _internal_arm_fn
 ; IOS-NEXT: 0x10 1 2 0 ARM_THUMB_RELOC_BR22 0 __text
 ; IOS-NEXT: 0xC 1 2 0 ARM_THUMB_RELOC_BR22 0 __text
 ; IOS-NEXT: 0x8 1 2 0 ARM_THUMB_RELOC_BR22 0 __text
 ; IOS-NEXT: 0x4 1 2 0 ARM_THUMB_RELOC_BR22 0 __text
 ; IOS-NEXT: }

llvm/test/MC/ARM/reloc-directive.s

 # PRINT: .reloc 4, R_ARM_NONE, foo+4
 # PRINT: .reloc 0, R_ARM_NONE, 8
 # PRINT: .reloc 0, R_ARM_ALU_PC_G0, .data+2
 # PRINT: .reloc 0, R_ARM_LDR_PC_G0, foo+3
 # PRINT: .reloc 0, R_ARM_THM_ALU_PREL_11_0, 5
 
 # ARM relocations use the Elf32_Rel format. Addends are neither stored in the
 # relocation entries nor applied in the referenced locations.
-# CHECK:      0x8 R_ARM_NONE .data 0x0
-# CHECK-NEXT: 0x4 R_ARM_NONE foo 0x0
-# CHECK-NEXT: 0x0 R_ARM_NONE - 0x0
-# CHECK-NEXT: 0x0 R_ARM_ALU_PC_G0 .data 0x0
-# CHECK-NEXT: 0x0 R_ARM_LDR_PC_G0 foo 0x0
-# CHECK-NEXT: 0x0 R_ARM_THM_ALU_PREL_11_0 - 0x0
+# CHECK:      0x8 R_ARM_NONE .data
+# CHECK-NEXT: 0x4 R_ARM_NONE foo
+# CHECK-NEXT: 0x0 R_ARM_NONE -
+# CHECK-NEXT: 0x0 R_ARM_ALU_PC_G0 .data
+# CHECK-NEXT: 0x0 R_ARM_LDR_PC_G0 foo
+# CHECK-NEXT: 0x0 R_ARM_THM_ALU_PREL_11_0 -
 
 # HEX: 0x00000000 00000000 00000000

llvm/test/MC/ARM/target-expressions.s

 @ CHECK:  movw r1, :lower16:external
 @ CHECK:  movt r1, :upper16:external
 @ CHECK:   movw r2, :lower16:(32)
 @ CHECK:   movt r2, :upper16:(32)
 @ CHECK:   movw r3, :lower16:(32)
 @ CHECK:   movt r3, :upper16:(32)
 
 @ CHECK-RELOCATIONS: Relocations [
-@ CHECK-RELOCATIONS:   0x4 R_ARM_MOVW_ABS_NC function 0x0
-@ CHECK-RELOCATIONS:   0x8 R_ARM_MOVT_ABS function 0x0
-@ CHECK-RELOCATIONS:   0xC R_ARM_MOVW_ABS_NC function 0x0
-@ CHECK-RELOCATIONS:   0x10 R_ARM_MOVT_ABS function 0x0
-@ CHECK-RELOCATIONS:   0x34 R_ARM_MOVW_ABS_NC external 0x0
-@ CHECK-RELOCATIONS:   0x38 R_ARM_MOVT_ABS external 0x0
-@ CHECK-RELOCATIONS:   0x3C R_ARM_MOVW_ABS_NC external 0x0
-@ CHECK-RELOCATIONS:   0x40 R_ARM_MOVT_ABS external 0x0
+@ CHECK-RELOCATIONS:   0x4 R_ARM_MOVW_ABS_NC function
+@ CHECK-RELOCATIONS:   0x8 R_ARM_MOVT_ABS function
+@ CHECK-RELOCATIONS:   0xC R_ARM_MOVW_ABS_NC function
+@ CHECK-RELOCATIONS:   0x10 R_ARM_MOVT_ABS function
+@ CHECK-RELOCATIONS:   0x34 R_ARM_MOVW_ABS_NC external
+@ CHECK-RELOCATIONS:   0x38 R_ARM_MOVT_ABS external
+@ CHECK-RELOCATIONS:   0x3C R_ARM_MOVW_ABS_NC external
+@ CHECK-RELOCATIONS:   0x40 R_ARM_MOVT_ABS external
 @ CHECK-RELOCATIONS: ]
 

llvm/test/MC/ARM/thumb-far-jump.s

end:
   .text
   .align  2
   .globl  main2
   .type main2,%function
   .thumb_func
 main2:
   bx  lr
 
-@ CHECK-NOT: 0x0 R_ARM_THM_CALL end 0x0
-@ CHECK: 0x2004 R_ARM_THM_CALL main2 0x0
+@ CHECK-NOT: 0x0 R_ARM_THM_CALL end
+@ CHECK: 0x2004 R_ARM_THM_CALL main2
 No newline at end of file

llvm/test/MC/ARM/thumb-movwt-reloc.s

test:
   movw r0, :lower16:function
   movt r0, :upper16:function
 
 @ CHECK-LABEL: test:
 @ CHECK:  movw r0, :lower16:function
 @ CHECK:  movt r0, :upper16:function
 
 @ CHECK-RELOCATIONS: Relocations [
-@ CHECK-RELOCATIONS:   0x2 R_ARM_THM_MOVW_ABS_NC function 0x0
-@ CHECK-RELOCATIONS:   0x6 R_ARM_THM_MOVT_ABS function 0x0
+@ CHECK-RELOCATIONS:   0x2 R_ARM_THM_MOVW_ABS_NC function
+@ CHECK-RELOCATIONS:   0x6 R_ARM_THM_MOVT_ABS function
 @ CHECK-RELOCATIONS: ]
 

llvm/test/MC/ARM/thumb1-branch-reloc.s

@CHECK: }
         .section .text.insection
 .globl global
 local:
 global:
         b local
         b global
 
 @CHECK:      Section {{.*}} .rel.text.insection {
-@CHECK-NEXT:   0x2 R_ARM_THM_JUMP11 global 0x0
+@CHECK-NEXT:   0x2 R_ARM_THM_JUMP11 global
 @CHECK-NEXT: }

llvm/test/MC/ARM/thumb2-beq-fixup.s

internal_thumb_fn:
   .globl  global_thumb_fn
   .type  global_thumb_fn,%function
   .code  16
   .thumb_func
 global_thumb_fn:
   bx  lr
 
 @ CHECK: Section (3) .rel.text
-@ CHECK-NEXT: 0x0 R_ARM_THM_JUMP19 internal_arm_fn 0x0
-@ CHECK-NEXT: 0x4 R_ARM_THM_JUMP19 global_arm_fn 0x0
-@ CHECK-NEXT: 0x8 R_ARM_THM_JUMP19 global_thumb_fn 0x0
+@ CHECK-NEXT: 0x0 R_ARM_THM_JUMP19 internal_arm_fn
+@ CHECK-NEXT: 0x4 R_ARM_THM_JUMP19 global_arm_fn
+@ CHECK-NEXT: 0x8 R_ARM_THM_JUMP19 global_thumb_fn
 @ CHECK-NEXT: }

llvm/test/MC/ELF/discriminator.s

.L.debug_abbrev_begin:
         .byte   0                       # EOM(1)
         .byte   0                       # EOM(2)
         .byte   0                       # EOM(3)
 .L.debug_abbrev_end:
 
 
 # CHECK:      Relocations [
 # CHECK:        Section ({{[^ ]+}}) .rel.debug_line {
-# CHECK-NEXT:     0x2E R_386_32 .text 0x0
+# CHECK-NEXT:     0x2E R_386_32 .text
 # CHECK-NEXT:   }
 
 # DWARF-DUMP: Address            Line   Column File   ISA Discriminator Flags
 # DWARF-DUMP: ------------------ ------ ------ ------ --- ------------- -------------
 # DWARF-DUMP: 0x0000000000000000     2      0      1   0             1  is_stmt

llvm/test/MC/ELF/gen-dwarf.s

// 2. the debug_aranges has relocations to text and debug_line.
     .type foo, @function
     .align 4
 foo:
     ret
     .size foo, .-foo
 
 // CHECK:      Relocations [
 // CHECK:        Section ({{[^ ]+}}) .rel.debug_info {
-// CHECK-NEXT:     0x6 R_386_32 .debug_abbrev 0x0
-// CHECK-NEXT:     0xC R_386_32 .debug_line 0x0
+// CHECK-NEXT:     0x6 R_386_32 .debug_abbrev
+// CHECK-NEXT:     0xC R_386_32 .debug_line
 // CHECK:        }
 // CHECK-NEXT:   Section ({{[^ ]+}}) .rel.debug_aranges {
-// CHECK-NEXT:     0x6 R_386_32 .debug_info 0x0
-// CHECK-NEXT:     0x10 R_386_32 .text 0x0
+// CHECK-NEXT:     0x6 R_386_32 .debug_info
+// CHECK-NEXT:     0x10 R_386_32 .text
 // CHECK-NEXT:   }
 // CHECK:      ]
 
 // First instance of the section is just to give it a label for debug_aranges to refer to
 // ASM: .section .debug_info
 
 // ASM: .section .debug_abbrev
 // ASM-NEXT: [[ABBREV_LABEL:.Ltmp[0-9]+]]

llvm/test/MC/ELF/relocation-386.s

 // RUN: llvm-mc -filetype=obj -triple i386-pc-linux-gnu %s -relax-relocations=false -o - | llvm-readobj -r  - | FileCheck  %s --check-prefix=CHECK --check-prefix=I386
 // RUN: llvm-mc -filetype=obj -triple i386-pc-elfiamcu %s -relax-relocations=false  -o - | llvm-readobj -r  - | FileCheck  %s --check-prefix=CHECK --check-prefix=IAMCU
 
 // Test that we produce the correct relocation types and that the relocations
 // correctly point to the section or the symbol.
 
 // IAMCU: Format: elf32-iamcu
 // I386: Format: elf32-i386
 // CHECK:      Relocations [
 // CHECK-NEXT:   Section {{.*}} .rel.text {
-// CHECK-NEXT:     0x2          R_386_GOTOFF     .Lfoo 0x0
-// CHECK-NEXT:     0x{{[^ ]+}}  R_386_PLT32      bar2 0x0
-// CHECK-NEXT:     0x{{[^ ]+}}  R_386_GOTPC      _GLOBAL_OFFSET_TABLE_ 0x0
+// CHECK-NEXT:     0x2          R_386_GOTOFF     .Lfoo
+// CHECK-NEXT:     0x{{[^ ]+}}  R_386_PLT32      bar2
+// CHECK-NEXT:     0x{{[^ ]+}}  R_386_GOTPC      _GLOBAL_OFFSET_TABLE_
 // Relocation 3 (bar3@GOTOFF) is done with symbol 7 (bss)
-// CHECK-NEXT:     0x{{[^ ]+}}  R_386_GOTOFF     .bss 0x0
+// CHECK-NEXT:     0x{{[^ ]+}}  R_386_GOTOFF     .bss
 // Relocation 4 (bar2@GOT) is of type R_386_GOT32
-// CHECK-NEXT:     0x{{[^ ]+}}  R_386_GOT32      bar2j 0x0
+// CHECK-NEXT:     0x{{[^ ]+}}  R_386_GOT32      bar2j
 
 // Relocation 5 (foo@TLSGD) is of type R_386_TLS_GD
-// CHECK-NEXT:     0x20         R_386_TLS_GD     foo 0x0
+// CHECK-NEXT:     0x20         R_386_TLS_GD     foo
 // Relocation 6 ($foo@TPOFF) is of type R_386_TLS_LE_32
-// CHECK-NEXT:     0x25         R_386_TLS_LE_32  foo 0x0
+// CHECK-NEXT:     0x25         R_386_TLS_LE_32  foo
 // Relocation 7 (foo@INDNTPOFF) is of type R_386_TLS_IE
-// CHECK-NEXT:     0x2B         R_386_TLS_IE     foo 0x0
+// CHECK-NEXT:     0x2B         R_386_TLS_IE     foo
 // Relocation 8 (foo@NTPOFF) is of type R_386_TLS_LE
-// CHECK-NEXT:     0x31         R_386_TLS_LE     foo 0x0
+// CHECK-NEXT:     0x31         R_386_TLS_LE     foo
 // Relocation 9 (foo@GOTNTPOFF) is of type R_386_TLS_GOTIE
-// CHECK-NEXT:     0x37         R_386_TLS_GOTIE  foo 0x0
+// CHECK-NEXT:     0x37         R_386_TLS_GOTIE  foo
 // Relocation 10 (foo@TLSLDM) is of type R_386_TLS_LDM
-// CHECK-NEXT:     0x3D         R_386_TLS_LDM    foo 0x0
+// CHECK-NEXT:     0x3D         R_386_TLS_LDM    foo
 // Relocation 11 (foo@DTPOFF) is of type R_386_TLS_LDO_32
-// CHECK-NEXT:     0x43         R_386_TLS_LDO_32 foo 0x0
+// CHECK-NEXT:     0x43         R_386_TLS_LDO_32 foo
 // Relocation 12 (calll 4096) is of type R_386_PC32
-// CHECK-NEXT:     0x48         R_386_PC32       - 0x0
+// CHECK-NEXT:     0x48         R_386_PC32       -
 // Relocation 13 (zed@GOT) is of type R_386_GOT32 and uses the symbol
-// CHECK-NEXT:     0x4E         R_386_GOT32      zed 0x0
+// CHECK-NEXT:     0x4E         R_386_GOT32      zed
 // Relocation 14 (zed@GOTOFF) is of type R_386_GOTOFF and uses the symbol
-// CHECK-NEXT:     0x54         R_386_GOTOFF     zed 0x0
+// CHECK-NEXT:     0x54         R_386_GOTOFF     zed
 // Relocation 15 (zed@INDNTPOFF) is of type R_386_TLS_IE and uses the symbol
-// CHECK-NEXT:     0x5A         R_386_TLS_IE     zed 0x0
+// CHECK-NEXT:     0x5A         R_386_TLS_IE     zed
 // Relocation 16 (zed@NTPOFF) is of type R_386_TLS_LE and uses the symbol
-// CHECK-NEXT:     0x60         R_386_TLS_LE     zed 0x0
+// CHECK-NEXT:     0x60         R_386_TLS_LE     zed
 // Relocation 17 (zed@GOTNTPOFF) is of type R_386_TLS_GOTIE and uses the symbol
-// CHECK-NEXT:     0x66         R_386_TLS_GOTIE  zed 0x0
+// CHECK-NEXT:     0x66         R_386_TLS_GOTIE  zed
 // Relocation 18 (zed@PLT) is of type R_386_PLT32 and uses the symbol
-// CHECK-NEXT:     0x6B         R_386_PLT32      zed 0x0
+// CHECK-NEXT:     0x6B         R_386_PLT32      zed
 // Relocation 19 (zed@TLSGD) is of type R_386_TLS_GD and uses the symbol
-// CHECK-NEXT:     0x71         R_386_TLS_GD     zed 0x0
+// CHECK-NEXT:     0x71         R_386_TLS_GD     zed
 // Relocation 20 (zed@TLSLDM) is of type R_386_TLS_LDM and uses the symbol
-// CHECK-NEXT:     0x77         R_386_TLS_LDM    zed 0x0
+// CHECK-NEXT:     0x77         R_386_TLS_LDM    zed
 // Relocation 21 (zed@TPOFF) is of type R_386_TLS_LE_32 and uses the symbol
-// CHECK-NEXT:     0x7D         R_386_TLS_LE_32  zed 0x0
+// CHECK-NEXT:     0x7D         R_386_TLS_LE_32  zed
 // Relocation 22 (zed@DTPOFF) is of type R_386_TLS_LDO_32 and uses the symbol
-// CHECK-NEXT:     0x83         R_386_TLS_LDO_32 zed 0x0
+// CHECK-NEXT:     0x83         R_386_TLS_LDO_32 zed
 // Relocation 23 ($bar) is of type R_386_32 and uses the section
-// CHECK-NEXT:     0x{{[^ ]+}}  R_386_32         .text 0x0
+// CHECK-NEXT:     0x{{[^ ]+}}  R_386_32         .text
 // Relocation 24 (foo@GOTTPOFF(%edx)) is of type R_386_TLS_IE_32 and uses the
 // symbol
-// CHECK-NEXT:     0x8E         R_386_TLS_IE_32  foo 0x0
+// CHECK-NEXT:     0x8E         R_386_TLS_IE_32  foo
 // Relocation 25 (_GLOBAL_OFFSET_TABLE_-bar2) is of type R_386_GOTPC.
-// CHECK-NEXT:     0x94         R_386_GOTPC      _GLOBAL_OFFSET_TABLE_ 0x0
+// CHECK-NEXT:     0x94         R_386_GOTPC      _GLOBAL_OFFSET_TABLE_
 // Relocation 26 (und_symbol-bar2) is of type R_386_PC32
-// CHECK-NEXT:     0x9A         R_386_PC32       und_symbol 0x0
+// CHECK-NEXT:     0x9A         R_386_PC32       und_symbol
 // Relocation 27 (und_symbol-bar2) is of type R_386_PC16
-// CHECK-NEXT:     0x9E         R_386_PC16       und_symbol 0x0
+// CHECK-NEXT:     0x9E         R_386_PC16       und_symbol
 // Relocation 28 (und_symbol-bar2) is of type R_386_PC8
-// CHECK-NEXT:     0xA0         R_386_PC8        und_symbol 0x0
-// CHECK-NEXT:     0xA3         R_386_GOTOFF     und_symbol 0x0
+// CHECK-NEXT:     0xA0         R_386_PC8        und_symbol
+// CHECK-NEXT:     0xA3         R_386_GOTOFF     und_symbol
 // Relocation 29 (zed@PLT) is of type R_386_PLT32 and uses the symbol
-// CHECK-NEXT:     0xA9         R_386_PLT32      zed 0x0
-// CHECK-NEXT:     0xAF         R_386_PC32       tr_start 0x0
-// CHECK-NEXT:     0xB3         R_386_16         foo      0x0
-// CHECK-NEXT:     0xB5         R_386_8          foo      0x0
+// CHECK-NEXT:     0xA9         R_386_PLT32      zed
+// CHECK-NEXT:     0xAF         R_386_PC32       tr_start
+// CHECK-NEXT:     0xB3         R_386_16         foo
+// CHECK-NEXT:     0xB5         R_386_8          foo
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
 
         .text
 bar:
   leal  .Lfoo@GOTOFF(%ebx), %eax
 
         .global bar2

llvm/test/MC/Mips/micromips-func-addr.s

 # RUN: llvm-mc %s -filetype=obj -triple=mipsel-unknown-linux \
 # RUN: -mattr=micromips | llvm-readobj -r - \
 # RUN: | FileCheck %s
 # CHECK: Relocations [
-# CHECK:     0x0 R_MIPS_32 bar 0x0
-# CHECK:     0x4 R_MIPS_32 L1 0x0
+# CHECK:     0x0 R_MIPS_32 bar
+# CHECK:     0x4 R_MIPS_32 L1
 
   .set    micromips
   .type   bar,@function
 bar:
 L1:
   nop
   .data
   .4byte bar 
   .4byte L1 
 

llvm/test/MC/Mips/micromips32r6/relocations.s

 # CHECK-FIXUP:                      value: bar, kind: fixup_MICROMIPS_LO16
 # CHECK-FIXUP: jic   $5, bar    # encoding: [0xa0,0x05,A,A]
 # CHECK-FIXUP:                  #   fixup A - offset: 0,
 # CHECK-FIXUP:                      value: bar, kind: fixup_MICROMIPS_LO16
 #------------------------------------------------------------------------------
 # Check that the appropriate relocations were created.
 #------------------------------------------------------------------------------
 # CHECK-ELF: Relocations [
-# CHECK-ELF:     0x0 R_MICROMIPS_PC26_S1 bar 0x0
-# CHECK-ELF:     0x4 R_MICROMIPS_PC26_S1 bar 0x0
-# CHECK-ELF:     0x8 R_MICROMIPS_PC19_S2 bar 0x0
-# CHECK-ELF:     0xC R_MICROMIPS_PC19_S2 bar 0x0
-# CHECK-ELF:     0x10 R_MICROMIPS_PC19_S2 bar 0x0
-# CHECK-ELF:     0x14 R_MICROMIPS_PC21_S1 bar 0x0
-# CHECK-ELF:     0x18 R_MICROMIPS_PC21_S1 bar 0x0
-# CHECK-ELF:     0x1C R_MICROMIPS_LO16 bar 0x0
-# CHECK-ELF:     0x20 R_MICROMIPS_LO16 bar 0x0
+# CHECK-ELF:     0x0 R_MICROMIPS_PC26_S1 bar
+# CHECK-ELF:     0x4 R_MICROMIPS_PC26_S1 bar
+# CHECK-ELF:     0x8 R_MICROMIPS_PC19_S2 bar
+# CHECK-ELF:     0xC R_MICROMIPS_PC19_S2 bar
+# CHECK-ELF:     0x10 R_MICROMIPS_PC19_S2 bar
+# CHECK-ELF:     0x14 R_MICROMIPS_PC21_S1 bar
+# CHECK-ELF:     0x18 R_MICROMIPS_PC21_S1 bar
+# CHECK-ELF:     0x1C R_MICROMIPS_LO16 bar
+# CHECK-ELF:     0x20 R_MICROMIPS_LO16 bar
 # CHECK-ELF: ]
 
   balc  bar
   bc    bar
   addiupc $2,bar
   lapc    $2,bar
   lwpc    $2,bar
   beqzc  $3, bar
   bnezc  $3, bar
   jialc  $5, bar
   jic    $5, bar

llvm/test/MC/Mips/mips-data-directives.s

 # CHECK-OBJ:      0000: DEADC0DE DEADC0DE DEADBEEF C0DE0000
 # CHECK-OBJ:      0010: 00000000 00000000
 # CHECK-OBJ:    )
 # CHECK-OBJ:  }
 
 # CHECK-OBJ:  Section {
 # CHECK-OBJ:    Name: .rel.data
 # CHECK-OBJ:    Relocations [
-# CHECK-OBJ:      0xE R_MIPS_32 .data 0x0
-# CHECK-OBJ:      0x12 R_MIPS_64 .data 0x0
-# CHECK-OBJ:      0x1A R_MIPS_16 .data 0x0
+# CHECK-OBJ:      0xE R_MIPS_32 .data
+# CHECK-OBJ:      0x12 R_MIPS_64 .data
+# CHECK-OBJ:      0x1A R_MIPS_16 .data
 # CHECK-OBJ:    ]
 # CHECK-OBJ:  }
 
 .data
 label:
         .word 0xdeadc0de
         .dword 0xdeadc0dedeadbeef
         .hword 0xc0de
 
         .word label
         .dword label
         .hword label

llvm/test/MC/Mips/mips-pdr.s

 # OBJOUT:       0020: 00000000 10101010 FFFFFFFC 01010101
 # OBJOUT:       0030: FFFFFFF8 00000010 0000001E 0000001F
 # OBJOUT:     )
 # OBJOUT:   }
 
 # We should also check if relocation information was correctly generated.
 # OBJOUT:      Relocations [
 # OBJOUT-NEXT:   Section ({{.*}}) .rel.pdr {
-# OBJOUT-NEXT:     0x0 R_MIPS_32 .text 0x0
-# OBJOUT-NEXT:     0x20 R_MIPS_32 _global_foo 0x0
+# OBJOUT-NEXT:     0x0 R_MIPS_32 .text
+# OBJOUT-NEXT:     0x20 R_MIPS_32 _global_foo
 # OBJOUT-NEXT:   }
 # OBJOUT-NEXT: ]
 
 .text
         .type _local_foo,@function
         .ent _local_foo
 _local_foo:
         .frame $fp,16,$ra

llvm/test/MC/Mips/mips32r6/relocations.s

 # CHECK-FIXUP:                      value: bar, kind: fixup_Mips_LO16
 # CHECK-FIXUP: jic     $5, bar  # encoding: [0xd8,0x05,A,A]
 # CHECK-FIXUP:                  #   fixup A - offset: 0,
 # CHECK-FIXUP:                      value: bar, kind: fixup_Mips_LO16
 #------------------------------------------------------------------------------
 # Check that the appropriate relocations were created.
 #------------------------------------------------------------------------------
 # CHECK-ELF: Relocations [
-# CHECK-ELF:     0x0 R_MIPS_PC19_S2 bar 0x0
-# CHECK-ELF:     0x4 R_MIPS_PC16 bar 0x0
-# CHECK-ELF:     0x8 R_MIPS_PC16 bar 0x0
-# CHECK-ELF:     0xC R_MIPS_PC21_S2 bar 0x0
-# CHECK-ELF:     0x10 R_MIPS_PC21_S2 bar 0x0
-# CHECK-ELF:     0x14 R_MIPS_PC26_S2 bar 0x0
-# CHECK-ELF:     0x18 R_MIPS_PC26_S2 bar 0x0
-# CHECK-ELF:     0x1C R_MIPS_PCHI16 bar 0x0
-# CHECK-ELF:     0x20 R_MIPS_PCLO16 bar 0x0
-# CHECK-ELF:     0x24 R_MIPS_PC19_S2 bar 0x0
-# CHECK-ELF:     0x28 R_MIPS_PC19_S2 bar 0x0
-# CHECK-ELF:     0x2C R_MIPS_LO16 bar 0x0
-# CHECK-ELF:     0x30 R_MIPS_LO16 bar 0x0
+# CHECK-ELF:     0x0 R_MIPS_PC19_S2 bar
+# CHECK-ELF:     0x4 R_MIPS_PC16 bar
+# CHECK-ELF:     0x8 R_MIPS_PC16 bar
+# CHECK-ELF:     0xC R_MIPS_PC21_S2 bar
+# CHECK-ELF:     0x10 R_MIPS_PC21_S2 bar
+# CHECK-ELF:     0x14 R_MIPS_PC26_S2 bar
+# CHECK-ELF:     0x18 R_MIPS_PC26_S2 bar
+# CHECK-ELF:     0x1C R_MIPS_PCHI16 bar
+# CHECK-ELF:     0x20 R_MIPS_PCLO16 bar
+# CHECK-ELF:     0x24 R_MIPS_PC19_S2 bar
+# CHECK-ELF:     0x28 R_MIPS_PC19_S2 bar
+# CHECK-ELF:     0x2C R_MIPS_LO16 bar
+# CHECK-ELF:     0x30 R_MIPS_LO16 bar
 # CHECK-ELF: ]
 
   addiupc   $2,bar
   beqc  $5, $6, bar
   bnec  $5, $6, bar
   beqzc $9, bar
   bnezc $9, bar
   balc  bar
   bc    bar
   aluipc $2, %pcrel_hi(bar)
   addiu  $2, $2, %pcrel_lo(bar)
   lapc      $2,bar
   lwpc      $2,bar
   jialc  $5, bar
   jic    $5, bar

llvm/test/MC/Mips/reloc-directive-label-offset.s

3:
   .reloc bar, R_MIPS_GOT_OFST, foo  # ASM: .reloc bar, R_MIPS_GOT_OFST, foo
   nop
   .reloc foo, R_MIPS_32, foo        # ASM: .reloc foo, R_MIPS_32, foo
   nop
 1:
   nop
 
 # OBJ-O32-LABEL: Relocations [
-# OBJ-O32:           0x0 R_MIPS_32 .text 0x0
-# OBJ-O32-NEXT:      0x4 R_MIPS_NONE .text 0x0
-# OBJ-O32-NEXT:      0xC R_MIPS_32 .text 0x0
-# OBJ-O32-NEXT:      0x10 R_MIPS_CALL16 foo 0x0
-# OBJ-O32-NEXT:      0x1C R_MIPS_GOT_OFST .text 0x0
-# OBJ-O32-NEXT:      0x20 R_MIPS_GOT_DISP foo 0x0
-# OBJ-O32-NEXT:      0x24 R_MIPS_GOT_PAGE .text 0x0
+# OBJ-O32:           0x0 R_MIPS_32 .text
+# OBJ-O32-NEXT:      0x4 R_MIPS_NONE .text
+# OBJ-O32-NEXT:      0xC R_MIPS_32 .text
+# OBJ-O32-NEXT:      0x10 R_MIPS_CALL16 foo
+# OBJ-O32-NEXT:      0x1C R_MIPS_GOT_OFST .text
+# OBJ-O32-NEXT:      0x20 R_MIPS_GOT_DISP foo
+# OBJ-O32-NEXT:      0x24 R_MIPS_GOT_PAGE .text
 
 # OBJ-N32-LABEL: Relocations [
-# OBJ-N32:           0x4 R_MIPS_NONE .text 0x0
-# OBJ-N32-NEXT:      0x1C R_MIPS_GOT_OFST .text 0x0
-# OBJ-N32-NEXT:      0x0 R_MIPS_32 .text 0x0
-# OBJ-N32-NEXT:      0xC R_MIPS_32 .text 0x0
-# OBJ-N32-NEXT:      0x10 R_MIPS_CALL16 foo 0x0
-# OBJ-N32-NEXT:      0x20 R_MIPS_GOT_DISP foo 0x0
-# OBJ-N32-NEXT:      0x24 R_MIPS_GOT_PAGE .text 0x0
+# OBJ-N32:           0x4 R_MIPS_NONE .text
+# OBJ-N32-NEXT:      0x1C R_MIPS_GOT_OFST .text
+# OBJ-N32-NEXT:      0x0 R_MIPS_32 .text
+# OBJ-N32-NEXT:      0xC R_MIPS_32 .text
+# OBJ-N32-NEXT:      0x10 R_MIPS_CALL16 foo
+# OBJ-N32-NEXT:      0x20 R_MIPS_GOT_DISP foo
+# OBJ-N32-NEXT:      0x24 R_MIPS_GOT_PAGE .text
 
 # OBJ-N64-LABEL: Relocations [
 # OBJ-N64:           0x4 R_MIPS_NONE/R_MIPS_NONE/R_MIPS_NONE .text 0x0
 # OBJ-N64-NEXT:      0x1C R_MIPS_GOT_OFST/R_MIPS_NONE/R_MIPS_NONE .text 0x0
 # OBJ-N64-NEXT:      0x0 R_MIPS_32/R_MIPS_NONE/R_MIPS_NONE .text 0x0
 # OBJ-N64-NEXT:      0xC R_MIPS_32/R_MIPS_NONE/R_MIPS_NONE .text 0x0
 # OBJ-N64-NEXT:      0x10 R_MIPS_CALL16/R_MIPS_NONE/R_MIPS_NONE foo 0x0
 # OBJ-N64-NEXT:      0x20 R_MIPS_GOT_DISP/R_MIPS_NONE/R_MIPS_NONE foo 0x0
 # OBJ-N64-NEXT:      0x24 R_MIPS_GOT_PAGE/R_MIPS_NONE/R_MIPS_NONE .text 0x0

llvm/test/MC/Mips/reloc-directive.s

 # OBJ-O32-NEXT:  0030: 00000004 00000000 00000000 00000000
 # OBJ-O32-NEXT:  0040: 00000000 00000000 00000000 00000000
 # OBJ-O32-NEXT:  0050: 00000000 00000004 00000004 00000004
 # OBJ-O32-NEXT:  0060: 00000000 00000000 00000000 00000000
 # OBJ-O32-NEXT:  0070: 00000000 00000000 00000000 00000000
 # OBJ-O32-NEXT:  0080: 00000000 00000000
 # OBJ-O32-LABEL: }
 # OBJ-O32-LABEL: Relocations [
-# OBJ-O32:       0x0 R_MIPS_NONE .text 0x0
-# OBJ-O32-NEXT:  0x4 R_MIPS_NONE .text 0x0
-# OBJ-O32-NEXT:  0x8 R_MIPS_32 .text 0x0
-# OBJ-O32-NEXT:  0xC R_MIPS_NONE -   0x0
-# OBJ-O32-NEXT:  0x10 R_MIPS_CALL_HI16 - 0x0
-# OBJ-O32-NEXT:  0x14 R_MIPS_CALL_LO16 - 0x0
-# OBJ-O32-NEXT:  0x18 R_MIPS_CALL16 - 0x0
-# OBJ-O32-NEXT:  0x20 R_MIPS_GOT_PAGE - 0x0
-# OBJ-O32-NEXT:  0x24 R_MIPS_GOT_OFST - 0x0
-# OBJ-O32-NEXT:  0x28 R_MIPS_GOT_DISP - 0x0
-# OBJ-O32-NEXT:  0x2C R_MIPS_GOT_HI16 - 0x0
-# OBJ-O32-NEXT:  0x30 R_MIPS_GOT_LO16 - 0x0
-# OBJ-O32-NEXT:  0x34 R_MIPS_TLS_GOTTPREL - 0x0
-# OBJ-O32-NEXT:  0x38 R_MIPS_TLS_DTPREL_HI16 - 0x0
-# OBJ-O32-NEXT:  0x3C R_MIPS_TLS_DTPREL_LO16 - 0x0
-# OBJ-O32-NEXT:  0x40 R_MIPS_TLS_GD - 0x0
-# OBJ-O32-NEXT:  0x44 R_MIPS_TLS_LDM - 0x0
-# OBJ-O32-NEXT:  0x48 R_MIPS_TLS_TPREL_HI16 - 0x0
-# OBJ-O32-NEXT:  0x4C R_MIPS_TLS_TPREL_LO16 - 0x0
-# OBJ-O32-NEXT:  0x50 R_MICROMIPS_CALL16 - 0x0
-# OBJ-O32-NEXT:  0x54 R_MICROMIPS_GOT_DISP - 0x0
-# OBJ-O32-NEXT:  0x58 R_MICROMIPS_GOT_PAGE - 0x0
-# OBJ-O32-NEXT:  0x5C R_MICROMIPS_GOT_OFST - 0x0
-# OBJ-O32-NEXT:  0x64 R_MICROMIPS_TLS_GOTTPREL - 0x0
-# OBJ-O32-NEXT:  0x68 R_MICROMIPS_TLS_DTPREL_HI16 - 0x0
-# OBJ-O32-NEXT:  0x6C R_MICROMIPS_TLS_DTPREL_LO16 - 0x0
-# OBJ-O32-NEXT:  0x70 R_MICROMIPS_TLS_GD - 0x0
-# OBJ-O32-NEXT:  0x74 R_MICROMIPS_TLS_LDM - 0x0
-# OBJ-O32-NEXT:  0x78 R_MICROMIPS_TLS_TPREL_HI16 - 0x0
-# OBJ-O32-NEXT:  0x7C R_MICROMIPS_TLS_TPREL_LO16 - 0x0
-# OBJ-O32-NEXT:  0x80 R_MIPS_JALR - 0x0
-# OBJ-O32-NEXT:  0x84 R_MICROMIPS_JALR - 0x0
-# OBJ-O32-NEXT:  0x1C R_MIPS_GOT16 - 0x0
-# OBJ-O32-NEXT:  0x60 R_MICROMIPS_GOT16 - 0x0
+# OBJ-O32:       0x0 R_MIPS_NONE .text
+# OBJ-O32-NEXT:  0x4 R_MIPS_NONE .text
+# OBJ-O32-NEXT:  0x8 R_MIPS_32 .text
+# OBJ-O32-NEXT:  0xC R_MIPS_NONE -
+# OBJ-O32-NEXT:  0x10 R_MIPS_CALL_HI16 -
+# OBJ-O32-NEXT:  0x14 R_MIPS_CALL_LO16 -
+# OBJ-O32-NEXT:  0x18 R_MIPS_CALL16 -
+# OBJ-O32-NEXT:  0x20 R_MIPS_GOT_PAGE -
+# OBJ-O32-NEXT:  0x24 R_MIPS_GOT_OFST -
+# OBJ-O32-NEXT:  0x28 R_MIPS_GOT_DISP -
+# OBJ-O32-NEXT:  0x2C R_MIPS_GOT_HI16 -
+# OBJ-O32-NEXT:  0x30 R_MIPS_GOT_LO16 -
+# OBJ-O32-NEXT:  0x34 R_MIPS_TLS_GOTTPREL -
+# OBJ-O32-NEXT:  0x38 R_MIPS_TLS_DTPREL_HI16 -
+# OBJ-O32-NEXT:  0x3C R_MIPS_TLS_DTPREL_LO16 -
+# OBJ-O32-NEXT:  0x40 R_MIPS_TLS_GD -
+# OBJ-O32-NEXT:  0x44 R_MIPS_TLS_LDM -
+# OBJ-O32-NEXT:  0x48 R_MIPS_TLS_TPREL_HI16 -
+# OBJ-O32-NEXT:  0x4C R_MIPS_TLS_TPREL_LO16 -
+# OBJ-O32-NEXT:  0x50 R_MICROMIPS_CALL16 -
+# OBJ-O32-NEXT:  0x54 R_MICROMIPS_GOT_DISP -
+# OBJ-O32-NEXT:  0x58 R_MICROMIPS_GOT_PAGE -
+# OBJ-O32-NEXT:  0x5C R_MICROMIPS_GOT_OFST -
+# OBJ-O32-NEXT:  0x64 R_MICROMIPS_TLS_GOTTPREL -
+# OBJ-O32-NEXT:  0x68 R_MICROMIPS_TLS_DTPREL_HI16 -
+# OBJ-O32-NEXT:  0x6C R_MICROMIPS_TLS_DTPREL_LO16 -
+# OBJ-O32-NEXT:  0x70 R_MICROMIPS_TLS_GD -
+# OBJ-O32-NEXT:  0x74 R_MICROMIPS_TLS_LDM -
+# OBJ-O32-NEXT:  0x78 R_MICROMIPS_TLS_TPREL_HI16 -
+# OBJ-O32-NEXT:  0x7C R_MICROMIPS_TLS_TPREL_LO16 -
+# OBJ-O32-NEXT:  0x80 R_MIPS_JALR -
+# OBJ-O32-NEXT:  0x84 R_MICROMIPS_JALR -
+# OBJ-O32-NEXT:  0x1C R_MIPS_GOT16 -
+# OBJ-O32-NEXT:  0x60 R_MICROMIPS_GOT16 -
 
 # OBJ-N32-LABEL: Name: .text
 # OBJ-N32:       0000: 00000000 00000000 00000000 00000000
 # OBJ-N32-NEXT:  0010: 00000000 00000000 00000000 00000000
 # OBJ-N32-NEXT:  0020: 00000000 00000000 00000000 00000000
 # OBJ-N32-NEXT:  0030: 00000000 00000000 00000000 00000000
 # OBJ-N32-NEXT:  0040: 00000000 00000000 00000000 00000000
 # OBJ-N32-NEXT:  0050: 00000000 00000000 00000000 00000000

llvm/test/MC/X86/reloc-directive-elf-32.s

 # RUN: llvm-mc -triple=i386-pc-linux-musl %s | FileCheck --check-prefix=PRINT %s
 
 # RUN: llvm-mc -filetype=obj -triple=i386-pc-linux-musl %s -o %t
 # RUN: llvm-readobj -r %t | FileCheck %s
 # RUN: llvm-readelf -x .data %t | FileCheck --check-prefix=HEX %s
 
 # PRINT:      .reloc 2, R_386_NONE, .data
 # PRINT-NEXT: .reloc 1, R_386_NONE, foo+4
 # PRINT-NEXT: .reloc 0, R_386_NONE, 8
 # PRINT-NEXT: .reloc 0, R_386_32, .data+2
 # PRINT-NEXT: .reloc 0, R_386_IRELATIVE, foo+3
 # PRINT-NEXT: .reloc 0, R_386_GOT32X, 5
 
 # X86 relocations use the Elf32_Rel format. Addends are neither stored in the
 # relocation entries nor applied in the referenced locations.
-# CHECK:      0x2 R_386_NONE .data 0x0
-# CHECK-NEXT: 0x1 R_386_NONE foo 0x0
-# CHECK-NEXT: 0x0 R_386_NONE - 0x0
-# CHECK-NEXT: 0x0 R_386_32 .data 0x0
-# CHECK-NEXT: 0x0 R_386_IRELATIVE foo 0x0
-# CHECK-NEXT: 0x0 R_386_GOT32X - 0x0
+# CHECK:      0x2 R_386_NONE .data
+# CHECK-NEXT: 0x1 R_386_NONE foo
+# CHECK-NEXT: 0x0 R_386_NONE -
+# CHECK-NEXT: 0x0 R_386_32 .data
+# CHECK-NEXT: 0x0 R_386_IRELATIVE foo
+# CHECK-NEXT: 0x0 R_386_GOT32X -
 
 # HEX: 0x00000000 00000000 00000000
 
 .text
   ret
   nop
   nop
   .reloc 2, R_386_NONE, .data

llvm/test/Object/Lanai/yaml2obj-elf-lanai-rel.yaml

 # RUN: yaml2obj %s -o %t
 # RUN: llvm-readobj -r %t | FileCheck %s
 
 # CHECK:      Relocations [
 # CHECK-NEXT:   Section (2) .rel.text {
-# CHECK-NEXT:     0x0 R_LANAI_32 main 0x0
-# CHECK-NEXT:     0x4 R_LANAI_NONE - 0x0
-# CHECK-NEXT:     0x8 R_LANAI_21 - 0x0
-# CHECK-NEXT:     0xC R_LANAI_21_F - 0x0
-# CHECK-NEXT:     0x10 R_LANAI_25 - 0x0
-# CHECK-NEXT:     0x14 R_LANAI_HI16 - 0x0
-# CHECK-NEXT:     0x18 R_LANAI_LO16 - 0x0
+# CHECK-NEXT:     0x0 R_LANAI_32 main
+# CHECK-NEXT:     0x4 R_LANAI_NONE -
+# CHECK-NEXT:     0x8 R_LANAI_21 -
+# CHECK-NEXT:     0xC R_LANAI_21_F -
+# CHECK-NEXT:     0x10 R_LANAI_25 -
+# CHECK-NEXT:     0x14 R_LANAI_HI16 -
+# CHECK-NEXT:     0x18 R_LANAI_LO16 -
 # CHECK-NEXT:   }
 # CHECK-NEXT: ]
 
 !ELF
 FileHeader:
   Class:           ELFCLASS32
   Data:            ELFDATA2LSB
   Type:            ET_REL

llvm/test/Object/X86/yaml2obj-elf-x86-rel.yaml

 # RUN: yaml2obj %s -o %t
 # RUN: llvm-readobj -r %t | FileCheck %s
 
 # CHECK:      Relocations [
 # CHECK-NEXT:   Section (2) .rel.text {
-# CHECK-NEXT:     0x0 R_386_32 main 0x0
+# CHECK-NEXT:     0x0 R_386_32 main
 # CHECK-NEXT:   }
 # CHECK-NEXT: ]
 
 !ELF
 FileHeader:
   Class:           ELFCLASS32
   Data:            ELFDATA2LSB
   Type:            ET_REL

llvm/test/Object/dyn-rel-relocation.test

 RUN:   %p/Inputs/dyn-rel.so.elf-mips | FileCheck %s
 
 // CHECK:      Relocations [
 // CHECK-NEXT:   Section (6) .rel.dyn {
 // CHECK-NEXT:     Relocation {
 // CHECK-NEXT:       Offset: 0x0
 // CHECK-NEXT:       Type: R_MIPS_NONE (0)
 // CHECK-NEXT:       Symbol: - (0)
-// CHECK-NEXT:       Addend: 0x0
 // CHECK-NEXT:     }
 // CHECK-NEXT:     Relocation {
 // CHECK-NEXT:       Offset: 0x102F8
 // CHECK-NEXT:       Type: R_MIPS_REL32 (3)
 // CHECK-NEXT:       Symbol: - (0)
-// CHECK-NEXT:       Addend: 0x0
 // CHECK-NEXT:     }
 // CHECK-NEXT:     Relocation {
 // CHECK-NEXT:       Offset: 0x102F4
 // CHECK-NEXT:       Type: R_MIPS_REL32 (3)
 // CHECK-NEXT:       Symbol: v2 (9)
-// CHECK-NEXT:       Addend: 0x0
 // CHECK-NEXT:     }
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
 
 // CHECK:      Dynamic Relocations {
 // CHECK-NEXT:   Relocation {
 // CHECK-NEXT:     Offset: 0x0
 // CHECK-NEXT:     Type: R_MIPS_NONE (0)
 // CHECK-NEXT:     Symbol: -
-// CHECK-NEXT:     Addend: 0x0
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Relocation {
 // CHECK-NEXT:     Offset: 0x102F8
 // CHECK-NEXT:     Type: R_MIPS_REL32 (3)
 // CHECK-NEXT:     Symbol: -
-// CHECK-NEXT:     Addend: 0x0
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Relocation {
 // CHECK-NEXT:     Offset: 0x102F4
 // CHECK-NEXT:     Type: R_MIPS_REL32 (3)
 // CHECK-NEXT:     Symbol: v2
-// CHECK-NEXT:     Addend: 0x0
 // CHECK-NEXT:   }
 // CHECK-NEXT: }

llvm/test/Object/yaml2obj-elf-rel-noref.yaml

 # CHECK-NEXT:   Section {
 # CHECK-NEXT:     Index: 2
 # CHECK-NEXT:     Name: .rel.text (1)
 # CHECK-NEXT:     Type: SHT_REL (0x9)
 # CHECK-NEXT:     Flags [ (0x40)
 # CHECK:  }
 # CHECK:        Relocations [
 # CHECK-NEXT:     Section (2) .rel.text {
-# CHECK-NEXT:       0xC R_ARM_V4BX - 0x0
+# CHECK-NEXT:       0xC R_ARM_V4BX -
 # CHECK-NEXT:     }
 # CHECK-NEXT:   ]

llvm/test/Object/yaml2obj-elf-rel.yaml

 # CHECK-NEXT:     Name: .symtab (40)
 # CHECK:        }
 # CHECK-NEXT:   Section {
 # CHECK-NEXT:     Index: 5
 # CHECK-NEXT:     Name: .strtab (32)
 # CHECK:        }
 # CHECK:        Relocations [
 # CHECK-NEXT:     Section (2) .rel.text {
-# CHECK-NEXT:       0x1 R_MIPS_32 glob1 0x0
-# CHECK-NEXT:       0x1 R_MIPS_CALL16 glob2 0x0
-# CHECK-NEXT:       0x2 R_MIPS_LO16 loc1 0x0
+# CHECK-NEXT:       0x1 R_MIPS_32 glob1
+# CHECK-NEXT:       0x1 R_MIPS_CALL16 glob2
+# CHECK-NEXT:       0x2 R_MIPS_LO16 loc1
 # CHECK-NEXT:     }
 # CHECK-NEXT:     Section (3) .rela.text {
 # CHECK-NEXT:       0x1 R_MIPS_32 glob1 0x1
 # CHECK-NEXT:       0x1 R_MIPS_CALL16 glob2 0x2
 # CHECK-NEXT:       0x2 R_MIPS_LO16 loc1 0x3
 # CHECK-NEXT:     }
 # CHECK-NEXT:   ]

llvm/test/tools/llvm-objcopy/ELF/basic-relocations.test

- Name:     bar
     Binding:  STB_GLOBAL
   - Name:     barA
     Type:     STT_OBJECT
     Size:     4
     Binding:  STB_GLOBAL
 
 # CHECK:     Relocations [
 # CHECK-NEXT:  Section (2) .rel.text {
-# CHECK-NEXT:    0x1000 R_X86_64_PC32 foo 0x0
+# CHECK-NEXT:    0x1000 R_X86_64_PC32 foo
 # CHECK-NEXT:  }
 # CHECK-NEXT:  Section (4) .rel.data {
-# CHECK-NEXT:    0x2000 R_X86_64_PC32 bar 0x0
+# CHECK-NEXT:    0x2000 R_X86_64_PC32 bar
 # CHECK-NEXT:  }
 # CHECK-NEXT:  Section (5) .rela.data {
 # CHECK-NEXT:    0x2000 R_X86_64_PC32 barA 0x17
 # CHECK-NEXT:  }
 # CHECK-NEXT:  Section (6) .rela.text {
 # CHECK-NEXT:    0x1000 R_X86_64_PC32 fooA 0x13
 # CHECK-NEXT:  }
 # CHECK-NEXT:]

llvm/test/tools/llvm-objcopy/ELF/localize-hidden.test

- Name:     hiddenWeak
     Section:  .text
     Value:    0x1010
     Size:     8
     Other:    [ STV_HIDDEN ]
     Binding:  STB_WEAK
 
 #CHECK:     Relocations [
 #CHECK-NEXT:  Section (3) .rel.text {
-#CHECK-NEXT:    0x1000 R_X86_64_PC32 undefGlobal 0x0
+#CHECK-NEXT:    0x1000 R_X86_64_PC32 undefGlobal
 #CHECK-NEXT:  }
 #CHECK-NEXT:]
 
 
 #CHECK: Symbols [
 #CHECK-NEXT:  Symbol {
 #CHECK-NEXT:    Name:
 #CHECK-NEXT:    Value: 0x0

llvm/test/tools/llvm-objcopy/ELF/no-symbol-relocation.test

- Name:            .rel.text
     Type:            SHT_REL
     Info:            .text
     Relocations:
       - Offset: 0x1000
         Type:   R_X86_64_RELATIVE
 
 # CHECK:     Relocations [
 # CHECK-NEXT:  Section (2) .rel.text {
-# CHECK-NEXT:    0x1000 R_X86_64_RELATIVE - 0x0
+# CHECK-NEXT:    0x1000 R_X86_64_RELATIVE -
 # CHECK-NEXT:  }
 # CHECK-NEXT:]
 
 ## Check we produce a valid output when stripping unneeded symbols from an object that
 ## has a symbol table and a relocation with a symbol index of 0.
 
 # RUN: yaml2obj --docnum=2 %s -o %t3
 # RUN: llvm-objcopy --strip-unneeded %t3 %t4
 # RUN: llvm-readobj --relocations --sections --symbols %t4 | FileCheck %s --check-prefix=STRIP
 
 # STRIP:      Relocations [
 # STRIP-NEXT:   Section {{.*}} .rel.text {
-# STRIP-NEXT:     0x1000 R_X86_64_NONE - 0x0
+# STRIP-NEXT:     0x1000 R_X86_64_NONE -
 # STRIP-NEXT:   }
 # STRIP-NEXT: ]
 # STRIP-NEXT: Symbols [
 # STRIP-NEXT:   Symbol {
 # STRIP-NEXT:     Name:  (0)
 # STRIP-NEXT:     Value: 0x0
 # STRIP-NEXT:     Size: 0
 # STRIP-NEXT:     Binding: Local (0x0)

llvm/test/tools/llvm-objcopy/ELF/relocations-no-symtab.test

 ## Check that we can copy an object that has a relocation
 ## with a symbol index of 0 even when there is no symbol table.
 
 # RUN: yaml2obj --docnum=1 %s -o %t1
 # RUN: llvm-objcopy %t1 %t2
 # RUN: llvm-readobj --relocations %t2 | FileCheck %s
 
 # CHECK:     Relocations [
 # CHECK-NEXT:  Section {{.*}} .rel.text {
-# CHECK-NEXT:    0x1000 R_X86_64_RELATIVE - 0x0
+# CHECK-NEXT:    0x1000 R_X86_64_RELATIVE -
 # CHECK-NEXT:  }
 # CHECK-NEXT:]
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_REL

llvm/test/tools/llvm-readobj/ELF/broken-dynamic-reloc.test

- Type:     PT_LOAD
     LastSec:  .dynamic
 
 ## Show that when we have both REL and RELA relocations, we dump both sets.
 # RUN: yaml2obj --docnum=6 %s -o %t13
 # RUN: llvm-readobj --dyn-relocations %t13 2>&1 | FileCheck %s -DFILE=%t13 --check-prefix=BOTH-RELA-REL-LLVM
 # RUN: llvm-readelf --dyn-relocations %t13 2>&1 | FileCheck %s -DFILE=%t13 --check-prefix=BOTH-RELA-REL-GNU
 
 # BOTH-RELA-REL-LLVM:      Dynamic Relocations {
-# BOTH-RELA-REL-LLVM-NEXT:   0x1 R_X86_64_NONE - 0x0
-# BOTH-RELA-REL-LLVM-NEXT:   0x2 R_X86_64_NONE - 0x0
+# BOTH-RELA-REL-LLVM-NEXT:   0x1 R_X86_64_NONE - 0x0{{$}}
+# BOTH-RELA-REL-LLVM-NEXT:   0x2 R_X86_64_NONE -{{$}}
 # BOTH-RELA-REL-LLVM-NEXT: }
 
 # BOTH-RELA-REL-GNU:       'RELA' relocation section at offset 0x78 contains 24 bytes:
 # BOTH-RELA-REL-GNU-NEXT:    Offset             Info             Type               Symbol's Value  Symbol's Name + Addend
 # BOTH-RELA-REL-GNU-NEXT:  0000000000000001  0000000000000000 R_X86_64_NONE                     0
 # BOTH-RELA-REL-GNU-EMPTY:
 # BOTH-RELA-REL-GNU:       'REL' relocation section at offset 0x90 contains 16 bytes:
 # BOTH-RELA-REL-GNU-NEXT:    Offset             Info             Type               Symbol's Value  Symbol's Name

llvm/test/tools/llvm-readobj/ELF/dynamic-reloc.test

 # RUN: llvm-readobj --dyn-relocations %t2.2 2>&1 | \
 # RUN:   FileCheck %s --implicit-check-not=warning: --check-prefix=LLVM-RELOCS
 # RUN: llvm-readelf --dyn-relocations %t2.2 2>&1 | \
 # RUN:   FileCheck %s --implicit-check-not=warning: --strict-whitespace \
 # RUN:     --match-full-lines --check-prefixes=GNU-RELOCS,GNU-PLTRELA
 
 # LLVM-RELOCS:      Dynamic Relocations {
 # LLVM-RELOCS-NEXT:   0x1 R_X86_64_NONE foo 0x0
-# LLVM-RELOCS-NEXT:   0x2 R_X86_64_NONE foo 0x0
-# LLVM-RELOCS-NEXT:   0x4 R_X86_64_RELATIVE - 0x0
-# LLVM-RELOCS-NEXT:   0x8 R_X86_64_NONE foo 0x0
+# LLVM-RELOCS-NEXT:   0x2 R_X86_64_NONE foo
+# LLVM-RELOCS-NEXT:   0x4 R_X86_64_RELATIVE
+# LLVM-RELOCS-NEXT:   0x8 R_X86_64_NONE foo
 # LLVM-RELOCS-NEXT: }
 
 #       GNU-RELOCS:'RELA' relocation section at offset 0x78 contains 24 bytes:
 #  GNU-RELOCS-NEXT:    Offset             Info             Type               Symbol's Value  Symbol's Name + Addend
 #  GNU-RELOCS-NEXT:0000000000000001  0000000100000000 R_X86_64_NONE          0000000000000000 foo + 0
 # GNU-RELOCS-EMPTY:
 #  GNU-RELOCS-NEXT:'REL' relocation section at offset 0x90 contains 16 bytes:
 #  GNU-RELOCS-NEXT:    Offset             Info             Type               Symbol's Value  Symbol's Name

 # RUN: llvm-readobj --dyn-relocations %t3 2>&1 | \
 # RUN:   FileCheck %s -DFILE=%t3 --implicit-check-not=warning: --check-prefix=PLTRELUNKNOWN-LLVM
 # RUN: llvm-readelf --dyn-relocations %t3 2>&1 | \
 # RUN:   FileCheck %s -DFILE=%t3 --implicit-check-not=warning: --check-prefix=PLTRELUNKNOWN-GNU
 
 # PLTRELUNKNOWN-LLVM:      warning: '[[FILE]]': unknown DT_PLTREL value of 255
 # PLTRELUNKNOWN-LLVM:      Dynamic Relocations {
 # PLTRELUNKNOWN-LLVM-NEXT:   0x1 R_X86_64_NONE foo 0x0
-# PLTRELUNKNOWN-LLVM-NEXT:   0x2 R_X86_64_NONE foo 0x0
-# PLTRELUNKNOWN-LLVM-NEXT:   0x4 R_X86_64_RELATIVE - 0x0
+# PLTRELUNKNOWN-LLVM-NEXT:   0x2 R_X86_64_NONE foo{{$}}
+# PLTRELUNKNOWN-LLVM-NEXT:   0x4 R_X86_64_RELATIVE -{{$}}
 # PLTRELUNKNOWN-LLVM-NEXT: warning: '[[FILE]]': invalid DT_PLTRELSZ value (0x10) or PLTREL entry size (0x0)
 # PLTRELUNKNOWN-LLVM-NEXT: }
 
 # PLTRELUNKNOWN-GNU:        warning: '[[FILE]]': unknown DT_PLTREL value of 255
 # PLTRELUNKNOWN-GNU-EMPTY:
 # PLTRELUNKNOWN-GNU-NEXT:   'RELA' relocation section at offset 0x78 contains 24 bytes:
 # PLTRELUNKNOWN-GNU-NEXT:       Offset             Info             Type               Symbol's Value  Symbol's Name + Addend
 # PLTRELUNKNOWN-GNU-NEXT:   0000000000000001  0000000100000000 R_X86_64_NONE          0000000000000000 foo + 0

llvm/test/tools/llvm-readobj/ELF/reloc-addends.test

 # RUN: yaml2obj --docnum=1 -DENCODE=MSB -DTYPE=SHT_RELA %s -o %t.be64.rela
 # RUN: llvm-readobj -r %t.be64.rela | FileCheck %s --check-prefix=LLVM-RELA64
 # RUN: llvm-readelf -r %t.be64.rela | FileCheck %s --check-prefix=GNU-RELA64
 
 # RUN: yaml2obj --docnum=1 -DENCODE=LSB -DTYPE=SHT_REL %s -o %t.le64.rel
 # RUN: llvm-readobj -r %t.le64.rel | FileCheck %s --check-prefix=LLVM-REL64
 # RUN: llvm-readelf -r %t.le64.rel | FileCheck %s --check-prefix=GNU-REL64
 
-## FIXME: We either should not dump an addend or should read it from a
-##        destination location for a SHT_REL case.
-##        See https://bugs.llvm.org/show_bug.cgi?id=44257.
-# LLVM-REL64-COUNT-7:  R_X86_64_NONE - 0x0{{$}}
+# LLVM-REL64-COUNT-7:  R_X86_64_NONE -{{$}}
 # LLVM-REL64-NOT:      R_
 
 # GNU-REL64:         Type               Symbol's Value  Symbol's Name{{$}}
 # GNU-REL64-COUNT-7: R_X86_64_NONE {{$}}
 # GNU-REL64-NOT:     R_
 
 # RUN: yaml2obj --docnum=1 -DENCODE=MSB -DTYPE=SHT_REL %s -o %t.be64.rel
 # RUN: llvm-readobj -r %t.be64.rel | FileCheck %s --check-prefix=LLVM-REL64

 # RUN: yaml2obj --docnum=2 -DENCODE=MSB -DTYPE=SHT_RELA %s -o %t.be32.rela
 # RUN: llvm-readobj -r %t.be32.rela | FileCheck %s --check-prefix=LLVM-RELA32
 # RUN: llvm-readelf -r %t.be32.rela | FileCheck %s --check-prefix=GNU-RELA32
 
 # RUN: yaml2obj --docnum=2 -DENCODE=LSB -DTYPE=SHT_REL %s -o %t.le32.rel
 # RUN: llvm-readobj -r %t.le32.rel | FileCheck %s --check-prefix=LLVM-REL32
 # RUN: llvm-readelf -r %t.le32.rel | FileCheck %s --check-prefix=GNU-REL32
 
-## FIXME: We either should not dump an addend or should read it from a
-##        destination location for a SHT_REL case.
-##        See https://bugs.llvm.org/show_bug.cgi?id=44257.
-# LLVM-REL32-COUNT-7: R_386_NONE - 0x0{{$}}
+# LLVM-REL32-COUNT-7: R_386_NONE -{{$}}
 # LLVM-REL32-NOT:     R_
 
 # GNU-REL32:         Type
 # GNU-REL32-COUNT-7: R_386_NONE {{$}}
 # GNU-REL32-NOT:     R_
 
 # RUN: yaml2obj --docnum=2 -DENCODE=MSB -DTYPE=SHT_REL %s -o %t.be32.rel
 # RUN: llvm-readobj -r %t.be32.rel | FileCheck %s --check-prefix=LLVM-REL32

llvm/test/tools/llvm-readobj/ELF/relocation-errors.test

 ## Check how we report warnings when dumping an object with broken relocations.
 
 # RUN: yaml2obj %s -o %t64
 # RUN: llvm-readobj --relocations %t64 2>&1 | FileCheck %s -DFILE=%t64 --check-prefix=LLVM
 # RUN: llvm-readelf --relocations %t64 2>&1 | FileCheck %s -DFILE=%t64 --check-prefix=GNU
 
 # LLVM:      Relocations [
 # LLVM-NEXT:   Section (3) .rel.text {
 # LLVM-NEXT: warning: '[[FILE]]': unable to print relocation 1 in SHT_REL section with index 3: unable to access section [index 6] data at 0x17e7e7e8d0: offset goes past the end of file
 # LLVM-NEXT: warning: '[[FILE]]': unable to print relocation 2 in SHT_REL section with index 3: unable to access section [index 6] data at 0x17e7e7e8d0: offset goes past the end of file
-# LLVM-NEXT:     0x2 R_X86_64_NONE - 0x0
-# LLVM-NEXT:     0x3 R_X86_64_NONE .sec.symbol1 0x0
+# LLVM-NEXT:     0x2 R_X86_64_NONE -{{$}}
+# LLVM-NEXT:     0x3 R_X86_64_NONE .sec.symbol1{{$}}
 # LLVM-NEXT: warning: '[[FILE]]': invalid section index: 255
-# LLVM-NEXT:     0x4 R_X86_64_NONE <section 255> 0x0
-# LLVM-NEXT:     0x5 R_X86_64_NONE .sec.symbol2 0x0
+# LLVM-NEXT:     0x4 R_X86_64_NONE <section 255>{{$}}
+# LLVM-NEXT:     0x5 R_X86_64_NONE .sec.symbol2{{$}}
 # LLVM-NEXT: warning: '[[FILE]]': a section [index 2] has an invalid sh_name (0xfefefefe) offset which goes past the end of the section name string table
-# LLVM-NEXT:     0x6 R_X86_64_NONE <section 2> 0x0
+# LLVM-NEXT:     0x6 R_X86_64_NONE <section 2>{{$}}
 # LLVM-NEXT:   }
 # LLVM-NEXT:   Section (4) .rela.text {
 # LLVM-NEXT: warning: '[[FILE]]': unable to print relocation 1 in SHT_RELA section with index 4: invalid sh_type for symbol table, expected SHT_SYMTAB or SHT_DYNSYM
 # LLVM-NEXT:   }
 # LLVM-NEXT: ]
 
 # GNU:       Relocation section '.rel.text' at offset 0x41 contains 7 entries:
 # GNU-NEXT:      Offset             Info             Type               Symbol's Value  Symbol's Name

llvm/test/tools/llvm-readobj/ELF/relocations.test

 ## Check llvm-readobj and llvm-readelf print relocations as expected.
 
 ## Show that ELF64 is dumped correctly.
 # RUN: yaml2obj %s --docnum=1 -o %t64
 # RUN: llvm-readobj -r %t64 \
 # RUN:   | FileCheck %s --check-prefix=LLVM-64 --strict-whitespace --match-full-lines
 # RUN: llvm-readobj --relocs %t64 \
 # RUN:   | FileCheck %s --check-prefix=LLVM-64 --strict-whitespace --match-full-lines
 # RUN: llvm-readobj --relocations %t64 \
 # RUN:   | FileCheck %s --check-prefix=LLVM-64 --strict-whitespace --match-full-lines
 
 #      LLVM-64:Relocations [
 # LLVM-64-NEXT:  Section (2) .rel.text {
-# LLVM-64-NEXT:    0x0 R_X86_64_NONE rel_0 0x0
-# LLVM-64-NEXT:    0x1 R_X86_64_PC32 rel_neg 0x0
-# LLVM-64-NEXT:    0x5 R_X86_64_PLT32 rel_pos 0x0
-# LLVM-64-NEXT:    0x9 R_X86_64_64 rel_64 0x0
+# LLVM-64-NEXT:    0x0 R_X86_64_NONE rel_0
+# LLVM-64-NEXT:    0x1 R_X86_64_PC32 rel_neg
+# LLVM-64-NEXT:    0x5 R_X86_64_PLT32 rel_pos
+# LLVM-64-NEXT:    0x9 R_X86_64_64 rel_64
 # LLVM-64-NEXT:  }
 # LLVM-64-NEXT:  Section (3) .rela.text {
 # LLVM-64-NEXT:    0x0 R_X86_64_NONE rela_0 0x0
 # LLVM-64-NEXT:    0x1 R_X86_64_PC32 rela_neg 0xFFFFFFFFFFFFFFFF
 # LLVM-64-NEXT:    0x5 R_X86_64_PLT32 rela_pos 0x2
 # LLVM-64-NEXT:    0xFFFFFFFFFFFFFFFF R_X86_64_64 rela_minneg 0x8000000000000000
 # LLVM-64-NEXT:    0x9 R_X86_64_32S rela_maxpos 0x7FFFFFFFFFFFFFFF
 # LLVM-64-NEXT:  }

 # RUN:   | FileCheck %s --check-prefix=GNU-64 --match-full-lines --strict-whitespace
 
 #      LLVM-EXPAND-64:Relocations [
 # LLVM-EXPAND-64-NEXT:  Section (2) .rel.text {
 # LLVM-EXPAND-64-NEXT:    Relocation {
 # LLVM-EXPAND-64-NEXT:      Offset: 0x0
 # LLVM-EXPAND-64-NEXT:      Type: R_X86_64_NONE (0)
 # LLVM-EXPAND-64-NEXT:      Symbol: rel_0 (1)
-# LLVM-EXPAND-64-NEXT:      Addend: 0x0
 # LLVM-EXPAND-64-NEXT:    }
 # LLVM-EXPAND-64-NEXT:    Relocation {
 # LLVM-EXPAND-64-NEXT:      Offset: 0x1
 # LLVM-EXPAND-64-NEXT:      Type: R_X86_64_PC32 (2)
 # LLVM-EXPAND-64-NEXT:      Symbol: rel_neg (2)
-# LLVM-EXPAND-64-NEXT:      Addend: 0x0
 # LLVM-EXPAND-64-NEXT:    }
 # LLVM-EXPAND-64-NEXT:    Relocation {
 # LLVM-EXPAND-64-NEXT:      Offset: 0x5
 # LLVM-EXPAND-64-NEXT:      Type: R_X86_64_PLT32 (4)
 # LLVM-EXPAND-64-NEXT:      Symbol: rel_pos (3)
-# LLVM-EXPAND-64-NEXT:      Addend: 0x0
 # LLVM-EXPAND-64-NEXT:    }
 # LLVM-EXPAND-64-NEXT:    Relocation {
 # LLVM-EXPAND-64-NEXT:      Offset: 0x9
 # LLVM-EXPAND-64-NEXT:      Type: R_X86_64_64 (1)
 # LLVM-EXPAND-64-NEXT:      Symbol: rel_64 (4)
-# LLVM-EXPAND-64-NEXT:      Addend: 0x0
 # LLVM-EXPAND-64-NEXT:    }
 # LLVM-EXPAND-64-NEXT:  }
 # LLVM-EXPAND-64-NEXT:  Section (3) .rela.text {
 # LLVM-EXPAND-64-NEXT:    Relocation {
 # LLVM-EXPAND-64-NEXT:      Offset: 0x0
 # LLVM-EXPAND-64-NEXT:      Type: R_X86_64_NONE (0)
 # LLVM-EXPAND-64-NEXT:      Symbol: rela_0 (5)
 # LLVM-EXPAND-64-NEXT:      Addend: 0x0

 # RUN: yaml2obj %s --docnum=1 -DENTSIZERELA=1 -o %t.broken.rela
 # RUN: llvm-readobj --relocations %t.broken.rela 2>&1 \
 # RUN:   | FileCheck %s -DFILE=%t.broken.rela --check-prefix=BROKEN-RELA-LLVM
 # RUN: llvm-readelf --relocations %t.broken.rela 2>&1 \
 # RUN:   | FileCheck %s -DFILE=%t.broken.rela --check-prefix=BROKEN-RELA-GNU
 
 # BROKEN-RELA-LLVM:      Relocations [
 # BROKEN-RELA-LLVM-NEXT:   Section (2) .rel.text {
-# BROKEN-RELA-LLVM-NEXT:     0x0 R_X86_64_NONE rel_0 0x0
-# BROKEN-RELA-LLVM-NEXT:     0x1 R_X86_64_PC32 rel_neg 0x0
-# BROKEN-RELA-LLVM-NEXT:     0x5 R_X86_64_PLT32 rel_pos 0x0
-# BROKEN-RELA-LLVM-NEXT:     0x9 R_X86_64_64 rel_64 0x0
+# BROKEN-RELA-LLVM-NEXT:     0x0 R_X86_64_NONE rel_0{{$}}
+# BROKEN-RELA-LLVM-NEXT:     0x1 R_X86_64_PC32 rel_neg{{$}}
+# BROKEN-RELA-LLVM-NEXT:     0x5 R_X86_64_PLT32 rel_pos{{$}}
+# BROKEN-RELA-LLVM-NEXT:     0x9 R_X86_64_64 rel_64{{$}}
 # BROKEN-RELA-LLVM-NEXT:   }
 # BROKEN-RELA-LLVM-NEXT:   Section (3) .rela.text {
 # BROKEN-RELA-LLVM-NEXT: warning: '[[FILE]]': unable to read relocations from SHT_RELA section with index 3: section [index 3] has an invalid sh_entsize: 1
 # BROKEN-RELA-LLVM-NEXT:   }
 # BROKEN-RELA-LLVM-NEXT: ]
 
 # BROKEN-RELA-GNU:      Relocation section '.rel.text' at offset 0x51 contains 4 entries:
 # BROKEN-RELA-GNU-NEXT:     Offset             Info             Type       Symbol's Value  Symbol's Name

 # RUN:   | FileCheck %s --check-prefix=LLVM-32 --strict-whitespace --match-full-lines
 # RUN: llvm-readobj --relocs %t32 \
 # RUN:   | FileCheck %s --check-prefix=LLVM-32 --strict-whitespace --match-full-lines
 # RUN: llvm-readobj --relocations %t32 \
 # RUN:   | FileCheck %s --check-prefix=LLVM-32 --strict-whitespace --match-full-lines
 
 #      LLVM-32:Relocations [
 # LLVM-32-NEXT:  Section (2) .rel.text {
-# LLVM-32-NEXT:    0x0 R_386_NONE rel_0 0x0
-# LLVM-32-NEXT:    0x1 R_386_PC32 rel_neg 0x0
-# LLVM-32-NEXT:    0x5 R_386_PLT32 rel_pos 0x0
+# LLVM-32-NEXT:    0x0 R_386_NONE rel_0
+# LLVM-32-NEXT:    0x1 R_386_PC32 rel_neg
+# LLVM-32-NEXT:    0x5 R_386_PLT32 rel_pos
 # LLVM-32-NEXT:  }
 # LLVM-32-NEXT:  Section (3) .rela.text {
 # LLVM-32-NEXT:    0x0 R_386_NONE rela_0 0x0
 # LLVM-32-NEXT:    0x1 R_386_PC32 rela_neg 0xFFFFFFFF
 # LLVM-32-NEXT:    0x5 R_386_PLT32 rela_pos 0x2
 # LLVM-32-NEXT:    0xFFFFFFFF R_386_32 rela_minneg 0x80000000
 # LLVM-32-NEXT:    0x9 R_386_GOT32 rela_maxpos 0x7FFFFFFF
 # LLVM-32-NEXT:  }

 # RUN:   | FileCheck %s --check-prefix=GNU-32 --strict-whitespace --match-full-lines
 
 #      LLVM-EXPAND-32:Relocations [
 # LLVM-EXPAND-32-NEXT:  Section (2) .rel.text {
 # LLVM-EXPAND-32-NEXT:    Relocation {
 # LLVM-EXPAND-32-NEXT:      Offset: 0x0
 # LLVM-EXPAND-32-NEXT:      Type: R_386_NONE (0)
 # LLVM-EXPAND-32-NEXT:      Symbol: rel_0 (1)
-# LLVM-EXPAND-32-NEXT:      Addend: 0x0
 # LLVM-EXPAND-32-NEXT:    }
 # LLVM-EXPAND-32-NEXT:    Relocation {
 # LLVM-EXPAND-32-NEXT:      Offset: 0x1
 # LLVM-EXPAND-32-NEXT:      Type: R_386_PC32 (2)
 # LLVM-EXPAND-32-NEXT:      Symbol: rel_neg (2)
-# LLVM-EXPAND-32-NEXT:      Addend: 0x0
 # LLVM-EXPAND-32-NEXT:    }
 # LLVM-EXPAND-32-NEXT:    Relocation {
 # LLVM-EXPAND-32-NEXT:      Offset: 0x5
 # LLVM-EXPAND-32-NEXT:      Type: R_386_PLT32 (4)
 # LLVM-EXPAND-32-NEXT:      Symbol: rel_pos (3)
-# LLVM-EXPAND-32-NEXT:      Addend: 0x0
 # LLVM-EXPAND-32-NEXT:    }
 # LLVM-EXPAND-32-NEXT:  }
 # LLVM-EXPAND-32-NEXT:  Section (3) .rela.text {
 # LLVM-EXPAND-32-NEXT:    Relocation {
 # LLVM-EXPAND-32-NEXT:      Offset: 0x0
 # LLVM-EXPAND-32-NEXT:      Type: R_386_NONE (0)
 # LLVM-EXPAND-32-NEXT:      Symbol: rela_0 (4)
 # LLVM-EXPAND-32-NEXT:      Addend: 0x0

 ## Check we report a warning when the name of a relocation section can't be read. Check we continue dumping.
 # RUN: yaml2obj %s --docnum=1 -DSHNAME=0xffffffff -o %tshname
 # RUN: llvm-readobj --relocs %tshname 2>&1 | FileCheck %s -DFILE=%tshname --check-prefix=LLVM-SHNAME
 # RUN: llvm-readelf --relocs %tshname 2>&1 | FileCheck %s -DFILE=%tshname --check-prefix=GNU-SHNAME
 
 # LLVM-SHNAME:      Relocations [
 # LLVM-SHNAME-NEXT: warning: '[[FILE]]': unable to get the name of SHT_REL section with index 2: a section [index 2] has an invalid sh_name (0xffffffff) offset which goes past the end of the section name string table
 # LLVM-SHNAME-NEXT:   Section (2) <?> {
-# LLVM-SHNAME-NEXT:     0x0 R_X86_64_NONE rel_0 0x0
-# LLVM-SHNAME-NEXT:     0x1 R_X86_64_PC32 rel_neg 0x0
-# LLVM-SHNAME-NEXT:     0x5 R_X86_64_PLT32 rel_pos 0x0
-# LLVM-SHNAME-NEXT:     0x9 R_X86_64_64 rel_64 0x0
+# LLVM-SHNAME-NEXT:     0x0 R_X86_64_NONE rel_0{{$}}
+# LLVM-SHNAME-NEXT:     0x1 R_X86_64_PC32 rel_neg{{$}}
+# LLVM-SHNAME-NEXT:     0x5 R_X86_64_PLT32 rel_pos{{$}}
+# LLVM-SHNAME-NEXT:     0x9 R_X86_64_64 rel_64{{$}}
 # LLVM-SHNAME-NEXT:   }
 # LLVM-SHNAME-NEXT: warning: '[[FILE]]': unable to get the name of SHT_RELA section with index 3: a section [index 3] has an invalid sh_name (0xffffffff) offset which goes past the end of the section name string table
 # LLVM-SHNAME-NEXT:   Section (3) <?> {
 # LLVM-SHNAME-NEXT:     0x0 R_X86_64_NONE rela_0 0x0
 # LLVM-SHNAME-NEXT:     0x1 R_X86_64_PC32 rela_neg 0xFFFFFFFFFFFFFFFF
 # LLVM-SHNAME-NEXT:     0x5 R_X86_64_PLT32 rela_pos 0x2
 # LLVM-SHNAME-NEXT:     0xFFFFFFFFFFFFFFFF R_X86_64_64 rela_minneg 0x8000000000000000
 # LLVM-SHNAME-NEXT:     0x9 R_X86_64_32S rela_maxpos 0x7FFFFFFFFFFFFFFF

llvm/test/tools/llvm-readobj/ELF/relr-relocs.test

 ## This is a test to test how SHT_RELR sections are dumped.
 
 # RUN: yaml2obj --docnum=1 %s -o %t1
 # RUN: llvm-readobj --relocations --raw-relr %t1 \
 # RUN:   | FileCheck --check-prefix=RAW-LLVM1 %s
 # RAW-LLVM1:      Section (1) .relr.dyn {
 # RAW-LLVM1-NEXT:   0x10D60
 # RAW-LLVM1-NEXT:   0x103
 # RAW-LLVM1-NEXT:   0x20000
 # RAW-LLVM1-NEXT:   0xF0501
 # RAW-LLVM1-NEXT:   0xA700550400009
 # RAW-LLVM1-NEXT: }
 
-# RUN: llvm-readobj --relocations %t1 | FileCheck --check-prefix=LLVM1 %s
+# RUN: llvm-readobj --relocations %t1 | \
+# RUN: FileCheck --match-full-lines --check-prefix=LLVM1 %s
+
 # LLVM1:      Section (1) .relr.dyn {
-# LLVM1-NEXT:   0x10D60 R_X86_64_RELATIVE - 0x0
-# LLVM1-NEXT:   0x10D68 R_X86_64_RELATIVE - 0x0
-# LLVM1-NEXT:   0x10DA0 R_X86_64_RELATIVE - 0x0
-# LLVM1-NEXT:   0x20000 R_X86_64_RELATIVE - 0x0
-# LLVM1-NEXT:   0x20040 R_X86_64_RELATIVE - 0x0
-# LLVM1-NEXT:   0x20050 R_X86_64_RELATIVE - 0x0
-# LLVM1-NEXT:   0x20080 R_X86_64_RELATIVE - 0x0
-# LLVM1-NEXT:   0x20088 R_X86_64_RELATIVE - 0x0
-# LLVM1-NEXT:   0x20090 R_X86_64_RELATIVE - 0x0
-# LLVM1-NEXT:   0x20098 R_X86_64_RELATIVE - 0x0
-# LLVM1-NEXT:   0x20210 R_X86_64_RELATIVE - 0x0
-# LLVM1-NEXT:   0x202A8 R_X86_64_RELATIVE - 0x0
-# LLVM1-NEXT:   0x202D8 R_X86_64_RELATIVE - 0x0
-# LLVM1-NEXT:   0x202E8 R_X86_64_RELATIVE - 0x0
-# LLVM1-NEXT:   0x202F8 R_X86_64_RELATIVE - 0x0
-# LLVM1-NEXT:   0x20308 R_X86_64_RELATIVE - 0x0
-# LLVM1-NEXT:   0x20358 R_X86_64_RELATIVE - 0x0
-# LLVM1-NEXT:   0x20360 R_X86_64_RELATIVE - 0x0
-# LLVM1-NEXT:   0x20368 R_X86_64_RELATIVE - 0x0
-# LLVM1-NEXT:   0x20380 R_X86_64_RELATIVE - 0x0
-# LLVM1-NEXT:   0x20390 R_X86_64_RELATIVE - 0x0
+# LLVM1-NEXT:   0x10D60 R_X86_64_RELATIVE -
+# LLVM1-NEXT:   0x10D68 R_X86_64_RELATIVE -
+# LLVM1-NEXT:   0x10DA0 R_X86_64_RELATIVE -
+# LLVM1-NEXT:   0x20000 R_X86_64_RELATIVE -
+# LLVM1-NEXT:   0x20040 R_X86_64_RELATIVE -
+# LLVM1-NEXT:   0x20050 R_X86_64_RELATIVE -
+# LLVM1-NEXT:   0x20080 R_X86_64_RELATIVE -
+# LLVM1-NEXT:   0x20088 R_X86_64_RELATIVE -
+# LLVM1-NEXT:   0x20090 R_X86_64_RELATIVE -
+# LLVM1-NEXT:   0x20098 R_X86_64_RELATIVE -
+# LLVM1-NEXT:   0x20210 R_X86_64_RELATIVE -
+# LLVM1-NEXT:   0x202A8 R_X86_64_RELATIVE -
+# LLVM1-NEXT:   0x202D8 R_X86_64_RELATIVE -
+# LLVM1-NEXT:   0x202E8 R_X86_64_RELATIVE -
+# LLVM1-NEXT:   0x202F8 R_X86_64_RELATIVE -
+# LLVM1-NEXT:   0x20308 R_X86_64_RELATIVE -
+# LLVM1-NEXT:   0x20358 R_X86_64_RELATIVE -
+# LLVM1-NEXT:   0x20360 R_X86_64_RELATIVE -
+# LLVM1-NEXT:   0x20368 R_X86_64_RELATIVE -
+# LLVM1-NEXT:   0x20380 R_X86_64_RELATIVE -
+# LLVM1-NEXT:   0x20390 R_X86_64_RELATIVE -
 # LLVM1-NEXT: }
 
 # RUN: llvm-readelf --relocations --raw-relr %t1 \
 # RUN:   | FileCheck --check-prefix=RAW-GNU1 %s
 # RAW-GNU1:      Relocation section '.relr.dyn' at offset 0x40 contains 5 entries:
 # RAW-GNU1:      0000000000010d60
 # RAW-GNU1-NEXT: 0000000000000103
 # RAW-GNU1-NEXT: 0000000000020000

 # RAW-LLVM2:      Section (1) .relr.dyn {
 # RAW-LLVM2-NEXT:   0x10D60
 # RAW-LLVM2-NEXT:   0x103
 # RAW-LLVM2-NEXT:   0x20000
 # RAW-LLVM2-NEXT:   0xF0501
 # RAW-LLVM2-NEXT:   0x50400009
 # RAW-LLVM2-NEXT: }
 
-# RUN: llvm-readobj --relocations %t2 | FileCheck --check-prefix=LLVM2 %s
+# RUN: llvm-readobj --relocations %t2 | \
+# RUN:   FileCheck --match-full-lines --check-prefix=LLVM2 %s
+
 # LLVM2:      Section (1) .relr.dyn {
-# LLVM2-NEXT:   0x10D60 R_386_RELATIVE - 0x0
-# LLVM2-NEXT:   0x10D64 R_386_RELATIVE - 0x0
-# LLVM2-NEXT:   0x10D80 R_386_RELATIVE - 0x0
-# LLVM2-NEXT:   0x20000 R_386_RELATIVE - 0x0
-# LLVM2-NEXT:   0x20020 R_386_RELATIVE - 0x0
-# LLVM2-NEXT:   0x20028 R_386_RELATIVE - 0x0
-# LLVM2-NEXT:   0x20040 R_386_RELATIVE - 0x0
-# LLVM2-NEXT:   0x20044 R_386_RELATIVE - 0x0
-# LLVM2-NEXT:   0x20048 R_386_RELATIVE - 0x0
-# LLVM2-NEXT:   0x2004C R_386_RELATIVE - 0x0
-# LLVM2-NEXT:   0x20088 R_386_RELATIVE - 0x0
-# LLVM2-NEXT:   0x200D4 R_386_RELATIVE - 0x0
-# LLVM2-NEXT:   0x200EC R_386_RELATIVE - 0x0
-# LLVM2-NEXT:   0x200F4 R_386_RELATIVE - 0x0
+# LLVM2-NEXT:   0x10D60 R_386_RELATIVE -
+# LLVM2-NEXT:   0x10D64 R_386_RELATIVE -
+# LLVM2-NEXT:   0x10D80 R_386_RELATIVE -
+# LLVM2-NEXT:   0x20000 R_386_RELATIVE -
+# LLVM2-NEXT:   0x20020 R_386_RELATIVE -
+# LLVM2-NEXT:   0x20028 R_386_RELATIVE -
+# LLVM2-NEXT:   0x20040 R_386_RELATIVE -
+# LLVM2-NEXT:   0x20044 R_386_RELATIVE -
+# LLVM2-NEXT:   0x20048 R_386_RELATIVE -
+# LLVM2-NEXT:   0x2004C R_386_RELATIVE -
+# LLVM2-NEXT:   0x20088 R_386_RELATIVE -
+# LLVM2-NEXT:   0x200D4 R_386_RELATIVE -
+# LLVM2-NEXT:   0x200EC R_386_RELATIVE -
+# LLVM2-NEXT:   0x200F4 R_386_RELATIVE -
 # LLVM2-NEXT: }
 
 # RUN: llvm-readelf --relocations --raw-relr %t2 | \
 # RUN:   FileCheck --check-prefix=RAW-GNU2 %s
 # RAW-GNU2:      Relocation section '.relr.dyn' at offset 0x34 contains 5 entries:
 # RAW-GNU2:      00010d60
 # RAW-GNU2-NEXT: 00000103
 # RAW-GNU2-NEXT: 00020000

llvm/test/tools/yaml2obj/ELF/relocation-implicit-symbol-index.yaml

 ## If "Symbol" is not specified for a relocation, the symbol index is assumed to be 0.
 
 # RUN: yaml2obj %s -o %t
 # RUN: llvm-readobj -r %t | FileCheck %s
 
 # CHECK:     Relocations [
 # CHECK-NEXT:  Section (2) .rel.text {
-# CHECK-NEXT:    0x1000 R_X86_64_RELATIVE - 0x0
-# CHECK-NEXT:    0x1001 R_X86_64_PC32 - 0x0
+# CHECK-NEXT:    0x1000 R_X86_64_RELATIVE -
+# CHECK-NEXT:    0x1001 R_X86_64_PC32 -
 # CHECK-NEXT:  }
 # CHECK-NEXT:]
 
 !ELF
 FileHeader:
   Class:           ELFCLASS64
   Data:            ELFDATA2LSB
   Type:            ET_EXEC

llvm/tools/llvm-readobj/ELFDumper.cpp

 }
 
 template <class ELFT>
 void LLVMStyle<ELFT>::printRelRelaReloc(const Relocation<ELFT> &R,
                                         StringRef SymbolName) {
   SmallString<32> RelocName;
   this->Obj.getRelocationTypeName(R.Type, RelocName);
 
-  uintX_t Addend = R.Addend.getValueOr(0);
   if (opts::ExpandRelocs) {
     DictScope Group(W, "Relocation");
     W.printHex("Offset", R.Offset);
     W.printNumber("Type", RelocName, R.Type);
     W.printNumber("Symbol", !SymbolName.empty() ? SymbolName : "-", R.Symbol);
-    W.printHex("Addend", Addend);
+    if (R.Addend)
+      W.printHex("Addend", (uintX_t)*R.Addend);
   } else {
     raw_ostream &OS = W.startLine();
     OS << W.hex(R.Offset) << " " << RelocName << " "
-       << (!SymbolName.empty() ? SymbolName : "-") << " " << W.hex(Addend)
-       << "\n";
+       << (!SymbolName.empty() ? SymbolName : "-");
+    if (R.Addend)
+      OS << " " << W.hex((uintX_t)*R.Addend);
+    OS << "\n";
   }
 }
 
 template <class ELFT> void LLVMStyle<ELFT>::printSectionHeaders() {
   ListScope SectionsD(W, "Sections");
 
   int SectionIndex = -1;
   std::vector<EnumEntry<unsigned>> FlagsList =