diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2013-07-05 04:19:32 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2013-07-05 04:19:32 +0000 |
| commit | 24663f69cc98545b32d2eeeed1da887e7910e2f7 (patch) | |
| tree | a2cfb4dd01ff9198b6304e85bbf0fa8dec3f5733 /tools/llvm-ar/llvm-ar.cpp | |
| parent | 4a0bf5423c2dc7eb8ae197447b4b61e6517f108a (diff) | |
| download | llvm-24663f69cc98545b32d2eeeed1da887e7910e2f7.tar.gz llvm-24663f69cc98545b32d2eeeed1da887e7910e2f7.tar.bz2 llvm-24663f69cc98545b32d2eeeed1da887e7910e2f7.tar.xz | |
Don't treat bitcode files specially in llvm-ar.
We really want bitcode files to behave as regular object files in archives, so
we don't need to track that a member is bitcode.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@185681 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/llvm-ar/llvm-ar.cpp')
| -rw-r--r-- | tools/llvm-ar/llvm-ar.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/tools/llvm-ar/llvm-ar.cpp b/tools/llvm-ar/llvm-ar.cpp index 23b3df3d3b..80bc21ae5c 100644 --- a/tools/llvm-ar/llvm-ar.cpp +++ b/tools/llvm-ar/llvm-ar.cpp @@ -99,7 +99,6 @@ bool AddBefore = false; ///< 'b' modifier bool Create = false; ///< 'c' modifier bool TruncateNames = false; ///< 'f' modifier bool InsertBefore = false; ///< 'i' modifier -bool DontSkipBitcode = false; ///< 'k' modifier bool UseCount = false; ///< 'N' modifier bool OriginalDates = false; ///< 'o' modifier bool FullPath = false; ///< 'P' modifier @@ -219,7 +218,6 @@ ArchiveOperation parseCommandLine() { case 'x': ++NumOperations; Operation = Extract; break; case 'c': Create = true; break; case 'f': TruncateNames = true; break; - case 'k': DontSkipBitcode = true; break; case 'l': /* accepted but unused */ break; case 'o': OriginalDates = true; break; case 's': break; // Ignore for now. @@ -323,8 +321,7 @@ bool doPrint(std::string* ErrMsg) { const char* data = reinterpret_cast<const char*>(I->getData()); // Skip things that don't make sense to print - if (I->isSVR4SymbolTable() || - I->isBSD4SymbolTable() || (!DontSkipBitcode && I->isBitcode())) + if (I->isSVR4SymbolTable() || I->isBSD4SymbolTable()) continue; if (Verbose) @@ -373,10 +370,7 @@ doDisplayTable(std::string* ErrMsg) { if (Verbose) { // FIXME: Output should be this format: // Zrw-r--r-- 500/ 500 525 Nov 8 17:42 2004 Makefile - if (I->isBitcode()) - outs() << "b"; - else - outs() << " "; + outs() << " "; unsigned mode = I->getMode(); printMode((mode >> 6) & 007); printMode((mode >> 3) & 007); |