[lld] e4ceb8f - [lib/ObjectYAML] - Make `ELFYAML::Relocation::Offset` optional.

Georgii Rymar via llvm-commits llvm-commits at lists.llvm.org
Fri Mar 6 03:10:07 PST 2020


Author: Georgii Rymar
Date: 2020-03-06T13:59:58+03:00
New Revision: e4ceb8f4217d9203ecd7134d5fe2bac6d49c724d

URL: https://github.com/llvm/llvm-project/commit/e4ceb8f4217d9203ecd7134d5fe2bac6d49c724d
DIFF: https://github.com/llvm/llvm-project/commit/e4ceb8f4217d9203ecd7134d5fe2bac6d49c724d.diff

LOG: [lib/ObjectYAML] - Make `ELFYAML::Relocation::Offset` optional.

Currently `yaml2obj` require `Offset` field in a relocation description.
There are many cases when `Offset` is insignificant in a context of a test case.

Making `Offset` optional allows to simplify our test cases.
This is what this patch does.

Also, with this patch `obj2yaml` does not dump a zero offset of a relocation.

Differential revision: https://reviews.llvm.org/D75608

Added: 
    

Modified: 
    lld/test/ELF/Inputs/shf-info-link.test
    lld/test/ELF/arm-thumb-undefined-weak-narrow.test
    lld/test/ELF/arm-v4bx.test
    lld/test/ELF/debug-relocation-none.test
    lld/test/ELF/i386-pc16.test
    lld/test/ELF/icf11.test
    lld/test/ELF/invalid/bad-reloc-target.test
    lld/test/ELF/invalid/invalid-debug-relocations.test
    lld/test/ELF/invalid/invalid-relocation-aarch64.test
    lld/test/ELF/invalid/invalid-relocation-x64.test
    lld/test/ELF/invalid/reloc-section-reordered.test
    lld/test/ELF/relocation-b-aarch64.test
    lld/test/ELF/relocation-group.test
    lld/test/ELF/shf-info-link.test
    lld/test/ELF/sht-group-empty.test
    lld/test/ELF/undef-broken-debug.test
    lld/test/ELF/undef-not-suggest.test
    llvm/lib/ObjectYAML/ELFYAML.cpp
    llvm/test/Object/AArch64/yaml2obj-elf-aarch64-rel.yaml
    llvm/test/Object/AMDGPU/elf64-relocs.yaml
    llvm/test/Object/Lanai/yaml2obj-elf-lanai-rel.yaml
    llvm/test/Object/X86/yaml2obj-elf-x86-rel.yaml
    llvm/test/Object/invalid-alignment.test
    llvm/test/Object/obj2yaml.test
    llvm/test/Object/objdump-relocations.test
    llvm/test/tools/llvm-readobj/ELF/broken-dynamic-reloc.test
    llvm/test/tools/llvm-readobj/ELF/dynamic-reloc-no-section-headers.test
    llvm/test/tools/llvm-readobj/ELF/reloc-types-elf-aarch64.test
    llvm/test/tools/llvm-readobj/ELF/reloc-types-elf-arm.test
    llvm/test/tools/llvm-readobj/ELF/reloc-types-elf-lanai.test
    llvm/test/tools/llvm-readobj/ELF/reloc-types-elf-mips.test
    llvm/test/tools/llvm-readobj/ELF/reloc-types-elf-mips64.test
    llvm/test/tools/llvm-readobj/ELF/reloc-types-elf-ppc64.test
    llvm/test/tools/llvm-readobj/ELF/relocation-errors.test
    llvm/test/tools/llvm-readobj/ELF/relocations.test
    llvm/test/tools/obj2yaml/duplicate-symbol-and-section-names.test
    llvm/test/tools/obj2yaml/elf-ppc64-relocations.yaml
    llvm/test/tools/obj2yaml/no-symbol-reloc.test
    llvm/test/tools/yaml2obj/ELF/duplicate-symbol-names.yaml
    llvm/test/tools/yaml2obj/ELF/dynamic-relocations.yaml
    llvm/test/tools/yaml2obj/ELF/relocation-explicit-symbol-index.yaml
    llvm/test/tools/yaml2obj/ELF/relocation-missing-symbol.yaml
    llvm/test/tools/yaml2obj/ELF/symbol-name.yaml

Removed: 
    


################################################################################
diff  --git a/lld/test/ELF/Inputs/shf-info-link.test b/lld/test/ELF/Inputs/shf-info-link.test
index a2cc2e87d875..fbcfbe32fe8e 100644
--- a/lld/test/ELF/Inputs/shf-info-link.test
+++ b/lld/test/ELF/Inputs/shf-info-link.test
@@ -13,9 +13,8 @@ Sections:
     Link:            .symtab
     Info:            .text
     Relocations:
-      - Offset:          0x0000000000000000
-        Symbol:          foo
-        Type:            R_X86_64_64
+      - Symbol:      foo
+        Type:        R_X86_64_64
 Symbols:
   - Name:            foo
     Binding:         STB_GLOBAL

diff  --git a/lld/test/ELF/arm-thumb-undefined-weak-narrow.test b/lld/test/ELF/arm-thumb-undefined-weak-narrow.test
index 2215c9d61e56..f3997c1ef6fb 100644
--- a/lld/test/ELF/arm-thumb-undefined-weak-narrow.test
+++ b/lld/test/ELF/arm-thumb-undefined-weak-narrow.test
@@ -29,8 +29,7 @@ Sections:
     Link:            .symtab
     Info:            .text
     Relocations:
-      - Offset:          0
-        Symbol:          undefined_weak
+      - Symbol:          undefined_weak
         Type:            R_ARM_THM_JUMP11
 
 Symbols:

diff  --git a/lld/test/ELF/arm-v4bx.test b/lld/test/ELF/arm-v4bx.test
index dd9614a1fa69..109f975c95d3 100644
--- a/lld/test/ELF/arm-v4bx.test
+++ b/lld/test/ELF/arm-v4bx.test
@@ -26,8 +26,7 @@ Sections:
     AddressAlign:    0x0000000000000004
     Info:            .text
     Relocations:
-      - Offset:          0x0000000000000000
-        Type:            R_ARM_V4BX
+      - Type:        R_ARM_V4BX
 Symbols:
   - Name:            .text
     Type:            STT_SECTION

diff  --git a/lld/test/ELF/debug-relocation-none.test b/lld/test/ELF/debug-relocation-none.test
index 6a8cc5d30f67..83259ac4755f 100644
--- a/lld/test/ELF/debug-relocation-none.test
+++ b/lld/test/ELF/debug-relocation-none.test
@@ -28,8 +28,7 @@ Sections:
     Link:            .symtab
     Info:            .text
     Relocations:
-      - Offset:          0x0000000000000000
-        Symbol:          bar
+      - Symbol:          bar
         Type:            R_X86_64_64
   - Name:            .debug_line
     Type:            SHT_PROGBITS

diff  --git a/lld/test/ELF/i386-pc16.test b/lld/test/ELF/i386-pc16.test
index 4033f2c86cfb..a422e5bac905 100644
--- a/lld/test/ELF/i386-pc16.test
+++ b/lld/test/ELF/i386-pc16.test
@@ -25,8 +25,7 @@ Sections:
     Info:            .text
     AddressAlign:    0x04
     Relocations:
-      - Offset:          0
-        Symbol:          _start
+      - Symbol:          _start
         Type:            R_386_16
       - Offset:          4
         Symbol:          _start

diff  --git a/lld/test/ELF/icf11.test b/lld/test/ELF/icf11.test
index 1aa3454612a3..d90926c041de 100644
--- a/lld/test/ELF/icf11.test
+++ b/lld/test/ELF/icf11.test
@@ -32,15 +32,13 @@ Sections:
     Link:            .symtab
     Info:            .text.foo
     Relocations:
-      - Offset:          0x0000000000000000
-        Type:            R_X86_64_NONE
+      - Type:        R_X86_64_NONE
   - Name:            .rela.text.bar
     Type:            SHT_RELA
     Link:            .symtab
     Info:            .text.bar
     Relocations:
-      - Offset:          0
-        Symbol:          zed
+      - Symbol:          zed
         Type:            R_X86_64_64
 Symbols:
   - Name:     zed

diff  --git a/lld/test/ELF/invalid/bad-reloc-target.test b/lld/test/ELF/invalid/bad-reloc-target.test
index a8a752589929..e0948a2c4c76 100644
--- a/lld/test/ELF/invalid/bad-reloc-target.test
+++ b/lld/test/ELF/invalid/bad-reloc-target.test
@@ -17,8 +17,7 @@ Sections:
     Link:        .symtab
     Info:        0
     Relocations: 
