diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2013-06-14 23:25:53 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2013-06-14 23:25:53 +0000 |
commit | 250bfb1745fd72615b618e3c8748321a104d80d0 (patch) | |
tree | 0aeaf51210822a37de79ba4b6ba6dbc766b8e5c6 /tools/llvm-ranlib | |
parent | d6055262d23b1a8f2b5c74ab94fc6c143aca1c45 (diff) | |
download | llvm-250bfb1745fd72615b618e3c8748321a104d80d0.tar.gz llvm-250bfb1745fd72615b618e3c8748321a104d80d0.tar.bz2 llvm-250bfb1745fd72615b618e3c8748321a104d80d0.tar.xz |
Remove the LLVM specific archive index.
Archive files (.a) can have a symbol table indicating which object
files in them define which symbols. The purpose of this symbol table
is to speed up linking by allowing the linker the read only the .o
files it is actually going to use instead of having to parse every
object's symbol table.
LLVM's archive library currently supports a LLVM specific format for
such table. It is hard to see any value in that now that llvm-ld is
gone:
* System linkers don't use it: GNU ar uses the same plugin as the
linker to create archive files with a regular index. The OS X ar
creates no symbol table for IL files, I assume the linker just parses
all IL files.
* It doesn't interact well with archives having both IL and native objects.
* We probably don't want to be responsible for yet another archive
format variant.
This patch then:
* Removes support for creating and reading such index from lib/Archive.
* Remove llvm-ranlib, since there is nothing left for it to do.
We should in the future add support for regular indexes to llvm-ar for
both native and IL objects. When we do that, llvm-ranlib should be
reimplemented as a symlink to llvm-ar, as it is equivalent to "ar s".
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@184019 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/llvm-ranlib')
-rw-r--r-- | tools/llvm-ranlib/CMakeLists.txt | 5 | ||||
-rw-r--r-- | tools/llvm-ranlib/LLVMBuild.txt | 22 | ||||
-rw-r--r-- | tools/llvm-ranlib/Makefile | 17 | ||||
-rw-r--r-- | tools/llvm-ranlib/llvm-ranlib.cpp | 98 |
4 files changed, 0 insertions, 142 deletions
diff --git a/tools/llvm-ranlib/CMakeLists.txt b/tools/llvm-ranlib/CMakeLists.txt deleted file mode 100644 index 2d7defee11..0000000000 --- a/tools/llvm-ranlib/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -set(LLVM_LINK_COMPONENTS archive) - -add_llvm_tool(llvm-ranlib - llvm-ranlib.cpp - ) diff --git a/tools/llvm-ranlib/LLVMBuild.txt b/tools/llvm-ranlib/LLVMBuild.txt deleted file mode 100644 index 23015c54e5..0000000000 --- a/tools/llvm-ranlib/LLVMBuild.txt +++ /dev/null @@ -1,22 +0,0 @@ -;===- ./tools/llvm-ranlib/LLVMBuild.txt ------------------------*- Conf -*--===; -; -; The LLVM Compiler Infrastructure -; -; This file is distributed under the University of Illinois Open Source -; License. See LICENSE.TXT for details. -; -;===------------------------------------------------------------------------===; -; -; This is an LLVMBuild description file for the components in this subdirectory. -; -; For more information on the LLVMBuild system, please see: -; -; http://llvm.org/docs/LLVMBuild.html -; -;===------------------------------------------------------------------------===; - -[component_0] -type = Tool -name = llvm-ranlib -parent = Tools -required_libraries = Archive diff --git a/tools/llvm-ranlib/Makefile b/tools/llvm-ranlib/Makefile deleted file mode 100644 index cca95013f4..0000000000 --- a/tools/llvm-ranlib/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -##===- tools/llvm-ranlib/Makefile --------------------------*- Makefile -*-===## -# -# The LLVM Compiler Infrastructure -# -# This file is distributed under the University of Illinois Open Source -# License. See LICENSE.TXT for details. -# -##===----------------------------------------------------------------------===## - -LEVEL := ../.. -TOOLNAME := llvm-ranlib -LINK_COMPONENTS := archive - -# This tool has no plugins, optimize startup time. -TOOL_NO_EXPORTS := 1 - -include $(LEVEL)/Makefile.common diff --git a/tools/llvm-ranlib/llvm-ranlib.cpp b/tools/llvm-ranlib/llvm-ranlib.cpp deleted file mode 100644 index e3e3bad8d6..0000000000 --- a/tools/llvm-ranlib/llvm-ranlib.cpp +++ /dev/null @@ -1,98 +0,0 @@ -//===-- llvm-ranlib.cpp - LLVM archive index generator --------------------===// -// -// The LLVM Compiler Infrastructure -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// -// -// Adds or updates an index (symbol table) for an LLVM archive file. -// -//===----------------------------------------------------------------------===// - -#include "llvm/IR/LLVMContext.h" -#include "llvm/Bitcode/Archive.h" -#include "llvm/IR/Module.h" -#include "llvm/Support/CommandLine.h" -#include "llvm/Support/FileSystem.h" -#include "llvm/Support/Format.h" -#include "llvm/Support/ManagedStatic.h" -#include "llvm/Support/PrettyStackTrace.h" -#include "llvm/Support/Signals.h" -#include "llvm/Support/raw_ostream.h" -#include <memory> -using namespace llvm; - -// llvm-ar operation code and modifier flags -static cl::opt<std::string> -ArchiveName(cl::Positional, cl::Optional, cl::desc("<archive-file>")); - -static cl::opt<bool> -Verbose("verbose",cl::Optional,cl::init(false), - cl::desc("Print the symbol table")); - -// printSymbolTable - print out the archive's symbol table. -void printSymbolTable(Archive* TheArchive) { - outs() << "\nArchive Symbol Table:\n"; - const Archive::SymTabType& symtab = TheArchive->getSymbolTable(); - for (Archive::SymTabType::const_iterator I=symtab.begin(), E=symtab.end(); - I != E; ++I ) { - unsigned offset = TheArchive->getFirstFileOffset() + I->second; - outs() << " " << format("%9u", offset) << "\t" << I->first <<"\n"; - } -} - -int main(int argc, char **argv) { - // Print a stack trace if we signal out. - llvm::sys::PrintStackTraceOnErrorSignal(); - llvm::PrettyStackTraceProgram X(argc, argv); - - LLVMContext &Context = getGlobalContext(); - llvm_shutdown_obj Y; // Call llvm_shutdown() on exit. - - // Have the command line options parsed and handle things - // like --help and --version. - cl::ParseCommandLineOptions(argc, argv, - "LLVM Archive Index Generator (llvm-ranlib)\n\n" - " This program adds or updates an index of bitcode symbols\n" - " to an LLVM archive file." - ); - - int exitCode = 0; - - // Check the path name of the archive - sys::Path ArchivePath; - if (!ArchivePath.set(ArchiveName)) { - errs() << argv[0] << ": " << "Archive name invalid: " << ArchiveName << - "\n"; - return 1; - } - - // Make sure it exists, we don't create empty archives - bool Exists; - if (llvm::sys::fs::exists(ArchivePath.str(), Exists) || !Exists) { - errs() << argv[0] << ": " << "Archive file does not exist" << - ArchivePath.str() << "\n"; - return 1; - } - - std::string err_msg; - OwningPtr<Archive> - AutoArchive(Archive::OpenAndLoad(ArchivePath, Context, &err_msg)); - Archive* TheArchive = AutoArchive.get(); - if (!TheArchive) { - errs() << argv[0] << ": " << err_msg << "\n"; - return 1; - } - - if (TheArchive->writeToDisk(true, false, &err_msg )) { - errs() << argv[0] << ": " << err_msg << "\n"; - return 1; - } - - if (Verbose) - printSymbolTable(TheArchive); - - return exitCode; -} |