[yaml2obj][obj2yaml] - Add support for dumping/parsing .dynamic sections.

[grimar]

Summary

This teaches the tools to parse and dump
the .dynamic section and its dynamic tags.

[jhenderson]

@amontanez has already put something similar up for review here as D56569.

There was a corresponding llvm-dev email thread to discuss it further here:
http://lists.llvm.org/pipermail/llvm-dev/2019-January/129231.html

which didn't get much traction.

[grimar]

In D57691#1383238, @jhenderson wrote:

@amontanez has already put something similar up for review here as D56569.

There was a corresponding llvm-dev email thread to discuss it further here:
http://lists.llvm.org/pipermail/llvm-dev/2019-January/129231.html

which didn't get much traction.

Interesting. I did not see it. D56569 seems to do a lot of different things.

FTR, my main intentions were the following:

1. I looked how to dump/parse ELF versioning sections and found we sometimes might want to access

the dynamic tags values. For example:

DT_VERDEFNUM The number of entries in DT_VERDEF.
DT_VERNEEDNUM The number of entries in DT_VERNEED.

2. I noticed that some of our tests (For example, "binary-read-bad-vaddr.test" and lots of others improved by this patch)

want to see the particular tags and values and there was no way to do that (without editing the raw binary section content).

So I decided to implement the simple solution that would allow accessing and changing the dynamic entries from yaml and the code.

[ruiu]

I think this is a good change -- it seems like it does the right thing and works as a good starter to add more fields. James, are you okay with this change?

[jhenderson]

This change basically looks fine in itself. From what I remember of the discussion around D56569, there isn't anything here in the behaviour that conflicts with that change, I believe.

lib/ObjectYAML/ELFYAML.cpp

677 ↗

(On Diff #185055)

I may be missing something, but why is this line different to the equivalent for e.g. the relocations above?

test/tools/llvm-readobj/gnu-hash-symbols.test

77 ↗

(On Diff #185055)

Not that it really matters, but any particular reason you've moved this to before the Link field?

[grimar]

lib/ObjectYAML/ELFYAML.cpp

677 ↗

(On Diff #185055)

See how relocations are declared. For example in ELFRelocs/RISCV.def:

ELF_RELOC(R_RISCV_NONE,               0)
ELF_RELOC(R_RISCV_32,                 1)
...

But dynamic tags are refined without prefix DT_*:

DYNAMIC_TAG(NULL, 0)        // Marks end of dynamic array.
DYNAMIC_TAG(NEEDED, 1)      // String table offset of needed library.

ELF.h declares an enum like that:

enum {
#define DYNAMIC_TAG(name, value) DT_##name = value,
#include "DynamicTags.def"
#undef DYNAMIC_TAG
};

(https://github.com/llvm-mirror/llvm/blob/master/include/llvm/BinaryFormat/ELF.h#L1242)

Do I had to use ELF::DT_##X.

The reason I used STRINGIFY and STRINGIFY(DT_##X) is that I think we should dump
tags as DT_TAGNAME and not just TAGNAME because:

1. That is consistent with how we dump relocations (we dump them with R_* prefix.
2. Dumping just a tag name does not look clear to me. DT_NEEDED looks better than NEEDED IMO.

DT_NULL is more clear than just NULL and so on.

test/tools/llvm-readobj/gnu-hash-symbols.test

77 ↗

(On Diff #185055)

No. I had to use yaml2obj with the old YAMLs to convert then objects to a new YAML format (to update the tests),
so seems it just the natural order of the fields now (i.e. obj2yaml writes them in this order). I did not try to swap the lines intentionally and/or manually.

[jhenderson]

Okay, LGTM.

[amontanez]

Oof, my email filters somehow didn't send the discussion here to my inbox. Sorry! I'm fine with this landing as-is, I can just rebase on top of it. I think the only significant deviance from the RFC is future improvements require that DynamicEntry::Val is a StringRef instead of llvm::yaml::Hex64, but I can address that later.

llvm/trunk/include/llvm/ObjectYAML/ELFYAML.h

 LLVM_YAML_STRONG_TYPEDEF(uint16_t, ELF_ET)
 LLVM_YAML_STRONG_TYPEDEF(uint32_t, ELF_PT)
 LLVM_YAML_STRONG_TYPEDEF(uint32_t, ELF_EM)
 LLVM_YAML_STRONG_TYPEDEF(uint8_t, ELF_ELFCLASS)
 LLVM_YAML_STRONG_TYPEDEF(uint8_t, ELF_ELFDATA)
 LLVM_YAML_STRONG_TYPEDEF(uint8_t, ELF_ELFOSABI)
 // Just use 64, since it can hold 32-bit values too.
 LLVM_YAML_STRONG_TYPEDEF(uint64_t, ELF_EF)
+// Just use 64, since it can hold 32-bit values too.
+LLVM_YAML_STRONG_TYPEDEF(uint64_t, ELF_DYNTAG)
 LLVM_YAML_STRONG_TYPEDEF(uint32_t, ELF_PF)
 LLVM_YAML_STRONG_TYPEDEF(uint32_t, ELF_SHT)
 LLVM_YAML_STRONG_TYPEDEF(uint32_t, ELF_REL)
 LLVM_YAML_STRONG_TYPEDEF(uint8_t, ELF_RSS)
 // Just use 64, since it can hold 32-bit values too.
 LLVM_YAML_STRONG_TYPEDEF(uint64_t, ELF_SHF)
 LLVM_YAML_STRONG_TYPEDEF(uint16_t, ELF_SHN)
 LLVM_YAML_STRONG_TYPEDEF(uint8_t, ELF_STT)
struct LocalGlobalWeakSymbols {
   std::vector<Symbol> Global;
   std::vector<Symbol> Weak;
 };
 
 struct SectionOrType {
   StringRef sectionNameOrType;
 };
 
+struct DynamicEntry {
+  ELF_DYNTAG Tag;
+  llvm::yaml::Hex64 Val;
+};
+
 struct Section {
   enum class SectionKind {
+    Dynamic,
     Group,
     RawContent,
     Relocation,
     NoBits,
     MipsABIFlags
   };
   SectionKind Kind;
   StringRef Name;
   ELF_SHT Type;
   ELF_SHF Flags;
   llvm::yaml::Hex64 Address;
   StringRef Link;
   StringRef Info;
   llvm::yaml::Hex64 AddressAlign;
   Optional<llvm::yaml::Hex64> EntSize;
 
   Section(SectionKind Kind) : Kind(Kind) {}
   virtual ~Section();
 };
+
+struct DynamicSection : Section {
+  std::vector<DynamicEntry> Entries;
+
+  DynamicSection() : Section(SectionKind::Dynamic) {}
+
+  static bool classof(const Section *S) {
+    return S->Kind == SectionKind::Dynamic;
+  }
+};
+
 struct RawContentSection : Section {
   yaml::BinaryRef Content;
   llvm::yaml::Hex64 Size;
 
   RawContentSection() : Section(SectionKind::RawContent) {}
 
   static bool classof(const Section *S) {
     return S->Kind == SectionKind::RawContent;
struct Object {
   // being a single SHT_SYMTAB section are upheld.
   LocalGlobalWeakSymbols Symbols;
   LocalGlobalWeakSymbols DynamicSymbols;
 };
 
 } // end namespace ELFYAML
 } // end namespace llvm
 
+LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::ELFYAML::DynamicEntry)
 LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::ELFYAML::ProgramHeader)
 LLVM_YAML_IS_SEQUENCE_VECTOR(std::unique_ptr<llvm::ELFYAML::Section>)
 LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::ELFYAML::Symbol)
 LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::ELFYAML::Relocation)
 LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::ELFYAML::SectionOrType)
 LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::ELFYAML::SectionName)
 
 namespace llvm {

 };
 
 template <>
 struct ScalarEnumerationTraits<ELFYAML::ELF_REL> {
   static void enumeration(IO &IO, ELFYAML::ELF_REL &Value);
 };
 
 template <>
+struct ScalarEnumerationTraits<ELFYAML::ELF_DYNTAG> {
+  static void enumeration(IO &IO, ELFYAML::ELF_DYNTAG &Value);
+};
+
+template <>
 struct ScalarEnumerationTraits<ELFYAML::ELF_RSS> {
   static void enumeration(IO &IO, ELFYAML::ELF_RSS &Value);
 };
 
 template <>
 struct ScalarEnumerationTraits<ELFYAML::MIPS_AFL_REG> {
   static void enumeration(IO &IO, ELFYAML::MIPS_AFL_REG &Value);
 };
struct MappingTraits<ELFYAML::Symbol> {
   static StringRef validate(IO &IO, ELFYAML::Symbol &Symbol);
 };
 
 template <>
 struct MappingTraits<ELFYAML::LocalGlobalWeakSymbols> {
   static void mapping(IO &IO, ELFYAML::LocalGlobalWeakSymbols &Symbols);
 };
 
+template <> struct MappingTraits<ELFYAML::DynamicEntry> {
+  static void mapping(IO &IO, ELFYAML::DynamicEntry &Rel);
+};
+
 template <> struct MappingTraits<ELFYAML::Relocation> {
   static void mapping(IO &IO, ELFYAML::Relocation &Rel);
 };
 
 template <>
 struct MappingTraits<std::unique_ptr<ELFYAML::Section>> {
   static void mapping(IO &IO, std::unique_ptr<ELFYAML::Section> &Section);
   static StringRef validate(IO &io, std::unique_ptr<ELFYAML::Section> &Section);

llvm/trunk/lib/ObjectYAML/ELFYAML.cpp

#include "llvm/BinaryFormat/ELFRelocs/BPF.def"
     break;
   default:
     llvm_unreachable("Unsupported architecture");
   }
 #undef ELF_RELOC
   IO.enumFallback<Hex32>(Value);
 }
 
