diff options
Diffstat (limited to 'include/llvm/Object/ELFYAML.h')
| -rw-r--r-- | include/llvm/Object/ELFYAML.h | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/include/llvm/Object/ELFYAML.h b/include/llvm/Object/ELFYAML.h index abf3693e6f..b6c7556551 100644 --- a/include/llvm/Object/ELFYAML.h +++ b/include/llvm/Object/ELFYAML.h @@ -40,7 +40,6 @@ LLVM_YAML_STRONG_TYPEDEF(uint8_t, ELF_ELFOSABI) LLVM_YAML_STRONG_TYPEDEF(uint32_t, ELF_SHT) // Just use 64, since it can hold 32-bit values too. LLVM_YAML_STRONG_TYPEDEF(uint64_t, ELF_SHF) -LLVM_YAML_STRONG_TYPEDEF(uint8_t, ELF_STB) LLVM_YAML_STRONG_TYPEDEF(uint8_t, ELF_STT) // For now, hardcode 64 bits everywhere that 32 or 64 would be needed @@ -55,12 +54,16 @@ struct FileHeader { }; struct Symbol { StringRef Name; - ELF_STB Binding; ELF_STT Type; StringRef Section; llvm::yaml::Hex64 Value; llvm::yaml::Hex64 Size; }; +struct LocalGlobalWeakSymbols { + std::vector<Symbol> Local; + std::vector<Symbol> Global; + std::vector<Symbol> Weak; +}; struct Section { StringRef Name; ELF_SHT Type; @@ -70,7 +73,7 @@ struct Section { StringRef Link; llvm::yaml::Hex64 AddressAlign; // For SHT_SYMTAB; should be empty otherwise. - std::vector<Symbol> Symbols; + LocalGlobalWeakSymbols Symbols; }; struct Object { FileHeader Header; @@ -122,11 +125,6 @@ struct ScalarBitSetTraits<ELFYAML::ELF_SHF> { }; template <> -struct ScalarEnumerationTraits<ELFYAML::ELF_STB> { - static void enumeration(IO &IO, ELFYAML::ELF_STB &Value); -}; - -template <> struct ScalarEnumerationTraits<ELFYAML::ELF_STT> { static void enumeration(IO &IO, ELFYAML::ELF_STT &Value); }; @@ -142,6 +140,11 @@ struct MappingTraits<ELFYAML::Symbol> { }; template <> +struct MappingTraits<ELFYAML::LocalGlobalWeakSymbols> { + static void mapping(IO &IO, ELFYAML::LocalGlobalWeakSymbols &Symbols); +}; + +template <> struct MappingTraits<ELFYAML::Section> { static void mapping(IO &IO, ELFYAML::Section &Section); }; |