diff options
Diffstat (limited to 'llvm/tools/llvm-readobj/ELFDumper.cpp')
-rw-r--r-- | llvm/tools/llvm-readobj/ELFDumper.cpp | 32 |
1 files changed, 31 insertions, 1 deletions
diff --git a/llvm/tools/llvm-readobj/ELFDumper.cpp b/llvm/tools/llvm-readobj/ELFDumper.cpp index 993d4aaa81e..b6fed4f3c34 100644 --- a/llvm/tools/llvm-readobj/ELFDumper.cpp +++ b/llvm/tools/llvm-readobj/ELFDumper.cpp @@ -3491,7 +3491,7 @@ static void printGNUProperty(raw_ostream &OS, uint32_t Type, uint32_t DataSize, case GNU_PROPERTY_STACK_SIZE: { OS << " stack size: "; if (DataSize == sizeof(typename ELFT::uint)) - OS << format("0x%x\n", + OS << format("0x%llx\n", (uint64_t)(*(const typename ELFT::Addr *)Data.data())); else OS << format("<corrupt length: 0x%x>\n", DataSize); @@ -3503,6 +3503,36 @@ static void printGNUProperty(raw_ostream &OS, uint32_t Type, uint32_t DataSize, OS << format(" <corrupt length: 0x%x>", DataSize); OS << "\n"; break; + case GNU_PROPERTY_X86_FEATURE_1_AND: + OS << " X86 features: "; + if (DataSize != 4 && DataSize != 8) { + OS << format("<corrupt length: 0x%x>\n", DataSize); + break; + } + uint64_t CFProtection = + (DataSize == 4) + ? support::endian::read32<ELFT::TargetEndianness>(Data.data()) + : support::endian::read64<ELFT::TargetEndianness>(Data.data()); + if (CFProtection == 0) { + OS << "none\n"; + break; + } + if (CFProtection & GNU_PROPERTY_X86_FEATURE_1_IBT) { + OS << "IBT"; + CFProtection &= ~GNU_PROPERTY_X86_FEATURE_1_IBT; + if (CFProtection) + OS << ", "; + } + if (CFProtection & GNU_PROPERTY_X86_FEATURE_1_SHSTK) { + OS << "SHSTK"; + CFProtection &= ~GNU_PROPERTY_X86_FEATURE_1_SHSTK; + if (CFProtection) + OS << ", "; + } + if (CFProtection) + OS << format("<unknown flags: 0x%llx>", CFProtection); + OS << "\n"; + break; } } |