diff --git a/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp b/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp index 35257320b9d6..cc1c12ea0cec 100644 --- a/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp +++ b/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp @@ -966,7 +966,7 @@ struct MappingTraits { lld::DefinedAtom::deadStripNormal); io.mapOptional("permissions", keys->_permissions, lld::DefinedAtom::permR_X); - io.mapOptional("fixups", keys->_references); + io.mapOptional("references", keys->_references); } }; diff --git a/lld/test/darwin/hello-world.objtxt b/lld/test/darwin/hello-world.objtxt index b2e42d15e969..3b99933eb336 100644 --- a/lld/test/darwin/hello-world.objtxt +++ b/lld/test/darwin/hello-world.objtxt @@ -12,7 +12,7 @@ defined-atoms: content: [ 55, 48, 89, E5, 48, 8D, 3D, 00, 00, 00, 00, E8, 00, 00, 00, 00, 31, C0, 5D, C3 ] - fixups: + references: - offset: 7 kind: pcrel32 target: LC1 diff --git a/lld/test/dead-strip-basic.objtxt b/lld/test/dead-strip-basic.objtxt index a647d9d69274..206e3d8d6734 100644 --- a/lld/test/dead-strip-basic.objtxt +++ b/lld/test/dead-strip-basic.objtxt @@ -10,7 +10,7 @@ defined-atoms: - name: entry dead-strip: never - fixups: + references: - offset: 1 kind: pcrel32 target: bar diff --git a/lld/test/dead-strip-globals.objtxt b/lld/test/dead-strip-globals.objtxt index 3c975d69e792..234600b3a13c 100644 --- a/lld/test/dead-strip-globals.objtxt +++ b/lld/test/dead-strip-globals.objtxt @@ -9,7 +9,7 @@ defined-atoms: - name: entry dead-strip: never - fixups: + references: - offset: 1 kind: pcrel32 target: bar diff --git a/lld/test/elf/branch.objtxt b/lld/test/elf/branch.objtxt index ce3caee2169d..188d68370ed4 100644 --- a/lld/test/elf/branch.objtxt +++ b/lld/test/elf/branch.objtxt @@ -9,7 +9,7 @@ hexagon-yaml: 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, hexagon-yaml: section-choice: custom-required hexagon-yaml: section-name: .text -hexagon-yaml: fixups: +hexagon-yaml: references: hexagon-yaml: - kind: hexagon-yaml: offset: 4 hexagon-yaml: target: target @@ -19,7 +19,7 @@ hexagon-yaml: scope: global hexagon-yaml: content: [ 00, C0, 00, 5A ] hexagon-yaml: section-choice: custom-required hexagon-yaml: section-name: .text -hexagon-yaml: fixups: +hexagon-yaml: references: hexagon-yaml: - kind: hexagon-yaml: offset: 0 hexagon-yaml: target: back diff --git a/lld/test/elf/reloc.objtxt b/lld/test/elf/reloc.objtxt index aedb06d85b8f..0f569248eaf5 100644 --- a/lld/test/elf/reloc.objtxt +++ b/lld/test/elf/reloc.objtxt @@ -32,7 +32,7 @@ ELF-i386: 00, 00, 00, 00, E8, FC, FF, FF, FF, 31, C0, ELF-i386: C3 ] ELF-i386: section-choice: custom-required ELF-i386: section-name: .text.startup -ELF-i386: fixups: +ELF-i386: references: ELF-i386: - kind: ??? ELF-i386: offset: 12 ELF-i386: target: .rodata.str1.1 @@ -59,7 +59,7 @@ ELF-i386: 19, 00, 00, 00, 00, 41, 0E, 08, 85, 02, 42, ELF-i386: 05, 55, C5, 0C, 04, 04, 00, 00 ] ELF-i386: section-choice: custom-required ELF-i386: section-name: .eh_frame -ELF-i386: fixups: +ELF-i386: references: ELF-i386: - kind: call32 ELF-i386: offset: 32 ELF-i386: target: .text.startup diff --git a/lld/test/elf/x86.objtxt b/lld/test/elf/x86.objtxt index 750a0a775157..386da17bf646 100644 --- a/lld/test/elf/x86.objtxt +++ b/lld/test/elf/x86.objtxt @@ -23,7 +23,7 @@ RUN: lld-core -reader ELF -arch=i386 %p/Inputs/reloc-xb.x86 %p/Inputs/reloc-xt.x x86-yaml: - name: back x86-yaml: scope: global x86-yaml: content: [ E8, FC, FF, FF, FF ] -x86-yaml: fixups: +x86-yaml: references: x86-yaml: - kind: call32 x86-yaml: offset: 1 x86-yaml: target: target @@ -31,7 +31,7 @@ x86-yaml: target: target x86-yaml: - name: target x86-yaml: scope: global x86-yaml: content: [ E8, FC, FF, FF, FF ] -x86-yaml: fixups: +x86-yaml: references: x86-yaml: - kind: call32 x86-yaml: offset: 1 x86-yaml: target: back diff --git a/lld/test/error-fixup-attribute.objtxt b/lld/test/error-fixup-attribute.objtxt index 1942e086d52c..560ef96a77ef 100644 --- a/lld/test/error-fixup-attribute.objtxt +++ b/lld/test/error-fixup-attribute.objtxt @@ -9,7 +9,7 @@ defined-atoms: - name: entry scope: hidden - fixups: + references: - offset: 3 kind: 3 weasel: bar diff --git a/lld/test/error-fixup-target.objtxt b/lld/test/error-fixup-target.objtxt index 3d4220c1b5f6..f6c37fb8de7e 100644 --- a/lld/test/error-fixup-target.objtxt +++ b/lld/test/error-fixup-target.objtxt @@ -9,7 +9,7 @@ defined-atoms: - name: entry scope: hidden - fixups: + references: - offset: 3 kind: 3 target: bar diff --git a/lld/test/fixups-addend.objtxt b/lld/test/fixups-addend.objtxt index 2ccea16633f1..c812f584ef72 100644 --- a/lld/test/fixups-addend.objtxt +++ b/lld/test/fixups-addend.objtxt @@ -1,7 +1,7 @@ # RUN: lld-core %s | FileCheck %s # -# Test addends in fixups +# Test addends in references # --- @@ -10,7 +10,7 @@ defined-atoms: type: code content: [ 48, 8D, 3D, 00, 00, 00, 00, 48, 8D, 3D, 00, 00, 00, 00 ] - fixups: + references: - offset: 3 kind: 3 target: bar @@ -24,7 +24,7 @@ defined-atoms: type: code content: [ 48, 8D, 3D, 00, 00, 00, 00, 48, 8D, 3D, 00, 00, 00, 00 ] - fixups: + references: - offset: 3 kind: 3 target: bar @@ -41,10 +41,10 @@ undefined-atoms: ... # CHECK: name: foo -# CHECK: fixups: +# CHECK: references: # CHECK: addend: 100 # CHECK: addend: -50 # CHECK: name: func -# CHECK: fixups: +# CHECK: references: # CHECK: addend: 8000000000 # CHECK: addend: -50 diff --git a/lld/test/fixups-dup-named.objtxt b/lld/test/fixups-dup-named.objtxt index 7e78687d5d50..e66297a24322 100644 --- a/lld/test/fixups-dup-named.objtxt +++ b/lld/test/fixups-dup-named.objtxt @@ -1,7 +1,7 @@ # RUN: lld-core %s | FileCheck %s # -# Test fixups referencing multiple atoms that have the same name +# Test references referencing multiple atoms that have the same name # --- @@ -9,7 +9,7 @@ defined-atoms: - name: foo type: code content: [ E8, 00, 00, 00, 00, E8, 00, 00, 00, 00 ] - fixups: + references: - offset: 1 kind: 3 target: bar_1 diff --git a/lld/test/fixups-named.objtxt b/lld/test/fixups-named.objtxt index 1cb5b31b0b06..61d16ebf71d1 100644 --- a/lld/test/fixups-named.objtxt +++ b/lld/test/fixups-named.objtxt @@ -1,7 +1,7 @@ # RUN: lld-core %s | FileCheck %s # -# Test fixups to simple named atoms +# Test references to simple named atoms # --- @@ -10,7 +10,7 @@ defined-atoms: type: code content: [ E8, 00, 00, 00, 00, E8, 00, 00, 00, 00 ] - fixups: + references: - offset: 1 kind: 3 target: bar @@ -29,7 +29,7 @@ undefined-atoms: ... # CHECK: name: foo -# CHECK: fixups: +# CHECK: references: # CHECK: target: bar # CHECK: target: baz # CHECK: ... diff --git a/lld/test/fixups-unnamed.objtxt b/lld/test/fixups-unnamed.objtxt index 340e1487847f..20cf373580e4 100644 --- a/lld/test/fixups-unnamed.objtxt +++ b/lld/test/fixups-unnamed.objtxt @@ -1,7 +1,7 @@ # RUN: lld-core %s | FileCheck %s # -# Test fixups to unnamed atoms +# Test references to unnamed atoms # --- @@ -10,7 +10,7 @@ defined-atoms: type: code content: [ 48, 8D, 3D, 00, 00, 00, 00, 48, 8D, 3D, 00, 00, 00, 00 ] - fixups: + references: - offset: 3 kind: 3 target: LC1 @@ -33,7 +33,7 @@ defined-atoms: ... # CHECK: name: foo -# CHECK: fixups: +# CHECK: references: # CHECK: offset: 3 # CHECK: offset: 10 # CHECK: ref-name: diff --git a/lld/test/pass-got-basic.objtxt b/lld/test/pass-got-basic.objtxt index d1f04f6dc1c2..45ba1550cfe8 100644 --- a/lld/test/pass-got-basic.objtxt +++ b/lld/test/pass-got-basic.objtxt @@ -15,7 +15,7 @@ defined-atoms: 48, 83, 3D, 00, 00, 00, 00, 00, 48, 83, 3D, 00, 00, 00, 00, 00, 48, 83, 3D, 00, 00, 00, 00, 00 ] - fixups: + references: - offset: 3 kind: gotLoad32 target: malloc @@ -51,7 +51,7 @@ shared-library-atoms: # CHECK: defined-atoms: # CHECK: name: foo -# CHECK: fixups: +# CHECK: references: # CHECK: kind: pcrel32 # CHECK: offset: 3 # CHECK: target: L diff --git a/lld/test/pass-stubs-basic.objtxt b/lld/test/pass-stubs-basic.objtxt index d05ba139c249..29279f29e784 100644 --- a/lld/test/pass-stubs-basic.objtxt +++ b/lld/test/pass-stubs-basic.objtxt @@ -10,7 +10,7 @@ defined-atoms: type: code content: [ E8, 00, 00, 00, 00, E8, 00, 00, 00, 00, 48 ,8B, 05, 00, 00, 00, 00 ] - fixups: + references: - offset: 1 kind: call32 target: malloc @@ -31,7 +31,7 @@ shared-library-atoms: ... # CHECK: name: foo -# CHECK: fixups: +# CHECK: references: # CHECK: kind: call32 # CHECK: target: L # CHECK: kind: call32