[yaml2obj][ELF] Allow symbols to reference sections.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@184468 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Object/ELFYAML.h b/include/llvm/Object/ELFYAML.h
index 29bba0ca3826130d796fcd8416b40ba037bf6a7e..b0079445c4107e59b59230d8a1dcf8ed5604034c 100644 (file)
--- a/include/llvm/Object/ELFYAML.h
+++ b/include/llvm/Object/ELFYAML.h
@@ -57,6 +57,7 @@ struct Symbol {
   StringRef Name;
   ELF_STB Binding;
   ELF_STT Type;
+  StringRef Section;
 };
 struct Section {
   StringRef Name;

diff --git a/lib/Object/ELFYAML.cpp b/lib/Object/ELFYAML.cpp
index 5692f4b1500376177131cb969f069d24ca702031..39faf7df2b9cc8e53cca0ba8320efa2117515359 100644 (file)
--- a/lib/Object/ELFYAML.cpp
+++ b/lib/Object/ELFYAML.cpp
@@ -315,6 +315,7 @@ void MappingTraits<ELFYAML::Symbol>::mapping(IO &IO, ELFYAML::Symbol &Symbol) {
   IO.mapOptional("Name", Symbol.Name, StringRef());
   IO.mapOptional("Binding", Symbol.Binding, ELFYAML::ELF_STB(0));
   IO.mapOptional("Type", Symbol.Type, ELFYAML::ELF_STT(0));
+  IO.mapOptional("Section", Symbol.Section, StringRef());
 }
 
 void MappingTraits<ELFYAML::Section>::mapping(IO &IO,

diff --git a/test/Object/yaml2obj-elf-symbol-basic.yaml b/test/Object/yaml2obj-elf-symbol-basic.yaml
index c7593b315986a2724cdcb8cebc8465df8c3cd1d9..f3883bb8807455d7186ba834e1da65f84c03ef20 100644 (file)
--- a/test/Object/yaml2obj-elf-symbol-basic.yaml
+++ b/test/Object/yaml2obj-elf-symbol-basic.yaml
@@ -15,6 +15,7 @@ Sections:
     - Name: main
       Binding: STB_GLOBAL
       Type: STT_FUNC
+      Section: .text
 
 # CHECK:      Symbols [
 # CHECK-NEXT:   Symbol {
@@ -23,3 +24,4 @@ Sections:
 # CHECK-NEXT:     Name: main
 # CHECK:          Binding: Global
 # CHECK-NEXT:     Type: Function
+# CHECK:          Section: .text

diff --git a/tools/yaml2obj/yaml2elf.cpp b/tools/yaml2obj/yaml2elf.cpp
index 667718af3831e343cf88c53a999b8c5cd7cb47bf..421781ce14c9d5423c4c26bfb9fd2cad391df6e3 100644 (file)
--- a/tools/yaml2obj/yaml2elf.cpp
+++ b/tools/yaml2obj/yaml2elf.cpp
@@ -199,6 +199,13 @@ static void handleSymtabSectionHeader(
     if (!Sym.Name.empty())
       Symbol.st_name = State.getStringTable().addString(Sym.Name);
     Symbol.setBindingAndType(Sym.Binding, Sym.Type);
+    unsigned Index;
+    if (State.getSN2I().lookupSection(Sym.Section, Index)) {
+      errs() << "error: Unknown section referenced: '" << Sym.Section
+             << "' by YAML symbol " << Sym.Name << ".\n";
+      exit(1);
+    }
+    Symbol.st_shndx = Index;
     Syms.push_back(Symbol);
   }