From df917811ca50dbb9b94ea95fbada89c6bea2fc62 Mon Sep 17 00:00:00 2001
From: Galina Kistanova <gkistanova@gmail.com>
Date: Wed, 30 May 2018 18:51:08 +0000
Subject: Reverted r333424 as it broke multiple build bots and left unfixed for
 a long time

llvm-svn: 333578
---
 llvm/tools/llvm-readobj/ELFDumper.cpp | 32 +-------------------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

(limited to 'llvm/tools')

diff --git a/llvm/tools/llvm-readobj/ELFDumper.cpp b/llvm/tools/llvm-readobj/ELFDumper.cpp
index 4acd9be547b..6ca28e273cc 100644
--- a/llvm/tools/llvm-readobj/ELFDumper.cpp
+++ b/llvm/tools/llvm-readobj/ELFDumper.cpp
@@ -3457,7 +3457,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%lx\n",
+      OS << format("0x%x\n",
                    (uint64_t)(*(const typename ELFT::Addr *)Data.data()));
     else
       OS << format("<corrupt length: 0x%x>\n", DataSize);
@@ -3469,36 +3469,6 @@ 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%lx>", CFProtection);
-    OS << "\n";
-    break;
   }
 }
 
-- 
cgit v1.2.3