From cbad58624090933cb8fb85587e03be613a481309 Mon Sep 17 00:00:00 2001 From: Nick Kledzik Date: Thu, 4 Jun 2009 00:28:45 +0000 Subject: [PATCH] libLTO.dylib needs to let linker specify path to assembler Add lto_codegen_set_assembler_path() API which allows the linker to specify the path to the assembler tool to run. When assembler is used (instead of compiler) different command line options are used. Add LTO_API_VERSION #define so clients (linkers) can conditionalize use of new APIs. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@72823 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm-c/lto.h | 10 ++++++++++ tools/lto/LTOCodeGenerator.cpp | 36 +++++++++++++++++++++++----------- tools/lto/LTOCodeGenerator.h | 2 ++ tools/lto/lto.cpp | 8 ++++++++ tools/lto/lto.exports | 1 + 5 files changed, 46 insertions(+), 11 deletions(-) diff --git a/include/llvm-c/lto.h b/include/llvm-c/lto.h index 81986176908..5d92fc5af01 100644 --- a/include/llvm-c/lto.h +++ b/include/llvm-c/lto.h @@ -19,6 +19,8 @@ #include #include +#define LTO_API_VERSION 3 + typedef enum { LTO_SYMBOL_ALIGNMENT_MASK = 0x0000001F, /* log2 of alignment */ LTO_SYMBOL_PERMISSIONS_MASK = 0x000000E0, @@ -207,6 +209,14 @@ extern void lto_codegen_set_gcc_path(lto_code_gen_t cg, const char* path); +/** + * Sets the location of the assembler tool to run. If not set, libLTO + * will use gcc to invoke the assembler. + */ +extern void +lto_codegen_set_assembler_path(lto_code_gen_t cg, const char* path); + + /** * Adds to a list of all global symbols that must exist in the final * generated code. If a function is not listed, it might be diff --git a/tools/lto/LTOCodeGenerator.cpp b/tools/lto/LTOCodeGenerator.cpp index 7aa591ab742..17c83bb5cf6 100644 --- a/tools/lto/LTOCodeGenerator.cpp +++ b/tools/lto/LTOCodeGenerator.cpp @@ -72,7 +72,7 @@ LTOCodeGenerator::LTOCodeGenerator() : _linker("LinkTimeOptimizer", "ld-temp.o"), _target(NULL), _emitDwarfDebugInfo(false), _scopeRestrictionsDone(false), _codeModel(LTO_CODEGEN_PIC_MODEL_DYNAMIC), - _nativeObjectFile(NULL), _gccPath(NULL) + _nativeObjectFile(NULL), _gccPath(NULL), _assemblerPath(NULL) { } @@ -128,6 +128,13 @@ void LTOCodeGenerator::setGccPath(const char* path) _gccPath = new sys::Path(path); } +void LTOCodeGenerator::setAssemblerPath(const char* path) +{ + if ( _assemblerPath ) + delete _assemblerPath; + _assemblerPath = new sys::Path(path); +} + void LTOCodeGenerator::addMustPreserveSymbol(const char* sym) { _mustPreserveSymbols[sym] = 1; @@ -220,13 +227,18 @@ const void* LTOCodeGenerator::compile(size_t* length, std::string& errMsg) bool LTOCodeGenerator::assemble(const std::string& asmPath, const std::string& objPath, std::string& errMsg) { - sys::Path gcc; - if ( _gccPath ) { - gcc = *_gccPath; + sys::Path tool; + bool needsCompilerOptions = true; + if ( _assemblerPath ) { + tool = *_assemblerPath; + needsCompilerOptions = false; + } + else if ( _gccPath ) { + tool = *_gccPath; } else { // find compiler driver - gcc = sys::Program::FindProgramByName("gcc"); - if ( gcc.isEmpty() ) { + tool = sys::Program::FindProgramByName("gcc"); + if ( tool.isEmpty() ) { errMsg = "can't locate gcc"; return true; } @@ -235,7 +247,7 @@ bool LTOCodeGenerator::assemble(const std::string& asmPath, // build argument list std::vector args; std::string targetTriple = _linker.getModule()->getTargetTriple(); - args.push_back(gcc.c_str()); + args.push_back(tool.c_str()); if ( targetTriple.find("darwin") != targetTriple.size() ) { if (strncmp(targetTriple.c_str(), "i386-apple-", 11) == 0) { args.push_back("-arch"); @@ -275,16 +287,18 @@ bool LTOCodeGenerator::assemble(const std::string& asmPath, args.push_back("armv6"); } } - args.push_back("-c"); - args.push_back("-x"); - args.push_back("assembler"); + if ( needsCompilerOptions ) { + args.push_back("-c"); + args.push_back("-x"); + args.push_back("assembler"); + } args.push_back("-o"); args.push_back(objPath.c_str()); args.push_back(asmPath.c_str()); args.push_back(0); // invoke assembler - if ( sys::Program::ExecuteAndWait(gcc, &args[0], 0, 0, 0, 0, &errMsg) ) { + if ( sys::Program::ExecuteAndWait(tool, &args[0], 0, 0, 0, 0, &errMsg) ) { errMsg = "error in assembly"; return true; } diff --git a/tools/lto/LTOCodeGenerator.h b/tools/lto/LTOCodeGenerator.h index 57398b06500..e02a7ab1159 100644 --- a/tools/lto/LTOCodeGenerator.h +++ b/tools/lto/LTOCodeGenerator.h @@ -37,6 +37,7 @@ public: bool setDebugInfo(lto_debug_model, std::string& errMsg); bool setCodePICModel(lto_codegen_model, std::string& errMsg); void setGccPath(const char* path); + void setAssemblerPath(const char* path); void addMustPreserveSymbol(const char* sym); bool writeMergedModules(const char* path, std::string& errMsg); @@ -61,6 +62,7 @@ private: llvm::MemoryBuffer* _nativeObjectFile; std::vector _codegenOptions; llvm::sys::Path* _gccPath; + llvm::sys::Path* _assemblerPath; }; #endif // LTO_CODE_GENERATOR_H diff --git a/tools/lto/lto.cpp b/tools/lto/lto.cpp index 5c3f90aa485..7eb39ef2100 100644 --- a/tools/lto/lto.cpp +++ b/tools/lto/lto.cpp @@ -209,6 +209,14 @@ void lto_codegen_set_gcc_path(lto_code_gen_t cg, const char* path) cg->setGccPath(path); } +// +// sets the path to the assembler tool +// +void lto_codegen_set_assembler_path(lto_code_gen_t cg, const char* path) +{ + cg->setAssemblerPath(path); +} + // // adds to a list of all global symbols that must exist in the final // generated code. If a function is not listed there, it might be diff --git a/tools/lto/lto.exports b/tools/lto/lto.exports index aff755937b5..01f43d1c36d 100644 --- a/tools/lto/lto.exports +++ b/tools/lto/lto.exports @@ -20,4 +20,5 @@ _lto_codegen_set_debug_model _lto_codegen_set_pic_model _lto_codegen_write_merged_modules _lto_codegen_debug_options +_lto_codegen_set_assembler_path -- 2.34.1