-      - Offset:  0x0000000000000000
-        Symbol:  foo
+      - Symbol:  foo
         Type:    R_X86_64_64
 Symbols:         
   - Name:        foo
@@ -43,8 +42,7 @@ Sections:
     Link:        .symtab
     Info:        99
     Relocations: 
-      - Offset:  0x0000000000000000
-        Symbol:  foo
+      - Symbol:  foo
         Type:    R_X86_64_64
 Symbols:         
   - Name:        foo
@@ -70,6 +68,5 @@ Sections:
     Type:        SHT_RELA
     Info:        .text
     Relocations:
-      - Offset:  0x0000000000000000
-        Symbol:  255
+      - Symbol:  255
         Type:    R_X86_64_64

diff  --git a/lld/test/ELF/invalid/invalid-debug-relocations.test b/lld/test/ELF/invalid/invalid-debug-relocations.test
index 640cabbed65a..c53a879e516f 100644
--- a/lld/test/ELF/invalid/invalid-debug-relocations.test
+++ b/lld/test/ELF/invalid/invalid-debug-relocations.test
@@ -26,8 +26,7 @@ Sections:
     Link:            .symtab
     Info:            .debug_info
     Relocations:
-      - Offset:          0
-        Symbol:          _start
+      - Symbol:          _start
         Type:            0xFF
       - Offset:          4
         Symbol:          _start

diff  --git a/lld/test/ELF/invalid/invalid-relocation-aarch64.test b/lld/test/ELF/invalid/invalid-relocation-aarch64.test
index 84fe86d99d20..8921fbd77d17 100644
--- a/lld/test/ELF/invalid/invalid-relocation-aarch64.test
+++ b/lld/test/ELF/invalid/invalid-relocation-aarch64.test
@@ -19,11 +19,9 @@ Sections:
     Link:            .symtab
     Info:            .text
     Relocations:
-      - Offset:          0x0000000000000000
-        Symbol:          foo
+      - Symbol:          foo
         Type:            0x400
-      - Offset:          0x0000000000000000
-        Symbol:          foo
+      - Symbol:          foo
         Type:            0x401
 Symbols:
   - Name:            foo

diff  --git a/lld/test/ELF/invalid/invalid-relocation-x64.test b/lld/test/ELF/invalid/invalid-relocation-x64.test
index fddc0ce462ce..031f0429f843 100644
--- a/lld/test/ELF/invalid/invalid-relocation-x64.test
+++ b/lld/test/ELF/invalid/invalid-relocation-x64.test
@@ -22,11 +22,9 @@ Sections:
     Link:            .symtab
     Info:            .text
     Relocations:
-      - Offset:          0x0000000000000000
-        Symbol:          foo
+      - Symbol:          foo
         Type:            0x98
-      - Offset:          0x0000000000000000
-        Symbol:          foo
+      - Symbol:          foo
         Type:            0x99
 Symbols:
   - Name:            foo

diff  --git a/lld/test/ELF/invalid/reloc-section-reordered.test b/lld/test/ELF/invalid/reloc-section-reordered.test
index 6bc11ae2c7c1..91f25f61b7e6 100644
--- a/lld/test/ELF/invalid/reloc-section-reordered.test
+++ b/lld/test/ELF/invalid/reloc-section-reordered.test
@@ -20,8 +20,7 @@ Sections:
     Info:            .text
     AddressAlign:    0x04
     Relocations:
-      - Offset:          0
-        Symbol:          .text
+      - Symbol:          .text
         Type:            R_X86_64_NONE
   - Type:            SHT_PROGBITS
     Name:            .text

diff  --git a/lld/test/ELF/relocation-b-aarch64.test b/lld/test/ELF/relocation-b-aarch64.test
index fd3780925330..012bf4540338 100644
--- a/lld/test/ELF/relocation-b-aarch64.test
+++ b/lld/test/ELF/relocation-b-aarch64.test
@@ -30,8 +30,7 @@ Sections:
     Link:            .symtab
     Info:            .text
     Relocations:
-      - Offset:          0
-        Symbol:          bar
+      - Symbol:          bar
         Type:            R_AARCH64_JUMP26
       - Offset:          4
         Symbol:          foo

diff  --git a/lld/test/ELF/relocation-group.test b/lld/test/ELF/relocation-group.test
index f3d49aac886f..b0016c64a673 100644
--- a/lld/test/ELF/relocation-group.test
+++ b/lld/test/ELF/relocation-group.test
@@ -35,8 +35,7 @@ Sections:
     Link:            .symtab
     Info:            .text.foo
     Relocations:
-      - Offset:          0x0000000000000000
-        Symbol:          foo
+      - Symbol:          foo
         Type:            R_X86_64_64
 Symbols:
   - Name:    foo

diff  --git a/lld/test/ELF/shf-info-link.test b/lld/test/ELF/shf-info-link.test
index 2f6f3ff98def..c5ff02769ea9 100644
--- a/lld/test/ELF/shf-info-link.test
+++ b/lld/test/ELF/shf-info-link.test
@@ -24,8 +24,7 @@ Sections:
     Link:            .symtab
     Info:            .text
     Relocations:
-      - Offset:          0x0000000000000000
-        Symbol:          foo
+      - Symbol:          foo
         Type:            R_X86_64_64
 Symbols:
   - Name:           foo

diff  --git a/lld/test/ELF/sht-group-empty.test b/lld/test/ELF/sht-group-empty.test
index f6db349b540e..be51fcadee8f 100644
--- a/lld/test/ELF/sht-group-empty.test
+++ b/lld/test/ELF/sht-group-empty.test
@@ -37,8 +37,7 @@ Sections:
     Link:            .symtab
     Info:            .text.foo
     Relocations:
-      - Offset:          0x0000000000000000
-        Symbol:          foo
+      - Symbol:          foo
         Type:            R_X86_64_64
   - Name:            .rela.text.bar
     Type:            SHT_RELA
@@ -46,8 +45,7 @@ Sections:
     Link:            .symtab
     Info:            .text.bar
     Relocations:
-      - Offset:          0x0000000000000000
-        Symbol:          bar
+      - Symbol:          bar
         Type:            R_X86_64_64
 Symbols:
   - Name:            foo

diff  --git a/lld/test/ELF/undef-broken-debug.test b/lld/test/ELF/undef-broken-debug.test
index 76449a59b739..9423096f9adf 100644
--- a/lld/test/ELF/undef-broken-debug.test
+++ b/lld/test/ELF/undef-broken-debug.test
@@ -25,9 +25,8 @@ Sections:
     Link:            .symtab
     Info:            .text
     Relocations:
-      - Offset:          0x0000000000000000
-        Symbol:          bar
-        Type:            R_X86_64_64
+      - Symbol:      bar
+        Type:        R_X86_64_64
   - Name:            .debug_line
     Type:            SHT_PROGBITS
     Content:         3300000002001C0000000101FB0E0D000101010100000001000001006162632E7300000000000009020000000000000000140208000101

diff  --git a/lld/test/ELF/undef-not-suggest.test b/lld/test/ELF/undef-not-suggest.test
index 0055aaa7745f..b4205cae14d5 100644
--- a/lld/test/ELF/undef-not-suggest.test
+++ b/lld/test/ELF/undef-not-suggest.test
@@ -33,14 +33,12 @@ Sections:
     Relocations:
       ## Relocation which references ".text.foo". Check we don't suggest the
       ## section symbol for ".data", which has an empty name.
-      - Offset: 0x0
+      - Type:   R_X86_64_64
         ## .text.foo
         Symbol: 1
-        Type:   R_X86_64_64
       ## Relocation which references "foo". Check we don't suggest "for".
-      - Offset: 0x8
+      - Type:   R_X86_64_64
         Symbol: foo
-        Type:   R_X86_64_64
   - Name: .data
     Type: SHT_PROGBITS
 Symbols:

