From bc40836a433dbc67b18b3faedbe39ff79628d3e1 Mon Sep 17 00:00:00 2001
From: Cyndy Ishida <cyndy_ishida@apple.com>
Date: Wed, 11 Sep 2019 21:35:28 +0000
Subject: Revert [llvm-nm] Add tapi file support

This reverts r371576 (git commit f88f46358dbffa20af3b054a9346e5154789d50f)

llvm-svn: 371676
---
 llvm/tools/llvm-nm/llvm-nm.cpp | 30 ------------------------------
 1 file changed, 30 deletions(-)

(limited to 'llvm/tools/llvm-nm/llvm-nm.cpp')

diff --git a/llvm/tools/llvm-nm/llvm-nm.cpp b/llvm/tools/llvm-nm/llvm-nm.cpp
index fafefb6084b..ee55722dc13 100644
--- a/llvm/tools/llvm-nm/llvm-nm.cpp
+++ b/llvm/tools/llvm-nm/llvm-nm.cpp
@@ -28,8 +28,6 @@
 #include "llvm/Object/MachO.h"
 #include "llvm/Object/MachOUniversal.h"
 #include "llvm/Object/ObjectFile.h"
-#include "llvm/Object/TapiFile.h"
-#include "llvm/Object/TapiUniversal.h"
 #include "llvm/Object/Wasm.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/FileSystem.h"
@@ -338,8 +336,6 @@ static char isSymbolList64Bit(SymbolicFile &Obj) {
     return false;
   if (isa<WasmObjectFile>(Obj))
     return false;
-  if (TapiFile *Tapi = dyn_cast<TapiFile>(&Obj))
-    return Tapi->is64Bit();
   if (MachOObjectFile *MachO = dyn_cast<MachOObjectFile>(&Obj))
     return MachO->is64Bit();
   return cast<ELFObjectFileBase>(Obj).getBytesInAddress() == 8;
@@ -1045,10 +1041,6 @@ static char getSymbolNMTypeChar(MachOObjectFile &Obj, basic_symbol_iterator I) {
   return '?';
 }
 
-static char getSymbolNMTypeChar(TapiFile &Obj, basic_symbol_iterator I) {
-  return 's';
-}
-
 static char getSymbolNMTypeChar(WasmObjectFile &Obj, basic_symbol_iterator I) {
   uint32_t Flags = I->getFlags();
   if (Flags & SymbolRef::SF_Executable)
@@ -1141,8 +1133,6 @@ static char getNMSectionTagAndName(SymbolicFile &Obj, basic_symbol_iterator I,
     Ret = getSymbolNMTypeChar(*MachO, I);
   else if (WasmObjectFile *Wasm = dyn_cast<WasmObjectFile>(&Obj))
     Ret = getSymbolNMTypeChar(*Wasm, I);
-  else if (TapiFile *Tapi = dyn_cast<TapiFile>(&Obj))
-    Ret = getSymbolNMTypeChar(*Tapi, I);
   else
     Ret = getSymbolNMTypeChar(cast<ELFObjectFileBase>(Obj), I);
 
@@ -2073,26 +2063,6 @@ static void dumpSymbolNamesFromFile(std::string &Filename) {
     }
     return;
   }
-
-  if (TapiUniversal *TU = dyn_cast<TapiUniversal>(&Bin)) {
-    for (auto &I : TU->objects()) {
-      auto ObjOrErr = I.getAsObjectFile();
-      if (ObjOrErr) {
-        auto &Obj = *ObjOrErr.get();
-        outs() << "\n"
-               << Obj.getFileName() << " (for architecture "
-               << I.getArchFlagName() << ")"
-               << ":\n";
-        dumpSymbolNamesFromObject(Obj, false, {}, I.getArchFlagName());
-      } else if (auto E =
-                     isNotObjectErrorInvalidFileType(ObjOrErr.takeError())) {
-        error(std::move(E), Filename, I.getArchFlagName());
-      }
-    }
-
-    return;
-  }
-
   if (SymbolicFile *O = dyn_cast<SymbolicFile>(&Bin)) {
     if (!MachOPrintSizeWarning && PrintSize &&  isa<MachOObjectFile>(O)) {
       WithColor::warning(errs(), ToolName)
-- 
cgit v1.2.3