diff options
| -rw-r--r-- | include/llvm/Linker.h | 11 | ||||
| -rw-r--r-- | lib/Linker/Linker.cpp | 16 | ||||
| -rw-r--r-- | tools/lto/LTOCodeGenerator.cpp | 2 |
3 files changed, 9 insertions, 20 deletions
diff --git a/include/llvm/Linker.h b/include/llvm/Linker.h index 593d913b59..a398e1233a 100644 --- a/include/llvm/Linker.h +++ b/include/llvm/Linker.h @@ -47,16 +47,14 @@ class Linker { /// Construct the Linker with an empty module which will be given the /// name \p progname. \p progname will also be used for error messages. /// @brief Construct with empty module - Linker(StringRef progname, ///< name of tool running linker - StringRef modulename, ///< name of linker's end-result module - LLVMContext &C, ///< Context for global info - unsigned Flags = 0 ///< ControlFlags (one or more |'d together) + Linker(StringRef modulename, ///< name of linker's end-result module + LLVMContext &C ///< Context for global info ); /// Construct the Linker with a previously defined module, \p aModule. Use /// \p progname for the name of the program in error messages. /// @brief Construct with existing module - Linker(StringRef progname, Module* aModule, unsigned Flags = 0); + Linker(Module* aModule); /// Destruct the Linker. /// @brief Destructor @@ -115,9 +113,6 @@ class Linker { private: LLVMContext& Context; ///< The context for global information Module* Composite; ///< The composite module linked together - unsigned Flags; ///< Flags to control optional behavior. - std::string Error; ///< Text of error that occurred. - std::string ProgramName; ///< Name of the program being linked /// @} }; diff --git a/lib/Linker/Linker.cpp b/lib/Linker/Linker.cpp index 06d24694ee..f8bf21e5ea 100644 --- a/lib/Linker/Linker.cpp +++ b/lib/Linker/Linker.cpp @@ -19,20 +19,14 @@ #include "llvm/Support/system_error.h" using namespace llvm; -Linker::Linker(StringRef progname, StringRef modname, - LLVMContext& C, unsigned flags): +Linker::Linker(StringRef modname, + LLVMContext& C): Context(C), - Composite(new Module(modname, C)), - Flags(flags), - Error(), - ProgramName(progname) { } + Composite(new Module(modname, C)) { } -Linker::Linker(StringRef progname, Module* aModule, unsigned flags) : +Linker::Linker(Module* aModule) : Context(aModule->getContext()), - Composite(aModule), - Flags(flags), - Error(), - ProgramName(progname) { } + Composite(aModule) { } Linker::~Linker() { delete Composite; diff --git a/tools/lto/LTOCodeGenerator.cpp b/tools/lto/LTOCodeGenerator.cpp index 5f5f76f35f..683a480d3f 100644 --- a/tools/lto/LTOCodeGenerator.cpp +++ b/tools/lto/LTOCodeGenerator.cpp @@ -69,7 +69,7 @@ const char* LTOCodeGenerator::getVersionString() { LTOCodeGenerator::LTOCodeGenerator() : _context(getGlobalContext()), - _linker("LinkTimeOptimizer", "ld-temp.o", _context), _target(NULL), + _linker("ld-temp.o", _context), _target(NULL), _emitDwarfDebugInfo(false), _scopeRestrictionsDone(false), _codeModel(LTO_CODEGEN_PIC_MODEL_DYNAMIC), _nativeObjectFile(NULL) { |