[yaml2obj] - Allow to use numeric sh_link (Link) value for sections.
authorGeorge Rimar <grimar@accesssoftek.com>
Thu, 16 Aug 2018 12:44:17 +0000 (12:44 +0000)
committerGeorge Rimar <grimar@accesssoftek.com>
Thu, 16 Aug 2018 12:44:17 +0000 (12:44 +0000)
That change allows using numeric values for Link field.
It is consistent with the code for another fields in this method.

llvm-svn: 339873

llvm/test/tools/yaml2obj/section-link.yaml [new file with mode: 0644]
llvm/tools/yaml2obj/yaml2elf.cpp

diff --git a/llvm/test/tools/yaml2obj/section-link.yaml b/llvm/test/tools/yaml2obj/section-link.yaml
new file mode 100644 (file)
index 0000000..3045d36
--- /dev/null
@@ -0,0 +1,25 @@
+# RUN: yaml2obj %s -o %t
+# RUN: llvm-readobj -sections %t | FileCheck %s
+
+# CHECK:      Name: .text
+# CHECK-NEXT: Type: SHT_PROGBITS
+# CHECK-NEXT: Flags [
+# CHECK-NEXT:   SHF_ALLOC
+# CHECK-NEXT:   SHF_EXECINSTR
+# CHECK-NEXT: ]
+# CHECK-NEXT: Address:
+# CHECK-NEXT: Offset:
+# CHECK-NEXT: Size:
+# CHECK-NEXT: Link: 12345
+
+--- !ELF
+FileHeader:
+  Class:           ELFCLASS64
+  Data:            ELFDATA2LSB
+  Type:            ET_REL
+  Machine:         EM_X86_64
+Sections:
+  - Name:            .text
+    Type:            SHT_PROGBITS
+    Flags:           [ SHF_ALLOC, SHF_EXECINSTR ]
+    Link:            12345
index 99f55d1..28ffa88 100644 (file)
@@ -245,7 +245,7 @@ bool ELFState<ELFT>::initSectionHeaders(std::vector<Elf_Shdr> &SHeaders,
 
     if (!Sec->Link.empty()) {
       unsigned Index;
-      if (SN2I.lookup(Sec->Link, Index)) {
+      if (SN2I.lookup(Sec->Link, Index) && !to_integer(Sec->Link, Index)) {
         WithColor::error() << "Unknown section referenced: '" << Sec->Link
                            << "' at YAML section '" << Sec->Name << "'.\n";
         return false;