diff  --git a/llvm/lib/ObjectYAML/ELFYAML.cpp b/llvm/lib/ObjectYAML/ELFYAML.cpp
index 58f87b2708e3..55589a91d8f4 100644
--- a/llvm/lib/ObjectYAML/ELFYAML.cpp
+++ b/llvm/lib/ObjectYAML/ELFYAML.cpp
@@ -1568,7 +1568,7 @@ void MappingTraits<ELFYAML::Relocation>::mapping(IO &IO,
   const auto *Object = static_cast<ELFYAML::Object *>(IO.getContext());
   assert(Object && "The IO context is not initialized");
 
-  IO.mapRequired("Offset", Rel.Offset);
+  IO.mapOptional("Offset", Rel.Offset, (Hex64)0);
   IO.mapOptional("Symbol", Rel.Symbol);
 
   if (Object->Header.Machine == ELFYAML::ELF_EM(ELF::EM_MIPS) &&

diff  --git a/llvm/test/Object/AArch64/yaml2obj-elf-aarch64-rel.yaml b/llvm/test/Object/AArch64/yaml2obj-elf-aarch64-rel.yaml
index 779c37080844..40eec9497130 100644
--- a/llvm/test/Object/AArch64/yaml2obj-elf-aarch64-rel.yaml
+++ b/llvm/test/Object/AArch64/yaml2obj-elf-aarch64-rel.yaml
@@ -8,8 +8,7 @@
 # CHECK-NEXT:    EntSize:         0x0000000000000018
 # CHECK-NEXT:    Info:            .text
 # CHECK-NEXT:    Relocations:     
-# CHECK-NEXT:      - Offset:          0x0000000000000000
-# CHECK-NEXT:        Symbol:          main
+# CHECK-NEXT:      - Symbol:          main
 # CHECK-NEXT:        Type:            R_AARCH64_ABS64
 # CHECK-NEXT:      - Offset:          0x0000000000000008
 # CHECK-NEXT:        Symbol:          main
@@ -33,8 +32,7 @@ Sections:
     Info:            .text
     AddressAlign:    0x08
     Relocations:
-      - Offset:          0
-        Symbol:          main
+      - Symbol:          main
         Type:            R_AARCH64_ABS64
         Addend:          0
       - Offset:          8

diff  --git a/llvm/test/Object/AMDGPU/elf64-relocs.yaml b/llvm/test/Object/AMDGPU/elf64-relocs.yaml
index ad16e68a3402..6af062fb3182 100644
--- a/llvm/test/Object/AMDGPU/elf64-relocs.yaml
+++ b/llvm/test/Object/AMDGPU/elf64-relocs.yaml
@@ -37,8 +37,7 @@ Sections:
     Info:            .text
     AddressAlign:    0x08
     Relocations:
-      - Offset:          0x0
-        Type:            R_AMDGPU_NONE
+      - Type:            R_AMDGPU_NONE
       - Offset:          0x2
         Type:            R_AMDGPU_ABS32_LO
       - Offset:          0x4

diff  --git a/llvm/test/Object/Lanai/yaml2obj-elf-lanai-rel.yaml b/llvm/test/Object/Lanai/yaml2obj-elf-lanai-rel.yaml
index 23f0b2f6ece9..498fa9dde90d 100644
--- a/llvm/test/Object/Lanai/yaml2obj-elf-lanai-rel.yaml
+++ b/llvm/test/Object/Lanai/yaml2obj-elf-lanai-rel.yaml
@@ -31,8 +31,7 @@ Sections:
     Info:            .text
     AddressAlign:    0x04
     Relocations:
-      - Offset:          0x0
-        Symbol:          main
+      - Symbol:          main
         Type:            R_LANAI_32
       - Offset:          0x4
         Type:            R_LANAI_NONE

diff  --git a/llvm/test/Object/X86/yaml2obj-elf-x86-rel.yaml b/llvm/test/Object/X86/yaml2obj-elf-x86-rel.yaml
index fcc285b7c3cd..6a421479b171 100644
--- a/llvm/test/Object/X86/yaml2obj-elf-x86-rel.yaml
+++ b/llvm/test/Object/X86/yaml2obj-elf-x86-rel.yaml
@@ -25,8 +25,7 @@ Sections:
     Info:            .text
     AddressAlign:    0x04
     Relocations:
-      - Offset:          0
-        Symbol:          main
+      - Symbol:          main
         Type:            R_386_32
 
 Symbols:

diff  --git a/llvm/test/Object/invalid-alignment.test b/llvm/test/Object/invalid-alignment.test
index f77a3afb3e70..66c5fed72a21 100644
--- a/llvm/test/Object/invalid-alignment.test
+++ b/llvm/test/Object/invalid-alignment.test
@@ -25,5 +25,4 @@ Sections:
     Type:            SHT_RELA
     Info:            .foo
     Relocations:
-      - Offset:          0
-        Type:            R_X86_64_NONE
+      - Type:        R_X86_64_NONE

diff  --git a/llvm/test/Object/obj2yaml.test b/llvm/test/Object/obj2yaml.test
index a2b26a24b988..748e713d1a95 100644
--- a/llvm/test/Object/obj2yaml.test
+++ b/llvm/test/Object/obj2yaml.test
@@ -365,8 +365,7 @@
 # ELF-MIPSEL-NEXT:     EntSize:         0x0000000000000008
 # ELF-MIPSEL-NEXT:     Info:            .text
 # ELF-MIPSEL-NEXT:     Relocations:
-# ELF-MIPSEL-NEXT:       - Offset:          0x0000000000000000
-# ELF-MIPSEL-NEXT:         Symbol:          _gp_disp
+# ELF-MIPSEL-NEXT:       - Symbol:          _gp_disp
 # ELF-MIPSEL-NEXT:         Type:            R_MIPS_HI16
 # ELF-MIPSEL-NEXT:       - Offset:          0x0000000000000004
 # ELF-MIPSEL-NEXT:         Symbol:          _gp_disp
@@ -487,8 +486,7 @@
 # ELF-MIPS64EL-NEXT:     EntSize:         0x0000000000000018
 # ELF-MIPS64EL-NEXT:     Info:            .data
 # ELF-MIPS64EL-NEXT:     Relocations:
-# ELF-MIPS64EL-NEXT:       - Offset:          0
-# ELF-MIPS64EL-NEXT:         Symbol:          zed
+# ELF-MIPS64EL-NEXT:       - Symbol:          zed
 # ELF-MIPS64EL-NEXT:         Type:            R_MIPS_64
 # ELF-MIPS64EL-NEXT:   - Name:            .bss
 # ELF-MIPS64EL-NEXT:     Type:            SHT_NOBITS

diff  --git a/llvm/test/Object/objdump-relocations.test b/llvm/test/Object/objdump-relocations.test
index 380783347f67..267402955944 100644
--- a/llvm/test/Object/objdump-relocations.test
+++ b/llvm/test/Object/objdump-relocations.test
@@ -26,8 +26,7 @@ Sections:
     Link: .symtab
     Info: .text
     Relocations:
-      - Offset: 0x0
-        Symbol: .section
+      - Symbol: .section
         Type:   R_386_32
       - Offset: 0x1
         Symbol: symbol
@@ -62,8 +61,7 @@ Sections:
     Link: .symtab
     Info: .text
     Relocations:
-      - Offset: 0x0
-        Symbol: .section
+      - Symbol: .section
         Type:   R_X86_64_32S
       - Offset: 0x1
         Symbol: symbol

diff  --git a/llvm/test/tools/llvm-readobj/ELF/broken-dynamic-reloc.test b/llvm/test/tools/llvm-readobj/ELF/broken-dynamic-reloc.test
index 14c1dfc61170..e13492e07cf1 100644
--- a/llvm/test/tools/llvm-readobj/ELF/broken-dynamic-reloc.test
+++ b/llvm/test/tools/llvm-readobj/ELF/broken-dynamic-reloc.test
@@ -28,8 +28,7 @@ Sections:
     Type:    SHT_RELA
     Link:    .dynsym
     Relocations:
-      - Offset: 0x0
-        Symbol: 1 ## Index of a dynamic symbol with a broken st_name.
+      - Symbol: 1 ## Index of a dynamic symbol with a broken st_name.
         Type:   R_X86_64_NONE
   - Name: .dynamic
     Type: SHT_DYNAMIC
@@ -67,8 +66,7 @@ Sections:
   - Name:    .rela.dyn
     Type:    SHT_RELA
     Relocations:
-      - Offset: 0x0
-        Type:   R_X86_64_NONE
+      - Type:   R_X86_64_NONE
   - Name: .dynamic
     Type: SHT_DYNAMIC
     Entries:
@@ -104,8 +102,7 @@ Sections:
   - Name:    .rela.dyn
     Type:    SHT_RELA
     Relocations:
-      - Offset: 0x0
-        Type:   R_X86_64_NONE
+      - Type:   R_X86_64_NONE
   - Name: .dynamic
     Type: SHT_DYNAMIC
     Entries:
@@ -141,8 +138,7 @@ Sections:
   - Name:    .rela.dyn
     Type:    SHT_REL
     Relocations:
-      - Offset: 0x0
-        Type:   R_386_NONE
+      - Type:   R_386_NONE
   - Name: .dynamic
     Type: SHT_DYNAMIC
     Entries:
@@ -178,8 +174,7 @@ Sections:
   - Name:    .rela.dyn
     Type:    SHT_REL
     Relocations:
-      - Offset: 0x0
-        Type:   R_386_NONE
+      - Type:   R_386_NONE
   - Name: .dynamic
     Type: SHT_DYNAMIC
     Entries:
@@ -354,8 +349,7 @@ Sections:
   - Name:  .rela.plt
     Type:  SHT_RELA
     Relocations:
-      - Offset: 0x0
-        Type:   R_X86_64_NONE
+      - Type:   R_X86_64_NONE
   - Name:  .dynamic
     Type:  SHT_DYNAMIC
     Entries:
@@ -403,10 +397,8 @@ Sections:
   - Name:    .rela.dyn
     Type:    SHT_RELA
     Relocations:
-      - Offset: 0x0
-        Type:   R_X86_64_NONE
-      - Offset: 0x0
-        Type:   R_X86_64_NONE
+      - Type:   R_X86_64_NONE
+      - Type:   R_X86_64_NONE
         Symbol: 0x1
   - Name: .dynamic
     Type: SHT_DYNAMIC
@@ -451,8 +443,7 @@ Sections:
   - Name:    .rela.dyn
     Type:    SHT_RELA
     Relocations:
-      - Offset: 0x0
-        Type:   R_X86_64_NONE
+      - Type:   R_X86_64_NONE
         Symbol: 0x2
   - Name: .dynamic
     Type: SHT_DYNAMIC

diff  --git a/llvm/test/tools/llvm-readobj/ELF/dynamic-reloc-no-section-headers.test b/llvm/test/tools/llvm-readobj/ELF/dynamic-reloc-no-section-headers.test
index fbca989ea371..16e5af819ebe 100644
--- a/llvm/test/tools/llvm-readobj/ELF/dynamic-reloc-no-section-headers.test
+++ b/llvm/test/tools/llvm-readobj/ELF/dynamic-reloc-no-section-headers.test
@@ -29,8 +29,7 @@ Sections:
   - Name:    .rela.dyn
     Type:    SHT_RELA
     Relocations:
-      - Offset: 0x0
-        Type:   R_X86_64_NONE
+      - Type:   R_X86_64_NONE
         Symbol: 0x1
   - Name: .dynamic
     Type: SHT_DYNAMIC

diff  --git a/llvm/test/tools/llvm-readobj/ELF/reloc-types-elf-aarch64.test b/llvm/test/tools/llvm-readobj/ELF/reloc-types-elf-aarch64.test
index fdd3b97b6b26..8245a1564c11 100644
--- a/llvm/test/tools/llvm-readobj/ELF/reloc-types-elf-aarch64.test
+++ b/llvm/test/tools/llvm-readobj/ELF/reloc-types-elf-aarch64.test
@@ -144,8 +144,7 @@ Sections:
     EntSize:      0x0000000000000018
     Info:         .text
     Relocations:
-      - Offset: 0x0000000000000000
-        Type:   R_AARCH64_NONE
+      - Type:   R_AARCH64_NONE
       - Offset: 0x0000000000000004
         Type:   R_AARCH64_ABS64
       - Offset: 0x0000000000000008

diff  --git a/llvm/test/tools/llvm-readobj/ELF/reloc-types-elf-arm.test b/llvm/test/tools/llvm-readobj/ELF/reloc-types-elf-arm.test
index ac6bda68587a..2bd08c9f7f6e 100644
--- a/llvm/test/tools/llvm-readobj/ELF/reloc-types-elf-arm.test
+++ b/llvm/test/tools/llvm-readobj/ELF/reloc-types-elf-arm.test
@@ -153,8 +153,7 @@ Sections:
     EntSize:      0x0000000000000008
     Info:         .text
     Relocations:
-      - Offset: 0x0000000000000000
-        Type:   R_ARM_NONE
+      - Type:   R_ARM_NONE
       - Offset: 0x0000000000000004
         Type:   R_ARM_PC24
       - Offset: 0x0000000000000008

diff  --git a/llvm/test/tools/llvm-readobj/ELF/reloc-types-elf-lanai.test b/llvm/test/tools/llvm-readobj/ELF/reloc-types-elf-lanai.test
index b5804c9aa574..101c0a8e7a97 100644
--- a/llvm/test/tools/llvm-readobj/ELF/reloc-types-elf-lanai.test
+++ b/llvm/test/tools/llvm-readobj/ELF/reloc-types-elf-lanai.test
@@ -30,8 +30,7 @@ Sections:
     EntSize:      0x000000000000000C
     Info:         .text
     Relocations:
-      - Offset: 0x0000000000000000
-        Type:   R_LANAI_NONE
+      - Type:   R_LANAI_NONE
       - Offset: 0x0000000000000004
         Type:   R_LANAI_21
       - Offset: 0x0000000000000008

diff  --git a/llvm/test/tools/llvm-readobj/ELF/reloc-types-elf-mips.test b/llvm/test/tools/llvm-readobj/ELF/reloc-types-elf-mips.test
index 16dfd2f77ddd..1bfe2f4aba72 100644
--- a/llvm/test/tools/llvm-readobj/ELF/reloc-types-elf-mips.test
+++ b/llvm/test/tools/llvm-readobj/ELF/reloc-types-elf-mips.test
@@ -74,8 +74,7 @@ Sections:
     EntSize:      0x0000000000000008
     Info:         .text
     Relocations:
-      - Offset: 0x0000000000000000
-        Type:   R_MIPS_NONE
+      - Type:   R_MIPS_NONE
       - Offset: 0x0000000000000004
         Type:   R_MIPS_16
       - Offset: 0x0000000000000008

diff  --git a/llvm/test/tools/llvm-readobj/ELF/reloc-types-elf-mips64.test b/llvm/test/tools/llvm-readobj/ELF/reloc-types-elf-mips64.test
index f1fefb26974c..8c303d46b728 100644
--- a/llvm/test/tools/llvm-readobj/ELF/reloc-types-elf-mips64.test
+++ b/llvm/test/tools/llvm-readobj/ELF/reloc-types-elf-mips64.test
@@ -74,8 +74,7 @@ Sections:
     EntSize:      0x0000000000000018
     Info:         .text
     Relocations:
-      - Offset: 0x0000000000000000
-        Type:   R_MIPS_NONE
+      - Type:   R_MIPS_NONE
       - Offset: 0x0000000000000004
         Type:   R_MIPS_16
         Type2:  R_MIPS_16

diff  --git a/llvm/test/tools/llvm-readobj/ELF/reloc-types-elf-ppc64.test b/llvm/test/tools/llvm-readobj/ELF/reloc-types-elf-ppc64.test
index 3a00dafb7367..83ef386e9b9e 100644
--- a/llvm/test/tools/llvm-readobj/ELF/reloc-types-elf-ppc64.test
+++ b/llvm/test/tools/llvm-readobj/ELF/reloc-types-elf-ppc64.test
@@ -108,189 +108,96 @@ Sections:
   - Name: .rela.text
     Type: SHT_RELA
     Relocations:
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_NONE
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_ADDR32
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_ADDR24
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_ADDR16
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_ADDR16_LO
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_ADDR16_HI
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_ADDR16_HA
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_ADDR14
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_ADDR14_BRTAKEN
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_ADDR14_BRNTAKEN
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_REL24
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_REL14
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_REL14_BRTAKEN
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_REL14_BRNTAKEN
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT16
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT16_LO
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT16_HI
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT16_HA
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_COPY
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GLOB_DAT
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_JMP_SLOT
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_RELATIVE
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_REL32
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_ADDR64
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_ADDR16_HIGHER
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_ADDR16_HIGHERA
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_ADDR16_HIGHEST
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_ADDR16_HIGHESTA
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_REL64
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TOC16
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TOC16_LO
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TOC16_HI
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TOC16_HA
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TOC
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_ADDR16_DS
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_ADDR16_LO_DS
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT16_DS
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT16_LO_DS
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TOC16_DS
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TOC16_LO_DS
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TLS
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_DTPMOD64
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TPREL16
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TPREL16_LO
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TPREL16_HI
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TPREL16_HA
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TPREL64
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_DTPREL16
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_DTPREL16_LO
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_DTPREL16_HI
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_DTPREL16_HA
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_DTPREL64
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT_TLSGD16
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT_TLSGD16_LO
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT_TLSGD16_HI
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT_TLSGD16_HA
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT_TLSLD16
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT_TLSLD16_LO
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT_TLSLD16_HI
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT_TLSLD16_HA
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT_TPREL16_DS
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT_TPREL16_LO_DS
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT_TPREL16_HI
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT_TPREL16_HA
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT_DTPREL16_DS
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT_DTPREL16_LO_DS
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT_DTPREL16_HI
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT_DTPREL16_HA
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TPREL16_DS
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TPREL16_LO_DS
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TPREL16_HIGHER
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TPREL16_HIGHERA
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TPREL16_HIGHEST
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TPREL16_HIGHESTA
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_DTPREL16_DS
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_DTPREL16_LO_DS
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_DTPREL16_HIGHER
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_DTPREL16_HIGHERA
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_DTPREL16_HIGHEST
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_DTPREL16_HIGHESTA
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TLSGD
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TLSLD
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_ADDR16_HIGH
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_ADDR16_HIGHA
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TPREL16_HIGH
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TPREL16_HIGHA
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_DTPREL16_HIGH
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_DTPREL16_HIGHA
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_IRELATIVE
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_REL16
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_REL16_LO
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_REL16_HI
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_REL16_HA
+      - Type: R_PPC64_NONE
+      - Type: R_PPC64_ADDR32
+      - Type: R_PPC64_ADDR24
+      - Type: R_PPC64_ADDR16
+      - Type: R_PPC64_ADDR16_LO
+      - Type: R_PPC64_ADDR16_HI
+      - Type: R_PPC64_ADDR16_HA
+      - Type: R_PPC64_ADDR14
+      - Type: R_PPC64_ADDR14_BRTAKEN
+      - Type: R_PPC64_ADDR14_BRNTAKEN
+      - Type: R_PPC64_REL24
+      - Type: R_PPC64_REL14
+      - Type: R_PPC64_REL14_BRTAKEN
+      - Type: R_PPC64_REL14_BRNTAKEN
+      - Type: R_PPC64_GOT16
+      - Type: R_PPC64_GOT16_LO
+      - Type: R_PPC64_GOT16_HI
+      - Type: R_PPC64_GOT16_HA
+      - Type: R_PPC64_COPY
+      - Type: R_PPC64_GLOB_DAT
+      - Type: R_PPC64_JMP_SLOT
+      - Type: R_PPC64_RELATIVE
+      - Type: R_PPC64_REL32
+      - Type: R_PPC64_ADDR64
+      - Type: R_PPC64_ADDR16_HIGHER
+      - Type: R_PPC64_ADDR16_HIGHERA
+      - Type: R_PPC64_ADDR16_HIGHEST
+      - Type: R_PPC64_ADDR16_HIGHESTA
+      - Type: R_PPC64_REL64
+      - Type: R_PPC64_TOC16
+      - Type: R_PPC64_TOC16_LO
+      - Type: R_PPC64_TOC16_HI
+      - Type: R_PPC64_TOC16_HA
+      - Type: R_PPC64_TOC
+      - Type: R_PPC64_ADDR16_DS
+      - Type: R_PPC64_ADDR16_LO_DS
+      - Type: R_PPC64_GOT16_DS
+      - Type: R_PPC64_GOT16_LO_DS
+      - Type: R_PPC64_TOC16_DS
+      - Type: R_PPC64_TOC16_LO_DS
+      - Type: R_PPC64_TLS
+      - Type: R_PPC64_DTPMOD64
+      - Type: R_PPC64_TPREL16
+      - Type: R_PPC64_TPREL16_LO
+      - Type: R_PPC64_TPREL16_HI
+      - Type: R_PPC64_TPREL16_HA
+      - Type: R_PPC64_TPREL64
+      - Type: R_PPC64_DTPREL16
+      - Type: R_PPC64_DTPREL16_LO
+      - Type: R_PPC64_DTPREL16_HI
+      - Type: R_PPC64_DTPREL16_HA
+      - Type: R_PPC64_DTPREL64
+      - Type: R_PPC64_GOT_TLSGD16
+      - Type: R_PPC64_GOT_TLSGD16_LO
+      - Type: R_PPC64_GOT_TLSGD16_HI
+      - Type: R_PPC64_GOT_TLSGD16_HA
+      - Type: R_PPC64_GOT_TLSLD16
+      - Type: R_PPC64_GOT_TLSLD16_LO
+      - Type: R_PPC64_GOT_TLSLD16_HI
+      - Type: R_PPC64_GOT_TLSLD16_HA
+      - Type: R_PPC64_GOT_TPREL16_DS
+      - Type: R_PPC64_GOT_TPREL16_LO_DS
+      - Type: R_PPC64_GOT_TPREL16_HI
+      - Type: R_PPC64_GOT_TPREL16_HA
+      - Type: R_PPC64_GOT_DTPREL16_DS
+      - Type: R_PPC64_GOT_DTPREL16_LO_DS
+      - Type: R_PPC64_GOT_DTPREL16_HI
+      - Type: R_PPC64_GOT_DTPREL16_HA
+      - Type: R_PPC64_TPREL16_DS
+      - Type: R_PPC64_TPREL16_LO_DS
+      - Type: R_PPC64_TPREL16_HIGHER
+      - Type: R_PPC64_TPREL16_HIGHERA
+      - Type: R_PPC64_TPREL16_HIGHEST
+      - Type: R_PPC64_TPREL16_HIGHESTA
+      - Type: R_PPC64_DTPREL16_DS
+      - Type: R_PPC64_DTPREL16_LO_DS
+      - Type: R_PPC64_DTPREL16_HIGHER
+      - Type: R_PPC64_DTPREL16_HIGHERA
+      - Type: R_PPC64_DTPREL16_HIGHEST
+      - Type: R_PPC64_DTPREL16_HIGHESTA
+      - Type: R_PPC64_TLSGD
+      - Type: R_PPC64_TLSLD
+      - Type: R_PPC64_ADDR16_HIGH
+      - Type: R_PPC64_ADDR16_HIGHA
+      - Type: R_PPC64_TPREL16_HIGH
+      - Type: R_PPC64_TPREL16_HIGHA
+      - Type: R_PPC64_DTPREL16_HIGH
+      - Type: R_PPC64_DTPREL16_HIGHA
+      - Type: R_PPC64_IRELATIVE
+      - Type: R_PPC64_REL16
+      - Type: R_PPC64_REL16_LO
+      - Type: R_PPC64_REL16_HI
+      - Type: R_PPC64_REL16_HA

diff  --git a/llvm/test/tools/llvm-readobj/ELF/relocation-errors.test b/llvm/test/tools/llvm-readobj/ELF/relocation-errors.test
index add8b9a3342d..aefc0b0f0e16 100644
--- a/llvm/test/tools/llvm-readobj/ELF/relocation-errors.test
+++ b/llvm/test/tools/llvm-readobj/ELF/relocation-errors.test
@@ -47,11 +47,9 @@ Sections:
     Info: .text
     Relocations:
 ## Case 1: There is no symbol with index 0xFEFEFEFE.
-      - Offset: 0x0
-        Symbol: 0xFEFEFEFE
+      - Symbol: 0xFEFEFEFE
         Type:   R_X86_64_NONE
-      - Offset: 0x0
-        Symbol: 0xFEFEFEFE
+      - Symbol: 0xFEFEFEFE
         Type:   R_X86_64_NONE
 ## Case 2: Test that no warning is reported for a relocation against a symbol with index 0.
       - Offset: 0x2

diff  --git a/llvm/test/tools/llvm-readobj/ELF/relocations.test b/llvm/test/tools/llvm-readobj/ELF/relocations.test
index 1b02ad1725a5..5c8e1086e98a 100644
--- a/llvm/test/tools/llvm-readobj/ELF/relocations.test
+++ b/llvm/test/tools/llvm-readobj/ELF/relocations.test
@@ -129,8 +129,7 @@ Sections:
     Type: SHT_REL
     Info: .text
     Relocations:
-      - Offset: 0x0
-        Symbol: rel_0
+      - Symbol: rel_0
         Type:   R_X86_64_NONE
       - Offset: 0x1
         Symbol: rel_neg
@@ -145,8 +144,7 @@ Sections:
     Type: SHT_RELA
     Info: .text
     Relocations:
-      - Offset: 0x0
-        Symbol: rela_0
+      - Symbol: rela_0
         Type:   R_X86_64_NONE
         Addend: 0
       - Offset: 0x1
@@ -315,8 +313,7 @@ Sections:
     Type: SHT_REL
     Info: .text
     Relocations:
-      - Offset: 0x0
-        Symbol: rel_0
+      - Symbol: rel_0
         Type:   R_386_NONE
       - Offset: 0x1
         Symbol: rel_neg
@@ -328,8 +325,7 @@ Sections:
     Type: SHT_RELA
     Info: .text
     Relocations:
-      - Offset: 0x0
-        Symbol: rela_0
+      - Symbol: rela_0
         Type:   R_386_NONE
         Addend: 0
       - Offset: 0x1

diff  --git a/llvm/test/tools/obj2yaml/duplicate-symbol-and-section-names.test b/llvm/test/tools/obj2yaml/duplicate-symbol-and-section-names.test
index 0eba412ffa47..56c0774af0a9 100644
--- a/llvm/test/tools/obj2yaml/duplicate-symbol-and-section-names.test
+++ b/llvm/test/tools/obj2yaml/duplicate-symbol-and-section-names.test
@@ -84,8 +84,7 @@ Symbols:
 # RUN: obj2yaml %t2 | FileCheck %s --check-prefix=CASE2
 
 # CASE2:      Relocations:
-# CASE2-NEXT:  - Offset: 0x0000000000000000
-# CASE2-NEXT:    Symbol: 'foo [1]'
+# CASE2-NEXT:  - Symbol: 'foo [1]'
 # CASE2-NEXT:    Type:   R_X86_64_PC32
 # CASE2-NEXT:  - Offset: 0x0000000000000004
 # CASE2-NEXT:    Symbol: foo
@@ -110,7 +109,6 @@ Sections:
     Link: .symtab
     Relocations:
       - Type: R_X86_64_PC32
-        Offset: 0
         Symbol: 'foo [1]'
       - Type: R_X86_64_PC32
         Offset: 4

diff  --git a/llvm/test/tools/obj2yaml/elf-ppc64-relocations.yaml b/llvm/test/tools/obj2yaml/elf-ppc64-relocations.yaml
index d80d9290cc81..512b71ea4d83 100644
--- a/llvm/test/tools/obj2yaml/elf-ppc64-relocations.yaml
+++ b/llvm/test/tools/obj2yaml/elf-ppc64-relocations.yaml
@@ -14,190 +14,98 @@
 # CHECK-NEXT:     Type:    SHT_RELA
 # CHECK-NEXT:     EntSize: 0x0000000000000018
 # CHECK-NEXT:     Relocations:
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_NONE
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_ADDR32
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_ADDR24
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_ADDR16
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_ADDR16_LO
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_ADDR16_HI
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_ADDR16_HA
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_ADDR14
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_ADDR14_BRTAKEN
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_ADDR14_BRNTAKEN
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_REL24
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_REL14
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_REL14_BRTAKEN
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_REL14_BRNTAKEN
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_GOT16
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_GOT16_LO
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_GOT16_HI
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_GOT16_HA
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_GLOB_DAT
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_JMP_SLOT
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_RELATIVE
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_REL32
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_ADDR64
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_ADDR16_HIGHER
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_ADDR16_HIGHERA
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_ADDR16_HIGHEST
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_ADDR16_HIGHESTA
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_REL64
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_TOC16
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_TOC16_LO
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_TOC16_HI
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_TOC16_HA
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_TOC
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_ADDR16_DS
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_ADDR16_LO_DS
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_GOT16_DS
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_GOT16_LO_DS
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_TOC16_DS
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_TOC16_LO_DS
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_TLS
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_DTPMOD64
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_TPREL16
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_TPREL16_LO
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_TPREL16_HI
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_TPREL16_HA
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_TPREL64
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_DTPREL16
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_DTPREL16_LO
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_DTPREL16_HI
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_DTPREL16_HA
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_DTPREL64
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_GOT_TLSGD16
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_GOT_TLSGD16_LO
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_GOT_TLSGD16_HI
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_GOT_TLSGD16_HA
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_GOT_TLSLD16
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_GOT_TLSLD16_LO
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_GOT_TLSLD16_HI
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_GOT_TLSLD16_HA
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_GOT_TPREL16_DS
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_GOT_TPREL16_LO_DS
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_GOT_TPREL16_HI
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_GOT_TPREL16_HA
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_GOT_DTPREL16_DS
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_GOT_DTPREL16_LO_DS
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_GOT_DTPREL16_HI
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_GOT_DTPREL16_HA
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_TPREL16_DS
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_TPREL16_LO_DS
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_TPREL16_HIGHER
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_TPREL16_HIGHERA
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_TPREL16_HIGHEST
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_TPREL16_HIGHESTA
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_DTPREL16_DS
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_DTPREL16_LO_DS
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_DTPREL16_HIGHER
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_DTPREL16_HIGHERA
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_DTPREL16_HIGHEST
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_DTPREL16_HIGHESTA
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_TLSGD
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_TLSLD
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_ADDR16_HIGH
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_ADDR16_HIGHA
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_TPREL16_HIGH
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_TPREL16_HIGHA
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_DTPREL16_HIGH
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_DTPREL16_HIGHA
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_IRELATIVE
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_REL16
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_REL16_LO
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_REL16_HI
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_PPC64_REL16_HA
+# CHECK-NEXT:       - Type: R_PPC64_NONE
+# CHECK-NEXT:       - Type: R_PPC64_ADDR32
+# CHECK-NEXT:       - Type: R_PPC64_ADDR24
+# CHECK-NEXT:       - Type: R_PPC64_ADDR16
+# CHECK-NEXT:       - Type: R_PPC64_ADDR16_LO
+# CHECK-NEXT:       - Type: R_PPC64_ADDR16_HI
+# CHECK-NEXT:       - Type: R_PPC64_ADDR16_HA
+# CHECK-NEXT:       - Type: R_PPC64_ADDR14
+# CHECK-NEXT:       - Type: R_PPC64_ADDR14_BRTAKEN
+# CHECK-NEXT:       - Type: R_PPC64_ADDR14_BRNTAKEN
+# CHECK-NEXT:       - Type: R_PPC64_REL24
+# CHECK-NEXT:       - Type: R_PPC64_REL14
+# CHECK-NEXT:       - Type: R_PPC64_REL14_BRTAKEN
+# CHECK-NEXT:       - Type: R_PPC64_REL14_BRNTAKEN
+# CHECK-NEXT:       - Type: R_PPC64_GOT16
+# CHECK-NEXT:       - Type: R_PPC64_GOT16_LO
+# CHECK-NEXT:       - Type: R_PPC64_GOT16_HI
+# CHECK-NEXT:       - Type: R_PPC64_GOT16_HA
+# CHECK-NEXT:       - Type: R_PPC64_GLOB_DAT
+# CHECK-NEXT:       - Type: R_PPC64_JMP_SLOT
+# CHECK-NEXT:       - Type: R_PPC64_RELATIVE
+# CHECK-NEXT:       - Type: R_PPC64_REL32
+# CHECK-NEXT:       - Type: R_PPC64_ADDR64
+# CHECK-NEXT:       - Type: R_PPC64_ADDR16_HIGHER
+# CHECK-NEXT:       - Type: R_PPC64_ADDR16_HIGHERA
+# CHECK-NEXT:       - Type: R_PPC64_ADDR16_HIGHEST
+# CHECK-NEXT:       - Type: R_PPC64_ADDR16_HIGHESTA
+# CHECK-NEXT:       - Type: R_PPC64_REL64
+# CHECK-NEXT:       - Type: R_PPC64_TOC16
+# CHECK-NEXT:       - Type: R_PPC64_TOC16_LO
+# CHECK-NEXT:       - Type: R_PPC64_TOC16_HI
+# CHECK-NEXT:       - Type: R_PPC64_TOC16_HA
+# CHECK-NEXT:       - Type: R_PPC64_TOC
+# CHECK-NEXT:       - Type: R_PPC64_ADDR16_DS
+# CHECK-NEXT:       - Type: R_PPC64_ADDR16_LO_DS
+# CHECK-NEXT:       - Type: R_PPC64_GOT16_DS
+# CHECK-NEXT:       - Type: R_PPC64_GOT16_LO_DS
+# CHECK-NEXT:       - Type: R_PPC64_TOC16_DS
+# CHECK-NEXT:       - Type: R_PPC64_TOC16_LO_DS
+# CHECK-NEXT:       - Type: R_PPC64_TLS
+# CHECK-NEXT:       - Type: R_PPC64_DTPMOD64
+# CHECK-NEXT:       - Type: R_PPC64_TPREL16
+# CHECK-NEXT:       - Type: R_PPC64_TPREL16_LO
+# CHECK-NEXT:       - Type: R_PPC64_TPREL16_HI
+# CHECK-NEXT:       - Type: R_PPC64_TPREL16_HA
+# CHECK-NEXT:       - Type: R_PPC64_TPREL64
+# CHECK-NEXT:       - Type: R_PPC64_DTPREL16
+# CHECK-NEXT:       - Type: R_PPC64_DTPREL16_LO
+# CHECK-NEXT:       - Type: R_PPC64_DTPREL16_HI
+# CHECK-NEXT:       - Type: R_PPC64_DTPREL16_HA
+# CHECK-NEXT:       - Type: R_PPC64_DTPREL64
+# CHECK-NEXT:       - Type: R_PPC64_GOT_TLSGD16
+# CHECK-NEXT:       - Type: R_PPC64_GOT_TLSGD16_LO
+# CHECK-NEXT:       - Type: R_PPC64_GOT_TLSGD16_HI
+# CHECK-NEXT:       - Type: R_PPC64_GOT_TLSGD16_HA
+# CHECK-NEXT:       - Type: R_PPC64_GOT_TLSLD16
+# CHECK-NEXT:       - Type: R_PPC64_GOT_TLSLD16_LO
+# CHECK-NEXT:       - Type: R_PPC64_GOT_TLSLD16_HI
+# CHECK-NEXT:       - Type: R_PPC64_GOT_TLSLD16_HA
+# CHECK-NEXT:       - Type: R_PPC64_GOT_TPREL16_DS
+# CHECK-NEXT:       - Type: R_PPC64_GOT_TPREL16_LO_DS
+# CHECK-NEXT:       - Type: R_PPC64_GOT_TPREL16_HI
+# CHECK-NEXT:       - Type: R_PPC64_GOT_TPREL16_HA
+# CHECK-NEXT:       - Type: R_PPC64_GOT_DTPREL16_DS
+# CHECK-NEXT:       - Type: R_PPC64_GOT_DTPREL16_LO_DS
+# CHECK-NEXT:       - Type: R_PPC64_GOT_DTPREL16_HI
+# CHECK-NEXT:       - Type: R_PPC64_GOT_DTPREL16_HA
+# CHECK-NEXT:       - Type: R_PPC64_TPREL16_DS
+# CHECK-NEXT:       - Type: R_PPC64_TPREL16_LO_DS
+# CHECK-NEXT:       - Type: R_PPC64_TPREL16_HIGHER
+# CHECK-NEXT:       - Type: R_PPC64_TPREL16_HIGHERA
+# CHECK-NEXT:       - Type: R_PPC64_TPREL16_HIGHEST
+# CHECK-NEXT:       - Type: R_PPC64_TPREL16_HIGHESTA
+# CHECK-NEXT:       - Type: R_PPC64_DTPREL16_DS
+# CHECK-NEXT:       - Type: R_PPC64_DTPREL16_LO_DS
+# CHECK-NEXT:       - Type: R_PPC64_DTPREL16_HIGHER
+# CHECK-NEXT:       - Type: R_PPC64_DTPREL16_HIGHERA
+# CHECK-NEXT:       - Type: R_PPC64_DTPREL16_HIGHEST
+# CHECK-NEXT:       - Type: R_PPC64_DTPREL16_HIGHESTA
+# CHECK-NEXT:       - Type: R_PPC64_TLSGD
+# CHECK-NEXT:       - Type: R_PPC64_TLSLD
+# CHECK-NEXT:       - Type: R_PPC64_ADDR16_HIGH
+# CHECK-NEXT:       - Type: R_PPC64_ADDR16_HIGHA
+# CHECK-NEXT:       - Type: R_PPC64_TPREL16_HIGH
+# CHECK-NEXT:       - Type: R_PPC64_TPREL16_HIGHA
+# CHECK-NEXT:       - Type: R_PPC64_DTPREL16_HIGH
+# CHECK-NEXT:       - Type: R_PPC64_DTPREL16_HIGHA
+# CHECK-NEXT:       - Type: R_PPC64_IRELATIVE
+# CHECK-NEXT:       - Type: R_PPC64_REL16
+# CHECK-NEXT:       - Type: R_PPC64_REL16_LO
+# CHECK-NEXT:       - Type: R_PPC64_REL16_HI
+# CHECK-NEXT:       - Type: R_PPC64_REL16_HA
 
 --- !ELF
 FileHeader:
@@ -209,187 +117,95 @@ Sections:
   - Name: .rela.text
     Type: SHT_RELA
     Relocations:
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_NONE
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_ADDR32
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_ADDR24
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_ADDR16
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_ADDR16_LO
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_ADDR16_HI
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_ADDR16_HA
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_ADDR14
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_ADDR14_BRTAKEN
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_ADDR14_BRNTAKEN
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_REL24
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_REL14
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_REL14_BRTAKEN
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_REL14_BRNTAKEN
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT16
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT16_LO
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT16_HI
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT16_HA
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GLOB_DAT
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_JMP_SLOT
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_RELATIVE
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_REL32
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_ADDR64
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_ADDR16_HIGHER
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_ADDR16_HIGHERA
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_ADDR16_HIGHEST
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_ADDR16_HIGHESTA
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_REL64
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TOC16
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TOC16_LO
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TOC16_HI
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TOC16_HA
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TOC
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_ADDR16_DS
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_ADDR16_LO_DS
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT16_DS
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT16_LO_DS
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TOC16_DS
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TOC16_LO_DS
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TLS
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_DTPMOD64
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TPREL16
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TPREL16_LO
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TPREL16_HI
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TPREL16_HA
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TPREL64
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_DTPREL16
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_DTPREL16_LO
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_DTPREL16_HI
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_DTPREL16_HA
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_DTPREL64
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT_TLSGD16
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT_TLSGD16_LO
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT_TLSGD16_HI
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT_TLSGD16_HA
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT_TLSLD16
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT_TLSLD16_LO
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT_TLSLD16_HI
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT_TLSLD16_HA
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT_TPREL16_DS
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT_TPREL16_LO_DS
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT_TPREL16_HI
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT_TPREL16_HA
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT_DTPREL16_DS
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT_DTPREL16_LO_DS
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT_DTPREL16_HI
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_GOT_DTPREL16_HA
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TPREL16_DS
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TPREL16_LO_DS
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TPREL16_HIGHER
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TPREL16_HIGHERA
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TPREL16_HIGHEST
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TPREL16_HIGHESTA
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_DTPREL16_DS
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_DTPREL16_LO_DS
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_DTPREL16_HIGHER
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_DTPREL16_HIGHERA
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_DTPREL16_HIGHEST
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_DTPREL16_HIGHESTA
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TLSGD
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TLSLD
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_ADDR16_HIGH
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_ADDR16_HIGHA
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TPREL16_HIGH
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_TPREL16_HIGHA
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_DTPREL16_HIGH
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_DTPREL16_HIGHA
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_IRELATIVE
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_REL16
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_REL16_LO
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_REL16_HI
-      - Offset: 0x0000000000000000
-        Type:   R_PPC64_REL16_HA
+      - Type: R_PPC64_NONE
+      - Type: R_PPC64_ADDR32
+      - Type: R_PPC64_ADDR24
+      - Type: R_PPC64_ADDR16
+      - Type: R_PPC64_ADDR16_LO
+      - Type: R_PPC64_ADDR16_HI
+      - Type: R_PPC64_ADDR16_HA
+      - Type: R_PPC64_ADDR14
+      - Type: R_PPC64_ADDR14_BRTAKEN
+      - Type: R_PPC64_ADDR14_BRNTAKEN
+      - Type: R_PPC64_REL24
+      - Type: R_PPC64_REL14
+      - Type: R_PPC64_REL14_BRTAKEN
+      - Type: R_PPC64_REL14_BRNTAKEN
+      - Type: R_PPC64_GOT16
+      - Type: R_PPC64_GOT16_LO
+      - Type: R_PPC64_GOT16_HI
+      - Type: R_PPC64_GOT16_HA
+      - Type: R_PPC64_GLOB_DAT
+      - Type: R_PPC64_JMP_SLOT
+      - Type: R_PPC64_RELATIVE
+      - Type: R_PPC64_REL32
+      - Type: R_PPC64_ADDR64
+      - Type: R_PPC64_ADDR16_HIGHER
+      - Type: R_PPC64_ADDR16_HIGHERA
+      - Type: R_PPC64_ADDR16_HIGHEST
+      - Type: R_PPC64_ADDR16_HIGHESTA
+      - Type: R_PPC64_REL64
+      - Type: R_PPC64_TOC16
+      - Type: R_PPC64_TOC16_LO
+      - Type: R_PPC64_TOC16_HI
+      - Type: R_PPC64_TOC16_HA
+      - Type: R_PPC64_TOC
+      - Type: R_PPC64_ADDR16_DS
+      - Type: R_PPC64_ADDR16_LO_DS
+      - Type: R_PPC64_GOT16_DS
+      - Type: R_PPC64_GOT16_LO_DS
+      - Type: R_PPC64_TOC16_DS
+      - Type: R_PPC64_TOC16_LO_DS
+      - Type: R_PPC64_TLS
+      - Type: R_PPC64_DTPMOD64
+      - Type: R_PPC64_TPREL16
+      - Type: R_PPC64_TPREL16_LO
+      - Type: R_PPC64_TPREL16_HI
+      - Type: R_PPC64_TPREL16_HA
+      - Type: R_PPC64_TPREL64
+      - Type: R_PPC64_DTPREL16
+      - Type: R_PPC64_DTPREL16_LO
+      - Type: R_PPC64_DTPREL16_HI
+      - Type: R_PPC64_DTPREL16_HA
+      - Type: R_PPC64_DTPREL64
+      - Type: R_PPC64_GOT_TLSGD16
+      - Type: R_PPC64_GOT_TLSGD16_LO
+      - Type: R_PPC64_GOT_TLSGD16_HI
+      - Type: R_PPC64_GOT_TLSGD16_HA
+      - Type: R_PPC64_GOT_TLSLD16
+      - Type: R_PPC64_GOT_TLSLD16_LO
+      - Type: R_PPC64_GOT_TLSLD16_HI
+      - Type: R_PPC64_GOT_TLSLD16_HA
+      - Type: R_PPC64_GOT_TPREL16_DS
+      - Type: R_PPC64_GOT_TPREL16_LO_DS
+      - Type: R_PPC64_GOT_TPREL16_HI
+      - Type: R_PPC64_GOT_TPREL16_HA
+      - Type: R_PPC64_GOT_DTPREL16_DS
+      - Type: R_PPC64_GOT_DTPREL16_LO_DS
+      - Type: R_PPC64_GOT_DTPREL16_HI
+      - Type: R_PPC64_GOT_DTPREL16_HA
+      - Type: R_PPC64_TPREL16_DS
+      - Type: R_PPC64_TPREL16_LO_DS
+      - Type: R_PPC64_TPREL16_HIGHER
+      - Type: R_PPC64_TPREL16_HIGHERA
+      - Type: R_PPC64_TPREL16_HIGHEST
+      - Type: R_PPC64_TPREL16_HIGHESTA
+      - Type: R_PPC64_DTPREL16_DS
+      - Type: R_PPC64_DTPREL16_LO_DS
+      - Type: R_PPC64_DTPREL16_HIGHER
+      - Type: R_PPC64_DTPREL16_HIGHERA
+      - Type: R_PPC64_DTPREL16_HIGHEST
+      - Type: R_PPC64_DTPREL16_HIGHESTA
+      - Type: R_PPC64_TLSGD
+      - Type: R_PPC64_TLSLD
+      - Type: R_PPC64_ADDR16_HIGH
+      - Type: R_PPC64_ADDR16_HIGHA
+      - Type: R_PPC64_TPREL16_HIGH
+      - Type: R_PPC64_TPREL16_HIGHA
+      - Type: R_PPC64_DTPREL16_HIGH
+      - Type: R_PPC64_DTPREL16_HIGHA
+      - Type: R_PPC64_IRELATIVE
+      - Type: R_PPC64_REL16
+      - Type: R_PPC64_REL16_LO
+      - Type: R_PPC64_REL16_HI
+      - Type: R_PPC64_REL16_HA

diff  --git a/llvm/test/tools/obj2yaml/no-symbol-reloc.test b/llvm/test/tools/obj2yaml/no-symbol-reloc.test
index 56d8c1ae101b..97800491a7af 100644
--- a/llvm/test/tools/obj2yaml/no-symbol-reloc.test
+++ b/llvm/test/tools/obj2yaml/no-symbol-reloc.test
@@ -19,8 +19,7 @@
 # CHECK-NEXT:     EntSize: 0x0000000000000018
 # CHECK-NEXT:     Info:    .text
 # CHECK-NEXT:     Relocations:
-# CHECK-NEXT:       - Offset: 0x0000000000000000
-# CHECK-NEXT:         Type:   R_X86_64_NONE
+# CHECK-NEXT:       - Type:   R_X86_64_NONE
 # CHECK-NEXT:       - Offset: 0x0000000000000004
 # CHECK-NEXT:         Type:   R_X86_64_NONE
 # CHECK-NEXT: ...
@@ -39,8 +38,7 @@ Sections:
     Type:  SHT_RELA
     Info:  .text
     Relocations:
-      - Offset: 0x0
-        Type:   R_X86_64_NONE
+      - Type:   R_X86_64_NONE
       - Offset: 0x4
         Type:   R_X86_64_NONE
         Symbol: 0

diff  --git a/llvm/test/tools/yaml2obj/ELF/duplicate-symbol-names.yaml b/llvm/test/tools/yaml2obj/ELF/duplicate-symbol-names.yaml
index 0e50042a6c3d..a889254e4fca 100644
--- a/llvm/test/tools/yaml2obj/ELF/duplicate-symbol-names.yaml
+++ b/llvm/test/tools/yaml2obj/ELF/duplicate-symbol-names.yaml
@@ -90,8 +90,7 @@ Sections:
     Info: .text
     Link: .symtab
     Relocations:
-      - Offset: 0x0
-        Type:   R_X86_64_NONE
+      - Type:   R_X86_64_NONE
         Symbol: foo
       - Offset: 0x1
         Type:   R_X86_64_NONE

diff  --git a/llvm/test/tools/yaml2obj/ELF/dynamic-relocations.yaml b/llvm/test/tools/yaml2obj/ELF/dynamic-relocations.yaml
index 2e2d3801f636..8964877467f4 100644
--- a/llvm/test/tools/yaml2obj/ELF/dynamic-relocations.yaml
+++ b/llvm/test/tools/yaml2obj/ELF/dynamic-relocations.yaml
@@ -28,8 +28,7 @@ Sections:
     Link: .dynsym
     Info: .data
     Relocations:
-      - Offset: 0
-        Type: R_X86_64_NONE
+      - Type: R_X86_64_NONE
         Symbol: dynamic
       - Offset: 8
         Type: R_X86_64_NONE

diff  --git a/llvm/test/tools/yaml2obj/ELF/relocation-explicit-symbol-index.yaml b/llvm/test/tools/yaml2obj/ELF/relocation-explicit-symbol-index.yaml
index f4078dfc0ad6..90429f4bd6f1 100644
--- a/llvm/test/tools/yaml2obj/ELF/relocation-explicit-symbol-index.yaml
+++ b/llvm/test/tools/yaml2obj/ELF/relocation-explicit-symbol-index.yaml
@@ -27,10 +27,8 @@ Sections:
     Link: .symtab
     Relocations:
       - Type: R_X86_64_PC32
-        Offset: 0
         Symbol: 0x42
       - Type: R_X86_64_PC32
-        Offset: 0
         Symbol: 0x1
 Symbols:
   - Name: foo

diff  --git a/llvm/test/tools/yaml2obj/ELF/relocation-missing-symbol.yaml b/llvm/test/tools/yaml2obj/ELF/relocation-missing-symbol.yaml
index 6a785983c8fe..2f8d98dee18a 100644
--- a/llvm/test/tools/yaml2obj/ELF/relocation-missing-symbol.yaml
+++ b/llvm/test/tools/yaml2obj/ELF/relocation-missing-symbol.yaml
@@ -23,8 +23,6 @@ Sections:
     Link: .symtab
     Relocations:
       - Type: R_X86_64_PC32
-        Offset: 0
         Symbol: does_not_exist1
       - Type: R_X86_64_PC32
-        Offset: 0
         Symbol: does_not_exist2

diff  --git a/llvm/test/tools/yaml2obj/ELF/symbol-name.yaml b/llvm/test/tools/yaml2obj/ELF/symbol-name.yaml
index 599676fcf6ae..c1c69cfcbb3b 100644
--- a/llvm/test/tools/yaml2obj/ELF/symbol-name.yaml
+++ b/llvm/test/tools/yaml2obj/ELF/symbol-name.yaml
@@ -76,8 +76,7 @@ Sections:
   - Name: .rela.data
     Type: SHT_RELA
     Relocations:
-      - Offset: 0x0
-        Type:   R_X86_64_NONE
+      - Type:   R_X86_64_NONE
         Symbol: foo
 Symbols:
   - Name:   foo


        


More information about the llvm-commits mailing list