[PATCH] D68214: [yaml2obj] - Allow specifying custom Link values for SHT_HASH section.

[George Rimar via Phabricator via llvm-commits]

grimar created this revision.
grimar added reviewers: jhenderson, MaskRay.
grimar edited the summary of this revision.

This allows setting any sh_link values for SHT_HASH sections.

Depends on D68085 <https://reviews.llvm.org/D68085>.


https://reviews.llvm.org/D68214

Files:
  lib/ObjectYAML/ELFEmitter.cpp
  test/tools/yaml2obj/elf-hash-section.yaml


Index: test/tools/yaml2obj/elf-hash-section.yaml
===================================================================
--- test/tools/yaml2obj/elf-hash-section.yaml
+++ test/tools/yaml2obj/elf-hash-section.yaml
@@ -145,3 +145,35 @@
 Sections:
   - Name:  .hash
     Type:  SHT_HASH
+
+## Check we can set any sh_link value with use of the "Link" tag.
+
+# RUN: yaml2obj --docnum=8 %s -o %t8
+# RUN: llvm-readobj --sections %t8 | FileCheck %s --check-prefix=LINK
+
+# LINK: Name: .hash1
+# LINK: Link:
+# LINK-SAME: 123
+
+# LINK: Name: .hash2
+# LINK: Link:
+# LINK-SAME: 1
+
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS32
+  Data:    ELFDATA2LSB
+  Type:    ET_DYN
+  Machine: EM_386
+Sections:
+  - Name: .hash1
+    Type: SHT_HASH
+    Content: ""
+    Link: 123
+  - Name: .hash2
+    Type: SHT_HASH
+    Content: ""
+    Link: .hash1
+## SHT_HASH is linked to dynamic symbol table by default if it exists.
+  - Name: .dynsym
+    Type: SHT_DYNSYM
Index: lib/ObjectYAML/ELFEmitter.cpp
===================================================================
--- lib/ObjectYAML/ELFEmitter.cpp
+++ lib/ObjectYAML/ELFEmitter.cpp
@@ -821,7 +821,7 @@
       CBA.getOSAndAlignedOffset(SHeader.sh_offset, SHeader.sh_addralign);
 
   unsigned Link = 0;
-  if (SN2I.lookup(".dynsym", Link))
+  if (Section.Link.empty() && SN2I.lookup(".dynsym", Link))
     SHeader.sh_link = Link;
 
   if (Section.Content) {


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D68214.222405.patch
Type: text/x-patch
Size: 1396 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190930/b04ee15b/attachment.bin>