The Archive class now has differentiation for BSD4.4 and SVR4 style archive

symbol tables. Adjust our usage to compensate.

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

diff --git a/tools/llvm-ar/llvm-ar.cpp b/tools/llvm-ar/llvm-ar.cpp
index 1a4d75f46d8beade0f88d8f55382186ff2449b54..0707fd66e7be7c047c1f1cc9bd1bc79a34969123 100644 (file)
--- a/tools/llvm-ar/llvm-ar.cpp
+++ b/tools/llvm-ar/llvm-ar.cpp
@@ -339,8 +339,8 @@ void doPrint() {
         const char* data = reinterpret_cast<const char*>(I->getData());
 
         // Skip things that don't make sense to print
-        if (I->isLLVMSymbolTable() || I->isForeignSymbolTable() ||
-            (!DontSkipBytecode && 
+        if (I->isLLVMSymbolTable() || I->isSVR4SymbolTable() || 
+            I->isBSD4SymbolTable() || (!DontSkipBytecode && 
              (I->isBytecode() || I->isCompressedBytecode())))
           continue;
 
@@ -396,10 +396,6 @@ void doDisplayTable() {
           std::cout << "b";
         else if (I->isCompressedBytecode())
           std::cout << "B";
-        else if (I->isForeignSymbolTable())
-          std::cout << "s";
-        else if (I->isLLVMSymbolTable())
-          std::cout << "S";
         else if (I->isCompressed())
           std::cout << "Z";
         else