+void ScalarEnumerationTraits<ELFYAML::ELF_DYNTAG>::enumeration(
+    IO &IO, ELFYAML::ELF_DYNTAG &Value) {
+  const auto *Object = static_cast<ELFYAML::Object *>(IO.getContext());
+  assert(Object && "The IO context is not initialized");
+
+// TODO: For simplicity we do not handle target specific flags. They are
+// still supported and will be shown as a raw numeric values in the output.
+#define MIPS_DYNAMIC_TAG(name, value)
+#define HEXAGON_DYNAMIC_TAG(name, value)
+#define PPC64_DYNAMIC_TAG(name, value)
+// Also ignore marker tags such as DT_HIOS (maps to DT_VERNEEDNUM), etc.
+#define DYNAMIC_TAG_MARKER(name, value)
+
+#define STRINGIFY(X) (#X)
+#define DYNAMIC_TAG(X, Y) IO.enumCase(Value, STRINGIFY(DT_##X), ELF::DT_##X);
+#include "llvm/BinaryFormat/DynamicTags.def"
+
+#undef MIPS_DYNAMIC_TAG
+#undef HEXAGON_DYNAMIC_TAG
+#undef PPC64_DYNAMIC_TAG
+#undef DYNAMIC_TAG_MARKER
+#undef STRINGIFY
+#undef DYNAMIC_TAG
+
+  IO.enumFallback<Hex64>(Value);
+}
+
 void ScalarEnumerationTraits<ELFYAML::MIPS_AFL_REG>::enumeration(
     IO &IO, ELFYAML::MIPS_AFL_REG &Value) {
 #define ECase(X) IO.enumCase(Value, #X, Mips::AFL_##X)
   ECase(REG_NONE);
   ECase(REG_32);
   ECase(REG_64);
   ECase(REG_128);
 #undef ECase
static void commonSectionMapping(IO &IO, ELFYAML::Section &Section) {
   IO.mapOptional("Flags", Section.Flags, ELFYAML::ELF_SHF(0));
   IO.mapOptional("Address", Section.Address, Hex64(0));
   IO.mapOptional("Link", Section.Link, StringRef());
   IO.mapOptional("AddressAlign", Section.AddressAlign, Hex64(0));
   IO.mapOptional("EntSize", Section.EntSize);
   IO.mapOptional("Info", Section.Info, StringRef());
 }
 
+static void sectionMapping(IO &IO, ELFYAML::DynamicSection &Section) {
+  commonSectionMapping(IO, Section);
+  IO.mapOptional("Entries", Section.Entries);
+}
+
 static void sectionMapping(IO &IO, ELFYAML::RawContentSection &Section) {
   commonSectionMapping(IO, Section);
   IO.mapOptional("Content", Section.Content);
   IO.mapOptional("Size", Section.Size, Hex64(Section.Content.binary_size()));
 }
 
 static void sectionMapping(IO &IO, ELFYAML::NoBitsSection &Section) {
   commonSectionMapping(IO, Section);
void MappingTraits<std::unique_ptr<ELFYAML::Section>>::mapping(
     IO &IO, std::unique_ptr<ELFYAML::Section> &Section) {
   ELFYAML::ELF_SHT sectionType;
   if (IO.outputting())
     sectionType = Section->Type;
   else
     IO.mapRequired("Type", sectionType);
 
   switch (sectionType) {
+  case ELF::SHT_DYNAMIC:
+    if (!IO.outputting())
+      Section.reset(new ELFYAML::DynamicSection());
+    sectionMapping(IO, *cast<ELFYAML::DynamicSection>(Section.get()));
+    break;
   case ELF::SHT_REL:
   case ELF::SHT_RELA:
     if (!IO.outputting())
       Section.reset(new ELFYAML::RelocationSection());
     sectionMapping(IO, *cast<ELFYAML::RelocationSection>(Section.get()));
     break;
   case ELF::SHT_GROUP:
     if (!IO.outputting())
struct NormalizedMips64RelType {
   ELFYAML::ELF_REL Type;
   ELFYAML::ELF_REL Type2;
   ELFYAML::ELF_REL Type3;
   ELFYAML::ELF_RSS SpecSym;
 };
 
 } // end anonymous namespace
 
+void MappingTraits<ELFYAML::DynamicEntry>::mapping(IO &IO,
+                                                   ELFYAML::DynamicEntry &Rel) {
+  const auto *Object = static_cast<ELFYAML::Object *>(IO.getContext());
+  assert(Object && "The IO context is not initialized");
+
+  IO.mapRequired("Tag", Rel.Tag);
+  IO.mapRequired("Value", Rel.Val);
+}
+
 void MappingTraits<ELFYAML::Relocation>::mapping(IO &IO,
                                                  ELFYAML::Relocation &Rel) {
   const auto *Object = static_cast<ELFYAML::Object *>(IO.getContext());
   assert(Object && "The IO context is not initialized");
 
   IO.mapRequired("Offset", Rel.Offset);
   IO.mapOptional("Symbol", Rel.Symbol);
 

llvm/trunk/test/tools/llvm-elfabi/binary-read-add-soname.test

Sections:
   - Name:            .dynstr
     Type:            SHT_STRTAB
     Flags:           [ SHF_ALLOC ]
     Address:         0x0000
     Content:         "00"
   - Name:            .dynamic
     Type:            SHT_DYNAMIC
     Flags:           [ SHF_ALLOC ]
-    Address:         0x0008
-    AddressAlign:    8
-    Content:         "0a000000000000000100000000000000050000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000"
-      # DT_STRSZ      1 (0x1)
-      # DT_STRTAB     0x0
-      # DT_SYMTAB     0x0
-      # DT_NULL       0x0
-    Size:            64
+    Address:         0x0000000000000008
     Link:            .dynstr
+    AddressAlign:    0x0000000000000008
+    EntSize:         0x0000000000000010
+    Entries:
+      - Tag:             DT_STRSZ
+        Value:           0x0000000000000001
+      - Tag:             DT_STRTAB
+        Value:           0x0000000000000000
+      - Tag:             DT_SYMTAB
+        Value:           0x0000000000000000
+      - Tag:             DT_NULL
+        Value:           0x0000000000000000
 ProgramHeaders:
   - Type: PT_LOAD
     Flags: [ PF_R ]
     VAddr: 0x0000
     PAddr: 0x0000
     Align: 8
     Sections:
       - Section: .dynstr

llvm/trunk/test/tools/llvm-elfabi/binary-read-arch.test

Sections:
   - Name:            .dynstr
     Type:            SHT_STRTAB
     Flags:           [ SHF_ALLOC ]
     Address:         0x0000
     Content:         "00"
   - Name:            .dynamic
     Type:            SHT_DYNAMIC
     Flags:           [ SHF_ALLOC ]
-    Address:         0x0008
-    AddressAlign:    8
-    Content:         "0a000000000000000100000000000000050000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000"
-      # DT_STRSZ      1 (0x1)
-      # DT_STRTAB     0x0
-      # DT_SYMTAB     0x0
-      # DT_NULL       0x0
-    Size:            64
+    Address:         0x0000000000000008
     Link:            .dynstr
+    AddressAlign:    0x0000000000000008
+    EntSize:         0x0000000000000010
+    Entries:
+      - Tag:             DT_STRSZ
+        Value:           0x0000000000000001
+      - Tag:             DT_STRTAB
+        Value:           0x0000000000000000
+      - Tag:             DT_SYMTAB
+        Value:           0x0000000000000000
+      - Tag:             DT_NULL
+        Value:           0x0000000000000000
 ProgramHeaders:
   - Type: PT_LOAD
     Flags: [ PF_R ]
     VAddr: 0x0000
     PAddr: 0x0000
     Align: 8
     Sections:
       - Section: .dynstr

llvm/trunk/test/tools/llvm-elfabi/binary-read-bad-soname.test

Sections:
   - Name:            .dynstr
     Type:            SHT_STRTAB
     Flags:           [ SHF_ALLOC ]
     Address:         0x0000
     Content:         "00"
   - Name:            .dynamic
     Type:            SHT_DYNAMIC
     Flags:           [ SHF_ALLOC ]
-    Address:         0x0008
-    AddressAlign:    8
-    Content:         "0e000000000000000d000000000000000a000000000000000100000000000000050000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000"
-      # DT_SONAME     13 (0x0d)
-      # DT_STRSZ      1 (0x01)
-      # DT_STRTAB     0x0
-      # DT_SYMTAB     0x0
-      # DT_NULL       0x0
-    Size:            80
+    Address:         0x0000000000000008
     Link:            .dynstr
+    AddressAlign:    0x0000000000000008
+    EntSize:         0x0000000000000010
+    Entries:
+      - Tag:             DT_SONAME
+        Value:           0x000000000000000D
+      - Tag:             DT_STRSZ
+        Value:           0x0000000000000001
+      - Tag:             DT_STRTAB
+        Value:           0x0000000000000000
+      - Tag:             DT_SYMTAB
+        Value:           0x0000000000000000
+      - Tag:             DT_NULL
+        Value:           0x0000000000000000
 ProgramHeaders:
   - Type: PT_LOAD
     Flags: [ PF_R ]
     VAddr: 0x0000
     PAddr: 0x0000
     Align: 8
     Sections:
       - Section: .dynstr

llvm/trunk/test/tools/llvm-elfabi/binary-read-bad-vaddr.test

Sections:
   - Name:            .dynstr
     Type:            SHT_STRTAB
     Flags:           [ SHF_ALLOC ]
     Address:         0x1000
     Content:         "00"
   - Name:            .dynamic
     Type:            SHT_DYNAMIC
     Flags:           [ SHF_ALLOC ]
-    Address:         0x1008
-    AddressAlign:    8
-    Content:         "0e0000000000000000000000000000000a000000000000000100000000000000050000000000000060020000000000000600000000000000001000000000000000000000000000000000000000000000"
-      # DT_SONAME     0
-      # DT_STRSZ      1
-      # DT_STRTAB     0x0260 # Bad vaddr (no PT_LOAD for 0x0000 to 0x0FFF)
-      # DT_SYMTAB     0x1000
-      # DT_NULL       0x0
-    Size:            80
+    Address:         0x0000000000001008
     Link:            .dynstr
+    AddressAlign:    0x0000000000000008
+    EntSize:         0x0000000000000010
+    Entries:
+      - Tag:             DT_SONAME
+        Value:           0x0000000000000000
+      - Tag:             DT_STRSZ
+        Value:           0x0000000000000001
+      - Tag:             DT_STRTAB
+        Value:           0x0000000000000260 # Bad vaddr (no PT_LOAD for 0x0000 to 0x0FFF)
+      - Tag:             DT_SYMTAB
+        Value:           0x0000000000001000
+      - Tag:             DT_NULL
+        Value:           0x0000000000000000
 ProgramHeaders:
   - Type: PT_LOAD
     Flags: [ PF_R ]
     VAddr: 0x1000
     PAddr: 0x1000
     Align: 8
     Sections:
       - Section: .dynstr

llvm/trunk/test/tools/llvm-elfabi/binary-read-neededlibs-bad-offset.test

- Name:            .dynstr
     Type:            SHT_STRTAB
     Flags:           [ SHF_ALLOC ]
     Address:         0x1000
     #                "\0libfoo.so\0libbar.so\0somelib.so\0foo\0"
     Content:         "006c6962666f6f2e736f006c69626261722e736f00736f6d656c69622e736f00666f6f00"
   - Name:            .dynamic
     Type:            SHT_DYNAMIC
     Flags:           [ SHF_ALLOC ]
-    Address:         0x1024
-    Content:         "010000000000000001000000000000000e0000000000000015000000000000000100000000000000ffff0000000000000a000000000000002400000000000000050000000000000000100000000000000600000000000000001000000000000000000000000000000000000000000000"
-      # DT_NEEDED     1 (0x01)
-      # DT_SONAME     21 (0x15)
+    Address:         0x0000000000001024
+    EntSize:         0x0000000000000010
+    Entries:
+      - Tag:             DT_NEEDED
+        Value:           0x0000000000000001
+      - Tag:             DT_SONAME
+        Value:           0x0000000000000015
       # Bad DT_NEEDED entry (offset outside string table):
-      # DT_NEEDED     65535 (0xffff)
-      # DT_STRSZ      36 (0x24)
-      # DT_STRTAB     0x1000
-      # DT_SYMTAB     0x1000
-      # DT_NULL       0x0
-    Size:            112
+      - Tag:             DT_NEEDED
+        Value:           0x000000000000FFFF
+      - Tag:             DT_STRSZ
+        Value:           0x0000000000000024
+      - Tag:             DT_STRTAB
+        Value:           0x0000000000001000
+      - Tag:             DT_SYMTAB
+        Value:           0x0000000000001000
+      - Tag:             DT_NULL
+        Value:           0x0000000000000000
 ProgramHeaders:
   - Type: PT_LOAD
     Flags: [ PF_R ]
     VAddr: 0x1000
     PAddr: 0x1000
     Align: 8
     Sections:
       - Section: .dynstr
       - Section: .dynamic
   - Type: PT_DYNAMIC
     Flags: [ PF_X, PF_R ]
     VAddr: 0x1024
     PAddr: 0x1024
     Sections:
 
 # CHECK: DT_NEEDED string offset (0x000000000000ffff) outside of dynamic string table

llvm/trunk/test/tools/llvm-elfabi/binary-read-neededlibs.test

- Name:            .dynstr
     Type:            SHT_STRTAB
     Flags:           [ SHF_ALLOC ]
     Address:         0x1000
     #                "\0libfoo.so\0libbar.so\0somelib.so\0foo\0"
     Content:         "006c6962666f6f2e736f006c69626261722e736f00736f6d656c69622e736f00666f6f00"
   - Name:            .dynamic
     Type:            SHT_DYNAMIC
     Flags:           [ SHF_ALLOC ]
-    Address:         0x1024
-    Content:         "010000000000000001000000000000000e00000000000000150000000000000001000000000000000b000000000000000a000000000000002400000000000000050000000000000000100000000000000600000000000000001000000000000000000000000000000000000000000000"
-      # DT_NEEDED     1 (0x01)
-      # DT_SONAME     21 (0x15)
-      # DT_NEEDED     11 (0x0b)
-      # DT_STRSZ      36 (0x24)
-      # DT_STRTAB     0x1000
-      # DT_SYMTAB     0x1000
-      # DT_NULL       0x0
-    Size:            112
+    Address:         0x0000000000001024
+    EntSize:         0x0000000000000010
+    Entries:
+      - Tag:             DT_NEEDED
+        Value:           0x0000000000000001
+      - Tag:             DT_SONAME
+        Value:           0x0000000000000015
+      - Tag:             DT_NEEDED
+        Value:           0x000000000000000B
+      - Tag:             DT_STRSZ
+        Value:           0x0000000000000024
+      - Tag:             DT_STRTAB
+        Value:           0x0000000000001000
+      - Tag:             DT_SYMTAB
+        Value:           0x0000000000001000
+      - Tag:             DT_NULL
+        Value:           0x0000000000000000
 ProgramHeaders:
   - Type: PT_LOAD
     Flags: [ PF_R ]
     VAddr: 0x1000
     PAddr: 0x1000
     Align: 8
     Sections:
       - Section: .dynstr

llvm/trunk/test/tools/llvm-elfabi/binary-read-no-dt-strsz.test

- Name:            .dynstr
     Type:            SHT_STRTAB
     Flags:           [ SHF_ALLOC ]
     Address:         0x0000
 #                     \0 b a z\0
     Content:         "0062617a00"
   - Name:            .dynamic
     Type:            SHT_DYNAMIC
     Flags:           [ SHF_ALLOC ]
-    Address:         0x0008
-    AddressAlign:    8
-    Content:         "0500000000000000000000000000000000000000000000000000000000000000"
-      # DT_STRTAB     0x0
-      # DT_NULL       0x0
-    Size:            32
+    Address:         0x0000000000000008
     Link:            .dynstr
+    AddressAlign:    0x0000000000000008
+    EntSize:         0x0000000000000010
+    Entries:
+      - Tag:             DT_STRTAB
+        Value:           0x0000000000000000
+      - Tag:             DT_NULL
+        Value:           0x0000000000000000
 ProgramHeaders:
   - Type: PT_LOAD
     Flags: [ PF_R ]
     VAddr: 0x0000
     PAddr: 0x0000
     Align: 8
     Sections:
       - Section: .dynstr

llvm/trunk/test/tools/llvm-elfabi/binary-read-no-dt-strtab.test

Sections:
   - Name:            .dynstr
     Type:            SHT_STRTAB
     Flags:           [ SHF_ALLOC ]
     Address:         0x0000
     Content:         "00"
   - Name:            .dynamic
     Type:            SHT_DYNAMIC
     Flags:           [ SHF_ALLOC ]
-    Address:         0x0008
-    AddressAlign:    8
-    Content:         "0a00000000000000010000000000000000000000000000000000000000000000"
-      # DT_STRSZ      1 (0x1)
-      # DT_NULL       0x0
-    Size:            32
+    Address:         0x0000000000000008
     Link:            .dynstr
+    AddressAlign:    0x0000000000000008
+    EntSize:         0x0000000000000010
+    Entries:
+      - Tag:             DT_STRSZ
+        Value:           0x0000000000000001
+      - Tag:             DT_NULL
+        Value:           0x0000000000000000
 ProgramHeaders:
   - Type: PT_LOAD
     Flags: [ PF_R ]
     VAddr: 0x0000
     PAddr: 0x0000
     Align: 8
     Sections:
       - Section: .dynstr

llvm/trunk/test/tools/llvm-elfabi/binary-read-replace-soname.test

- Name:            .dynstr
     Type:            SHT_STRTAB
     Flags:           [ SHF_ALLOC ]
     Address:         0x1000
 #                     \0 b a z\0 s o m e l i b . s o\0 f o o\0
     Content:         "0062617a00736f6d656c69622e736f00666f6f00"
   - Name:            .dynamic
     Type:            SHT_DYNAMIC
     Flags:           [ SHF_ALLOC ]
-    Address:         0x1018
-    AddressAlign:    8
-    Content:         "0e0000000000000005000000000000000a000000000000001400000000000000050000000000000000100000000000000600000000000000001000000000000000000000000000000000000000000000"
-      # DT_SONAME     5 (0x05)
-      # DT_STRSZ      20 (0x14)
-      # DT_STRTAB     0x1000
-      # DT_SYMTAB     0x1000
-      # DT_NULL       0x0
-    Size:            80
+    Address:         0x0000000000001018
     Link:            .dynstr
+    AddressAlign:    0x0000000000000008
+    EntSize:         0x0000000000000010
+    Entries:
+      - Tag:             DT_SONAME
+        Value:           0x0000000000000005
+      - Tag:             DT_STRSZ
+        Value:           0x0000000000000014
+      - Tag:             DT_STRTAB
+        Value:           0x0000000000001000
+      - Tag:             DT_SYMTAB
+        Value:           0x0000000000001000
+      - Tag:             DT_NULL
+        Value:           0x0000000000000000
 ProgramHeaders:
   - Type: PT_LOAD
     Flags: [ PF_R ]
     VAddr: 0x1000
     PAddr: 0x1000
     Align: 8
     Sections:
       - Section: .dynstr

llvm/trunk/test/tools/llvm-elfabi/binary-read-soname-no-null.test

- Name:            .dynstr
     Type:            SHT_STRTAB
     Flags:           [ SHF_ALLOC ]
     Address:         0x1000
 #                     \0 b a z\0 s o m e l i b . s o z z z
     Content:         "0062617a00736f6d656c69622e736f7a7a7a"
   - Name:            .dynamic
     Type:            SHT_DYNAMIC
     Flags:           [ SHF_ALLOC ]
-    Address:         0x1018
-    AddressAlign:    8
-    Content:         "0e0000000000000005000000000000000a000000000000000f00000000000000050000000000000000100000000000000600000000000000001000000000000000000000000000000000000000000000"
-      # DT_SONAME     5 (0x05)
-      # DT_STRSZ      15 (0x0F)
-      # DT_STRTAB     0x1000
-      # DT_SYMTAB     0x1000
-      # DT_NULL       0x0
-    Size:            80
+    Address:         0x0000000000001018
     Link:            .dynstr
+    AddressAlign:    0x0000000000000008
+    EntSize:         0x0000000000000010
+    Entries:
+      - Tag:             DT_SONAME
+        Value:           0x0000000000000005
+      - Tag:             DT_STRSZ
+        Value:           0x000000000000000F
+      - Tag:             DT_STRTAB
+        Value:           0x0000000000001000
+      - Tag:             DT_SYMTAB
+        Value:           0x0000000000001000
+      - Tag:             DT_NULL
+        Value:           0x0000000000000000
 ProgramHeaders:
   - Type: PT_LOAD
     Flags: [ PF_R ]
     VAddr: 0x1000
     PAddr: 0x1000
     Align: 8
     Sections:
       - Section: .dynstr

llvm/trunk/test/tools/llvm-elfabi/binary-read-soname.test

- Name:            .dynstr
     Type:            SHT_STRTAB
     Flags:           [ SHF_ALLOC ]
     Address:         0x1000
 #                     \0 b a z\0 s o m e l i b . s o\0 f o o\0
     Content:         "0062617a00736f6d656c69622e736f00666f6f00"
   - Name:            .dynamic
     Type:            SHT_DYNAMIC
     Flags:           [ SHF_ALLOC ]
-    Address:         0x1018
-    AddressAlign:    8
-    Content:         "0e0000000000000005000000000000000a000000000000001400000000000000050000000000000000100000000000000600000000000000001000000000000000000000000000000000000000000000"
-      # DT_SONAME     5 (0x05)
-      # DT_STRSZ      20 (0x14)
-      # DT_STRTAB     0x1000
-      # DT_SYMTAB     0x1000
-      # DT_NULL       0x0
-    Size:            80
+    Address:         0x0000000000001018
     Link:            .dynstr
+    AddressAlign:    0x0000000000000008
+    EntSize:         0x0000000000000010
+    Entries:
+      - Tag:             DT_SONAME
+        Value:           0x0000000000000005
+      - Tag:             DT_STRSZ
+        Value:           0x0000000000000014
+      - Tag:             DT_STRTAB
+        Value:           0x0000000000001000
+      - Tag:             DT_SYMTAB
+        Value:           0x0000000000001000
+      - Tag:             DT_NULL
+        Value:           0x0000000000000000
 ProgramHeaders:
   - Type: PT_LOAD
     Flags: [ PF_R ]
     VAddr: 0x1000
     PAddr: 0x1000
     Align: 8
     Sections:
       - Section: .dynstr

llvm/trunk/test/tools/llvm-objdump/private-headers-no-dynamic-segment.test

 # RUN: yaml2obj %s > %t
 # RUN: llvm-objdump -p %t | FileCheck %s
 
 !ELF
 FileHeader:
   Class:           ELFCLASS64
   Data:            ELFDATA2LSB
   Type:            ET_REL
   Machine:         EM_X86_64
 Sections:
   - Name:            .dynamic
     Type:            SHT_DYNAMIC
-    Flags:           [ SHF_ALLOC, SHF_WRITE ]
-    Content: 0c00000000000000a0060000000000000d0000000000000024090000000000001900000000000000a80d2000000000001b0000000000000010000000000000001a00000000000000b80d2000000000001c000000000000000800000000000000f5feff6f0000000098020000000000000500000000000000c8030000000000000600000000000000c0020000000000000a000000000000002f010000000000000b0000000000000018000000000000001500000000000000000000000000000003000000000000000010200000000000020000000000000048000000000000001400000000000000070000000000000017000000000000005806000000000000070000000000000050050000000000000800000000000000080100000000000009000000000000001800000000000000fbffff6f000000000000000800000000feffff6f000000001005000000000000ffffff6f000000000200000000000000f0ffff6f00000000f804000000000000f9ffff6f0000000004000000000000002300000000000000140000000000000024000000000000002143658700000000250000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000
+    Flags:           [ SHF_WRITE, SHF_ALLOC ]
+    EntSize:         0x0000000000000010
+    Entries:
+      - Tag:             DT_INIT
+        Value:           0x00000000000006A0
+      - Tag:             DT_FINI
+        Value:           0x0000000000000924
+      - Tag:             DT_INIT_ARRAY
+        Value:           0x0000000000200DA8
+      - Tag:             DT_INIT_ARRAYSZ
+        Value:           0x0000000000000010
+      - Tag:             DT_FINI_ARRAY
+        Value:           0x0000000000200DB8
+      - Tag:             DT_FINI_ARRAYSZ
+        Value:           0x0000000000000008
+      - Tag:             DT_GNU_HASH
+        Value:           0x0000000000000298
+      - Tag:             DT_STRTAB
+        Value:           0x00000000000003C8
+      - Tag:             DT_SYMTAB
+        Value:           0x00000000000002C0
+      - Tag:             DT_STRSZ
+        Value:           0x000000000000012F
+      - Tag:             DT_SYMENT
+        Value:           0x0000000000000018
+      - Tag:             DT_DEBUG
+        Value:           0x0000000000000000
+      - Tag:             DT_PLTGOT
+        Value:           0x0000000000201000
+      - Tag:             DT_PLTRELSZ
+        Value:           0x0000000000000048
+      - Tag:             DT_PLTREL
+        Value:           0x0000000000000007
+      - Tag:             DT_JMPREL
+        Value:           0x0000000000000658
+      - Tag:             DT_RELA
+        Value:           0x0000000000000550
+      - Tag:             DT_RELASZ
+        Value:           0x0000000000000108
+      - Tag:             DT_RELAENT
+        Value:           0x0000000000000018
+      - Tag:             DT_FLAGS_1
+        Value:           0x0000000008000000
+      - Tag:             DT_VERNEED
+        Value:           0x0000000000000510
+      - Tag:             DT_VERNEEDNUM
+        Value:           0x0000000000000002
+      - Tag:             DT_VERSYM
+        Value:           0x00000000000004F8
+      - Tag:             DT_RELACOUNT
+        Value:           0x0000000000000004
+      - Tag:             DT_RELRSZ
+        Value:           0x0000000000000014
+      - Tag:             DT_RELR
+        Value:           0x0000000087654321
+      - Tag:             DT_RELRENT
+        Value:           0x0000000000000010
+      - Tag:             DT_NULL
+        Value:           0x0000000000000000
 
 # CHECK:  INIT                 0x00000000000006a0
 # CHECK:  FINI                 0x0000000000000924
 # CHECK:  INIT_ARRAY           0x0000000000200da8
 # CHECK:  INIT_ARRAYSZ         0x0000000000000010
 # CHECK:  FINI_ARRAY           0x0000000000200db8
 # CHECK:  FINI_ARRAYSZ         0x0000000000000008
 # CHECK:  GNU_HASH             0x0000000000000298

llvm/trunk/test/tools/llvm-readobj/demangle.test

- Name:         .rela.dyn
     EntSize:      0x18
     Relocations:
       - Offset: 0x10
         ## FIXME: This should be a lookup in the corresponding symbol table, not necessarily the static symbol table.
         ## See https://bugs.llvm.org/show_bug.cgi?id=40337.
         Symbol: _Z3fooc
         Type:   R_X86_64_PC32
         Addend: 0x4
-  - Name:         .dynamic
-    Type:         SHT_DYNAMIC
-    Flags:        [ SHF_ALLOC ]
-    Link:         .dynstr
-    Address:      0x1000
-    AddressAlign: 0x1000
-    ## DT_STRTAB  - 0x0
-    ## DT_STRSZ   - 0x9
-    ## DT_SYMTAB  - 0x100
-    ## DT_SYMENT  - 0x18
-    ## DT_RELA    - 0x200
-    ## DT_RELASZ  - 0x18
-    ## DT_RELAENT - 0x18
-    ## DT_NULL    - 0x0
-    Content: "050000000000000000000000000000000a000000000000000900000000000000060000000000000000010000000000000b00000000000000180000000000000007000000000000000002000000000000080000000000000018000000000000000900000000000000180000000000000000000000000000000000000000000000"
+  - Name:            .dynamic
+    Type:            SHT_DYNAMIC
+    Flags:           [ SHF_ALLOC ]
+    Address:         0x0000000000001000
+    Link:            .dynstr
+    AddressAlign:    0x0000000000001000
+    EntSize:         0x0000000000000010
+    Entries:
+      - Tag:             DT_STRTAB
+        Value:           0x0000000000000000
+      - Tag:             DT_STRSZ
+        Value:           0x0000000000000009
+      - Tag:             DT_SYMTAB
+        Value:           0x0000000000000100
+      - Tag:             DT_SYMENT
+        Value:           0x0000000000000018
+      - Tag:             DT_RELA
+        Value:           0x0000000000000200
+      - Tag:             DT_RELASZ
+        Value:           0x0000000000000018
+      - Tag:             DT_RELAENT
+        Value:           0x0000000000000018
+      - Tag:             DT_NULL
+        Value:           0x0000000000000000
   - Name:  .text.foo
     Type:  SHT_PROGBITS
     Flags: [ SHF_ALLOC, SHF_EXECINSTR, SHF_GROUP ]
     Size:  0x40
     Address: 0x2000
     AddressAlign: 0x2000
   - Name:  .group
     Type:  SHT_GROUP

llvm/trunk/test/tools/llvm-readobj/gnu-hash-symbols.test

- Name:         .dynsym
     Info:         1
     Address:      0x100
     AddressAlign: 0x100
     EntSize:      0x18
     ## Null symbol;
     ## st_name: 1; st_info: Global | Func; st_other: 0;
     ##   st_shndx: .text.foo; st_value: 0x2000; st_size: 0
     Content: "000000000000000000000000000000000000000000000000010000001200040000200000000000000000000000000000"
-  - Name:         .dynamic
-    Type:         SHT_DYNAMIC
-    Flags:        [ SHF_ALLOC ]
-    Link:         .dynstr
-    Address:      0x1000
-    AddressAlign: 0x1000
-    ## DT_STRTAB  - 0x0
-    ## DT_STRSZ   - 0x9
-    ## DT_SYMTAB  - 0x100
-    ## DT_SYMENT  - 0x18
-    ## DT_NULL    - 0x0
-    Content: "050000000000000000000000000000000a000000000000000900000000000000060000000000000000010000000000000b00000000000000180000000000000000000000000000000000000000000000"
+  - Name:            .dynamic
+    Type:            SHT_DYNAMIC
+    Flags:           [ SHF_ALLOC ]
+    Address:         0x0000000000001000
+    Link:            .dynstr
+    AddressAlign:    0x0000000000001000
+    EntSize:         0x0000000000000010
+    Entries:
+      - Tag:             DT_STRTAB
+        Value:           0x0000000000000000
+      - Tag:             DT_STRSZ
+        Value:           0x0000000000000009
+      - Tag:             DT_SYMTAB
+        Value:           0x0000000000000100
+      - Tag:             DT_SYMENT
+        Value:           0x0000000000000018
+      - Tag:             DT_NULL
+        Value:           0x0000000000000000
   - Name:  .text.foo
     Type:  SHT_PROGBITS
     Flags: [ SHF_ALLOC, SHF_EXECINSTR, SHF_GROUP ]
     Size:  0x40
     Address: 0x2000
     AddressAlign: 0x2000
 ProgramHeaders:
   - Type:  PT_LOAD

llvm/trunk/test/tools/obj2yaml/dynamic-section.test

+# RUN: yaml2obj %s -o %t
+# RUN: obj2yaml %t | FileCheck %s
+
+## Check we can use obj2yaml to yamalize the object containing
+## .dynamic section. Check that resulting section has the
+## proper attributes and dynamic tags.
+
+# CHECK:       Sections:
+# CHECK-NEXT:  - Name:            .dynamic
+# CHECK-NEXT:    Type:            SHT_DYNAMIC
+# CHECK-NEXT:    Address:         0x0000000000001000
+# CHECK-NEXT:    AddressAlign:    0x0000000000002000
+# CHECK-NEXT:    EntSize:         0x0000000000000010
+# CHECK-NEXT:    Entries:
+# CHECK-NEXT:      - Tag:             DT_NULL
+# CHECK-NEXT:        Value:           0x0000000000000000
+# CHECK-NEXT:      - Tag:             DT_NEEDED
+# CHECK-NEXT:        Value:           0x0000000000000001
+# CHECK-NEXT:      - Tag:             DT_PLTRELSZ
+# CHECK-NEXT:        Value:           0x0000000000000002
+# CHECK-NEXT:      - Tag:             DT_PLTGOT
+# CHECK-NEXT:        Value:           0x0000000000000003
+# CHECK-NEXT:      - Tag:             DT_HASH
+# CHECK-NEXT:        Value:           0x0000000000000004
+# CHECK-NEXT:      - Tag:             DT_STRTAB
+# CHECK-NEXT:        Value:           0x0000000000000005
+# CHECK-NEXT:      - Tag:             DT_SYMTAB
+# CHECK-NEXT:        Value:           0x0000000000000006
+# CHECK-NEXT:      - Tag:             DT_RELA
+# CHECK-NEXT:        Value:           0x0000000000000007
+# CHECK-NEXT:      - Tag:             DT_RELASZ
+# CHECK-NEXT:        Value:           0x0000000000000008
+# CHECK-NEXT:      - Tag:             DT_RELAENT
+# CHECK-NEXT:        Value:           0x0000000000000009
+# CHECK-NEXT:      - Tag:             DT_STRSZ
+# CHECK-NEXT:        Value:           0x000000000000000A
+# CHECK-NEXT:      - Tag:             DT_SYMENT
+# CHECK-NEXT:        Value:           0x000000000000000B
+# CHECK-NEXT:      - Tag:             DT_INIT
+# CHECK-NEXT:        Value:           0x000000000000000C
+# CHECK-NEXT:      - Tag:             DT_FINI
+# CHECK-NEXT:        Value:           0x000000000000000D
+# CHECK-NEXT:      - Tag:             DT_SONAME
+# CHECK-NEXT:        Value:           0x000000000000000E
+# CHECK-NEXT:      - Tag:             DT_RPATH
+# CHECK-NEXT:        Value:           0x000000000000000F
+# CHECK-NEXT:      - Tag:             DT_SYMBOLIC
+# CHECK-NEXT:        Value:           0x0000000000000010
+# CHECK-NEXT:      - Tag:             DT_REL
+# CHECK-NEXT:        Value:           0x0000000000000011
+# CHECK-NEXT:      - Tag:             DT_RELSZ
+# CHECK-NEXT:        Value:           0x0000000000000012
+# CHECK-NEXT:      - Tag:             DT_RELENT
+# CHECK-NEXT:        Value:           0x0000000000000013
+# CHECK-NEXT:      - Tag:             DT_PLTREL
+# CHECK-NEXT:        Value:           0x0000000000000014
+# CHECK-NEXT:      - Tag:             DT_DEBUG
+# CHECK-NEXT:        Value:           0x0000000000000015
+# CHECK-NEXT:      - Tag:             DT_TEXTREL
+# CHECK-NEXT:        Value:           0x0000000000000016
+# CHECK-NEXT:      - Tag:             DT_JMPREL
+# CHECK-NEXT:        Value:           0x0000000000000017
+# CHECK-NEXT:      - Tag:             DT_BIND_NOW
+# CHECK-NEXT:        Value:           0x0000000000000018
+# CHECK-NEXT:      - Tag:             DT_INIT_ARRAY
+# CHECK-NEXT:        Value:           0x0000000000000019
+# CHECK-NEXT:      - Tag:             DT_FINI_ARRAY
+# CHECK-NEXT:        Value:           0x000000000000001A
+# CHECK-NEXT:      - Tag:             DT_INIT_ARRAYSZ
+# CHECK-NEXT:        Value:           0x000000000000001B
+# CHECK-NEXT:      - Tag:             DT_FINI_ARRAYSZ
+# CHECK-NEXT:        Value:           0x000000000000001C
+# CHECK-NEXT:      - Tag:             DT_RUNPATH
+# CHECK-NEXT:        Value:           0x000000000000001D
+# CHECK-NEXT:      - Tag:             DT_FLAGS
+# CHECK-NEXT:        Value:           0x000000000000001E
+# CHECK-NEXT:      - Tag:             DT_PREINIT_ARRAY
+# CHECK-NEXT:        Value:           0x000000000000001F
+# CHECK-NEXT:      - Tag:             DT_PREINIT_ARRAYSZ
+# CHECK-NEXT:        Value:           0x0000000000000020
+# CHECK-NEXT:      - Tag:             DT_SYMTAB_SHNDX
+# CHECK-NEXT:        Value:           0x0000000000000021
+# CHECK-NEXT:      - Tag:             DT_RELRSZ
+# CHECK-NEXT:        Value:           0x0000000000000022
+# CHECK-NEXT:      - Tag:             DT_RELR
+# CHECK-NEXT:        Value:           0x0000000000000023
+# CHECK-NEXT:      - Tag:             DT_RELRENT
+# CHECK-NEXT:        Value:           0x0000000000000024
+# CHECK-NEXT:      - Tag:             DT_ANDROID_REL
+# CHECK-NEXT:        Value:           0x0000000000000025
+# CHECK-NEXT:      - Tag:             DT_ANDROID_RELSZ
+# CHECK-NEXT:        Value:           0x0000000000000026
+# CHECK-NEXT:      - Tag:             DT_ANDROID_RELA
+# CHECK-NEXT:        Value:           0x0000000000000027
+# CHECK-NEXT:      - Tag:             DT_ANDROID_RELASZ
+# CHECK-NEXT:        Value:           0x0000000000000028
+# CHECK-NEXT:      - Tag:             DT_ANDROID_RELR
+# CHECK-NEXT:        Value:           0x0000000000000029
+# CHECK-NEXT:      - Tag:             DT_ANDROID_RELRSZ
+# CHECK-NEXT:        Value:           0x000000000000002A
+# CHECK-NEXT:      - Tag:             DT_ANDROID_RELRENT
+# CHECK-NEXT:        Value:           0x000000000000002B
+# CHECK-NEXT:      - Tag:             DT_GNU_HASH
+# CHECK-NEXT:        Value:           0x000000000000002C
+# CHECK-NEXT:      - Tag:             DT_TLSDESC_PLT
+# CHECK-NEXT:        Value:           0x000000000000002D
+# CHECK-NEXT:      - Tag:             DT_TLSDESC_GOT
+# CHECK-NEXT:        Value:           0x000000000000002E
+# CHECK-NEXT:      - Tag:             DT_RELACOUNT
+# CHECK-NEXT:        Value:           0x000000000000002F
+# CHECK-NEXT:      - Tag:             DT_RELCOUNT
+# CHECK-NEXT:        Value:           0x0000000000000030
+# CHECK-NEXT:      - Tag:             DT_FLAGS_1
+# CHECK-NEXT:        Value:           0x0000000000000031
+# CHECK-NEXT:      - Tag:             DT_VERSYM
+# CHECK-NEXT:        Value:           0x0000000000000032
+# CHECK-NEXT:      - Tag:             DT_VERDEF
+# CHECK-NEXT:        Value:           0x0000000000000033
+# CHECK-NEXT:      - Tag:             DT_VERDEFNUM
+# CHECK-NEXT:        Value:           0x0000000000000034
+# CHECK-NEXT:      - Tag:             DT_VERNEED
+# CHECK-NEXT:        Value:           0x0000000000000035
+# CHECK-NEXT:      - Tag:             DT_VERNEEDNUM
+# CHECK-NEXT:        Value:           0x0000000000000036
+
+!ELF
+FileHeader:
+  Class:           ELFCLASS64
+  Data:            ELFDATA2LSB
+  Type:            ET_DYN
+  Machine:         EM_X86_64
+Sections:
+  - Name:            .dynamic
+    Type:            SHT_DYNAMIC
+    Address:         0x0000000000001000
+    AddressAlign:    0x0000000000002000
+    EntSize:         0x0000000000000010
+    Entries:
+      - Tag:             DT_NULL
+        Value:           0x0000000000000000
+      - Tag:             DT_NEEDED
+        Value:           0x0000000000000001
+      - Tag:             DT_PLTRELSZ
+        Value:           0x0000000000000002
+      - Tag:             DT_PLTGOT
+        Value:           0x0000000000000003
+      - Tag:             DT_HASH
+        Value:           0x0000000000000004
+      - Tag:             DT_STRTAB
+        Value:           0x0000000000000005
+      - Tag:             DT_SYMTAB
+        Value:           0x0000000000000006
+      - Tag:             DT_RELA
+        Value:           0x0000000000000007
+      - Tag:             DT_RELASZ
+        Value:           0x0000000000000008
+      - Tag:             DT_RELAENT
+        Value:           0x0000000000000009
+      - Tag:             DT_STRSZ
+        Value:           0x000000000000000A
+      - Tag:             DT_SYMENT
+        Value:           0x000000000000000B
+      - Tag:             DT_INIT
+        Value:           0x000000000000000C
+      - Tag:             DT_FINI
+        Value:           0x000000000000000D
+      - Tag:             DT_SONAME
+        Value:           0x000000000000000E
+      - Tag:             DT_RPATH
+        Value:           0x000000000000000F
+      - Tag:             DT_SYMBOLIC
+        Value:           0x0000000000000010
+      - Tag:             DT_REL
+        Value:           0x0000000000000011
+      - Tag:             DT_RELSZ
+        Value:           0x0000000000000012
+      - Tag:             DT_RELENT
+        Value:           0x0000000000000013
+      - Tag:             DT_PLTREL
+        Value:           0x0000000000000014
+      - Tag:             DT_DEBUG
+        Value:           0x0000000000000015
+      - Tag:             DT_TEXTREL
+        Value:           0x0000000000000016
+      - Tag:             DT_JMPREL
+        Value:           0x0000000000000017
+      - Tag:             DT_BIND_NOW
+        Value:           0x0000000000000018
+      - Tag:             DT_INIT_ARRAY
+        Value:           0x0000000000000019
+      - Tag:             DT_FINI_ARRAY
+        Value:           0x000000000000001A
+      - Tag:             DT_INIT_ARRAYSZ
+        Value:           0x000000000000001B
+      - Tag:             DT_FINI_ARRAYSZ
+        Value:           0x000000000000001C
+      - Tag:             DT_RUNPATH
+        Value:           0x000000000000001D
+      - Tag:             DT_FLAGS
+        Value:           0x000000000000001E
+      - Tag:             DT_PREINIT_ARRAY
+        Value:           0x000000000000001F
+      - Tag:             DT_PREINIT_ARRAYSZ
+        Value:           0x0000000000000020
+      - Tag:             DT_SYMTAB_SHNDX
+        Value:           0x0000000000000021
+      - Tag:             DT_RELRSZ
+        Value:           0x0000000000000022
+      - Tag:             DT_RELR
+        Value:           0x0000000000000023
+      - Tag:             DT_RELRENT
+        Value:           0x0000000000000024
+      - Tag:             DT_ANDROID_REL
+        Value:           0x0000000000000025
+      - Tag:             DT_ANDROID_RELSZ
+        Value:           0x0000000000000026
+      - Tag:             DT_ANDROID_RELA
+        Value:           0x0000000000000027
+      - Tag:             DT_ANDROID_RELASZ
+        Value:           0x0000000000000028
+      - Tag:             DT_ANDROID_RELR
+        Value:           0x0000000000000029
+      - Tag:             DT_ANDROID_RELRSZ
+        Value:           0x000000000000002A
+      - Tag:             DT_ANDROID_RELRENT
+        Value:           0x000000000000002B
+      - Tag:             DT_GNU_HASH
+        Value:           0x000000000000002C
+      - Tag:             DT_TLSDESC_PLT
+        Value:           0x000000000000002D
+      - Tag:             DT_TLSDESC_GOT
+        Value:           0x000000000000002E
+      - Tag:             DT_RELACOUNT
+        Value:           0x000000000000002F
+      - Tag:             DT_RELCOUNT
+        Value:           0x0000000000000030
+      - Tag:             DT_FLAGS_1
+        Value:           0x0000000000000031
+      - Tag:             DT_VERSYM
+        Value:           0x0000000000000032
+      - Tag:             DT_VERDEF
+        Value:           0x0000000000000033
+      - Tag:             DT_VERDEFNUM
+        Value:           0x0000000000000034
+      - Tag:             DT_VERNEED
+        Value:           0x0000000000000035
+      - Tag:             DT_VERNEEDNUM
+        Value:           0x0000000000000036

llvm/trunk/tools/obj2yaml/elf2yaml.cpp

 
 using namespace llvm;
 
 namespace {
 
 template <class ELFT>
 class ELFDumper {
   typedef object::Elf_Sym_Impl<ELFT> Elf_Sym;
+  typedef typename ELFT::Dyn Elf_Dyn;
   typedef typename ELFT::Shdr Elf_Shdr;
   typedef typename ELFT::Word Elf_Word;
   typedef typename ELFT::Rel Elf_Rel;
   typedef typename ELFT::Rela Elf_Rela;
 
   ArrayRef<Elf_Shdr> Sections;
 
   // If the file has multiple sections with the same name, we add a
class ELFDumper {
   std::error_code dumpSymbol(const Elf_Sym *Sym, const Elf_Shdr *SymTab,
                              StringRef StrTable, ELFYAML::Symbol &S);
   std::error_code dumpCommonSection(const Elf_Shdr *Shdr, ELFYAML::Section &S);
   std::error_code dumpCommonRelocationSection(const Elf_Shdr *Shdr,
                                               ELFYAML::RelocationSection &S);
   template <class RelT>
   std::error_code dumpRelocation(const RelT *Rel, const Elf_Shdr *SymTab,
                                  ELFYAML::Relocation &R);
   
+  ErrorOr<ELFYAML::DynamicSection *> dumpDynamicSection(const Elf_Shdr *Shdr);
   ErrorOr<ELFYAML::RelocationSection *> dumpRelocSection(const Elf_Shdr *Shdr);
   ErrorOr<ELFYAML::RawContentSection *>
   dumpContentSection(const Elf_Shdr *Shdr);
   ErrorOr<ELFYAML::NoBitsSection *> dumpNoBitsSection(const Elf_Shdr *Shdr);
   ErrorOr<ELFYAML::Group *> dumpGroup(const Elf_Shdr *Shdr);
   ErrorOr<ELFYAML::MipsABIFlags *> dumpMipsABIFlags(const Elf_Shdr *Shdr);
 
 public:
template <class ELFT> ErrorOr<ELFYAML::Object *> ELFDumper<ELFT>::dump() {
   // Dump sections
   auto SectionsOrErr = Obj.sections();
   if (!SectionsOrErr)
     return errorToErrorCode(SectionsOrErr.takeError());
   Sections = *SectionsOrErr;
   SectionNames.resize(Sections.size());
   for (const Elf_Shdr &Sec : Sections) {
     switch (Sec.sh_type) {
+    case ELF::SHT_DYNAMIC: {
+      ErrorOr<ELFYAML::DynamicSection *> S = dumpDynamicSection(&Sec);
+      if (std::error_code EC = S.getError())
+        return EC;
+      Y->Sections.push_back(std::unique_ptr<ELFYAML::Section>(S.get()));
+      break;
+    }
     case ELF::SHT_NULL:
     case ELF::SHT_STRTAB:
       // Do not dump these sections.
       break;
     case ELF::SHT_SYMTAB:
       Symtab = &Sec;
       break;
     case ELF::SHT_DYNSYM:
ELFDumper<ELFT>::dumpCommonRelocationSection(const Elf_Shdr *Shdr,
   if (!NameOrErr)
     return errorToErrorCode(NameOrErr.takeError());
   S.Info = NameOrErr.get();
 
   return obj2yaml_error::success;
 }
 
 template <class ELFT>
+ErrorOr<ELFYAML::DynamicSection *>
+ELFDumper<ELFT>::dumpDynamicSection(const Elf_Shdr *Shdr) {
+  auto S = make_unique<ELFYAML::DynamicSection>();
+  if (std::error_code EC = dumpCommonSection(Shdr, *S))
+    return EC;
+
+  auto DynTagsOrErr = Obj.template getSectionContentsAsArray<Elf_Dyn>(Shdr);
+  if (!DynTagsOrErr)
+    return errorToErrorCode(DynTagsOrErr.takeError());
+
+  for (const Elf_Dyn &Dyn : *DynTagsOrErr)
+    S->Entries.push_back({(ELFYAML::ELF_DYNTAG)Dyn.getTag(), Dyn.getVal()});
+
+  return S.release();
+}
+
+template <class ELFT>
 ErrorOr<ELFYAML::RelocationSection *>
 ELFDumper<ELFT>::dumpRelocSection(const Elf_Shdr *Shdr) {
   auto S = make_unique<ELFYAML::RelocationSection>();
   if (std::error_code EC = dumpCommonRelocationSection(Shdr, *S))
     return EC;
 
   auto SymTabOrErr = Obj.getSection(Shdr->sh_link);
   if (!SymTabOrErr)

llvm/trunk/tools/yaml2obj/yaml2elf.cpp

class ELFState {
   bool writeSectionContent(Elf_Shdr &SHeader,
                            const ELFYAML::RelocationSection &Section,
                            ContiguousBlobAccumulator &CBA);
   bool writeSectionContent(Elf_Shdr &SHeader, const ELFYAML::Group &Group,
                            ContiguousBlobAccumulator &CBA);
   bool writeSectionContent(Elf_Shdr &SHeader,
                            const ELFYAML::MipsABIFlags &Section,
                            ContiguousBlobAccumulator &CBA);
+  void writeSectionContent(Elf_Shdr &SHeader,
+                           const ELFYAML::DynamicSection &Section,
+                           ContiguousBlobAccumulator &CBA);
   bool hasDynamicSymbols() const;
   SmallVector<const char *, 5> implicitSectionNames() const;
 
   // - SHT_NULL entry (placed first, i.e. 0'th entry)
   // - symbol table (.symtab) (defaults to after last yaml section)
   // - string table (.strtab) (defaults to after .symtab)
   // - section header string table (.shstrtab) (defaults to after .strtab)
   // - dynamic symbol table (.dynsym) (defaults to after .shstrtab)
else if (auto S = dyn_cast<ELFYAML::RelocationSection>(Sec.get())) {
       if (!writeSectionContent(SHeader, *S, CBA))
         return false;
     } else if (auto S = dyn_cast<ELFYAML::NoBitsSection>(Sec.get())) {
       SHeader.sh_entsize = 0;
       SHeader.sh_size = S->Size;
       // SHT_NOBITS section does not have content
       // so just to setup the section offset.
       CBA.getOSAndAlignedOffset(SHeader.sh_offset, SHeader.sh_addralign);
+    } else if (auto S = dyn_cast<ELFYAML::DynamicSection>(Sec.get())) {
+      writeSectionContent(SHeader, *S, CBA);
     } else
       llvm_unreachable("Unknown section type");
 
     SHeaders.push_back(SHeader);
   }
   return true;
 }
 
raw_ostream &OS =
       CBA.getOSAndAlignedOffset(SHeader.sh_offset, SHeader.sh_addralign);
   Section.Content.writeAsBinary(OS);
   for (auto i = Section.Content.binary_size(); i < Section.Size; ++i)
     OS.write(0);
   if (Section.EntSize)
     SHeader.sh_entsize = *Section.EntSize;
   else if (Section.Type == llvm::ELF::SHT_RELR)
     SHeader.sh_entsize = sizeof(Elf_Relr);
-  else if (Section.Type == llvm::ELF::SHT_DYNAMIC)
-    SHeader.sh_entsize = sizeof(Elf_Dyn);
   else
     SHeader.sh_entsize = 0;
   SHeader.sh_size = Section.Size;
 }
 
 static bool isMips64EL(const ELFYAML::Object &Doc) {
   return Doc.Header.Machine == ELFYAML::ELF_EM(llvm::ELF::EM_MIPS) &&
          Doc.Header.Class == ELFYAML::ELF_ELFCLASS(ELF::ELFCLASS64) &&
bool ELFState<ELFT>::writeSectionContent(Elf_Shdr &SHeader,
   Flags.ases = Section.ASEs;
   Flags.flags1 = Section.Flags1;
   Flags.flags2 = Section.Flags2;
   OS.write((const char *)&Flags, sizeof(Flags));
 
   return true;
 }
 
+template <class ELFT>
+void ELFState<ELFT>::writeSectionContent(Elf_Shdr &SHeader,
+                                         const ELFYAML::DynamicSection &Section,
+                                         ContiguousBlobAccumulator &CBA) {
+  typedef typename ELFT::uint uintX_t;
+  assert(Section.Type == llvm::ELF::SHT_DYNAMIC &&
+         "Section type is not SHT_DYNAMIC");
+
+  SHeader.sh_size = 2 * sizeof(uintX_t) * Section.Entries.size();
+  if (Section.EntSize)
+    SHeader.sh_entsize = *Section.EntSize;
+  else
+    SHeader.sh_entsize = sizeof(Elf_Dyn);
+
+  auto &OS = CBA.getOSAndAlignedOffset(SHeader.sh_offset, SHeader.sh_addralign);
+  for (const ELFYAML::DynamicEntry &DE : Section.Entries) {
+    uintX_t Tag = DE.Tag;
+    OS.write((const char *)&Tag, sizeof(uintX_t));
+    uintX_t Val = DE.Val;
+    OS.write((const char *)&Val, sizeof(uintX_t));
+  }
+}
+
 template <class ELFT> bool ELFState<ELFT>::buildSectionIndex() {
   for (unsigned i = 0, e = Doc.Sections.size(); i != e; ++i) {
     StringRef Name = Doc.Sections[i]->Name;
     DotShStrtab.add(Name);
     // "+ 1" to take into account the SHT_NULL entry.
     if (SN2I.addName(Name, i + 1)) {
       WithColor::error() << "Repeated section name: '" << Name
                          << "' at YAML section number " << i << ".\n";