From: Nick Kledzik Date: Thu, 4 Jun 2009 19:14:08 +0000 (+0000) Subject: libLTO for darwin should add -static when assembling .s X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=d8b4711a16a38f446f2d0e902d13790e03196dee;p=oota-llvm.git libLTO for darwin should add -static when assembling .s git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@72881 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/tools/lto/LTOCodeGenerator.cpp b/tools/lto/LTOCodeGenerator.cpp index 17c83bb5cf6..0bd2abe2455 100644 --- a/tools/lto/LTOCodeGenerator.cpp +++ b/tools/lto/LTOCodeGenerator.cpp @@ -249,6 +249,7 @@ bool LTOCodeGenerator::assemble(const std::string& asmPath, std::string targetTriple = _linker.getModule()->getTargetTriple(); args.push_back(tool.c_str()); if ( targetTriple.find("darwin") != targetTriple.size() ) { + // darwin specific command line options if (strncmp(targetTriple.c_str(), "i386-apple-", 11) == 0) { args.push_back("-arch"); args.push_back("i386"); @@ -286,6 +287,9 @@ bool LTOCodeGenerator::assemble(const std::string& asmPath, args.push_back("-arch"); args.push_back("armv6"); } + // add -static to assembler command line when code model requires + if ( (_assemblerPath != NULL) && (_codeModel == LTO_CODEGEN_PIC_MODEL_STATIC) ) + args.push_back("-static"); } if ( needsCompilerOptions ) { args.push_back("-c");