X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=tools%2Fllvm-ld%2Fllvm-ld.cpp;h=40265628ac007335acb51ced15aab6e10d65a3d4;hb=4ce138cc5593fb17161308af3cf25981b4088c17;hp=c86341fda52f9378ff28e19288a827acb51f3b35;hpb=3f931b8c0e3f27aeb52d8acf209c64e182defb3f;p=oota-llvm.git diff --git a/tools/llvm-ld/llvm-ld.cpp b/tools/llvm-ld/llvm-ld.cpp index c86341fda52..40265628ac0 100644 --- a/tools/llvm-ld/llvm-ld.cpp +++ b/tools/llvm-ld/llvm-ld.cpp @@ -2,8 +2,8 @@ // // The LLVM Compiler Infrastructure // -// This file was developed by the LLVM research group and is distributed under -// the University of Illinois Open Source License. See LICENSE.TXT for details. +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. // //===----------------------------------------------------------------------===// // @@ -11,7 +11,7 @@ // system 'ld' conventions. As such, the default output file is ./a.out. // Additionally, this program outputs a shell script that is used to invoke LLI // to execute the program. In this manner, the generated executable (a.out for -// example), is directly executable, whereas the bytecode file actually lives in +// example), is directly executable, whereas the bitcode file actually lives in // the a.out.bc file generated by this program. Also, Force is on by default. // // Note that if someone (or a script) deletes the executable program generated, @@ -38,11 +38,12 @@ #include "llvm/System/Signals.h" #include #include +#include using namespace llvm; // Input/Output Options static cl::list InputFilenames(cl::Positional, cl::OneOrMore, - cl::desc("")); + cl::desc("")); static cl::opt OutputFilename("o", cl::init("a.out"), cl::desc("Override output filename"), @@ -55,10 +56,18 @@ static cl::list LibPaths("L", cl::Prefix, cl::desc("Specify a library search path"), cl::value_desc("directory")); +static cl::list FrameworkPaths("F", cl::Prefix, + cl::desc("Specify a framework search path"), + cl::value_desc("directory")); + static cl::list Libraries("l", cl::Prefix, cl::desc("Specify libraries to link to"), cl::value_desc("library prefix")); +static cl::list Frameworks("framework", + cl::desc("Specify frameworks to link to"), + cl::value_desc("framework")); + // Options to control the linking, optimization, and code gen processes static cl::opt LinkAsLibrary("link-as-library", cl::desc("Link the .bc files together as a library, not an executable")); @@ -66,9 +75,6 @@ static cl::opt LinkAsLibrary("link-as-library", static cl::alias Relink("r", cl::aliasopt(LinkAsLibrary), cl::desc("Alias for -link-as-library")); -static cl::opt - MachineArch("march", cl::desc("Architecture to generate assembly for:")); - static cl::opt Native("native", cl::desc("Generate a native binary instead of a shell script")); @@ -203,11 +209,11 @@ static void RemoveEnv(const char * name, char ** const envp) { return; } -/// GenerateBytecode - generates a bytecode file from the module provided -void GenerateBytecode(Module* M, const std::string& FileName) { +/// GenerateBitcode - generates a bitcode file from the module provided +void GenerateBitcode(Module* M, const std::string& FileName) { if (Verbose) - cout << "Generating Bytecode To " << FileName << '\n'; + cout << "Generating Bitcode To " << FileName << '\n'; // Create the output file. std::ios::openmode io_mode = std::ios::out | std::ios::trunc | @@ -216,22 +222,22 @@ void GenerateBytecode(Module* M, const std::string& FileName) { if (!Out.good()) PrintAndExit("error opening '" + FileName + "' for writing!"); - // Ensure that the bytecode file gets removed from the disk if we get a + // Ensure that the bitcode file gets removed from the disk if we get a // terminating signal. sys::RemoveFileOnSignal(sys::Path(FileName)); // Write it out WriteBitcodeToFile(M, Out); - // Close the bytecode file. + // Close the bitcode file. Out.close(); } /// GenerateAssembly - generates a native assembly language source file from the -/// specified bytecode file. +/// specified bitcode file. /// /// Inputs: -/// InputFilename - The name of the input bytecode file. +/// InputFilename - The name of the input bitcode file. /// OutputFilename - The name of the file to generate. /// llc - The pathname to use for LLC. /// envp - The environment to use when running LLC. @@ -242,7 +248,7 @@ static int GenerateAssembly(const std::string &OutputFilename, const std::string &InputFilename, const sys::Path &llc, std::string &ErrMsg ) { - // Run LLC to convert the bytecode file into assembly code. + // Run LLC to convert the bitcode file into assembly code. std::vector args; args.push_back(llc.c_str()); args.push_back("-f"); @@ -259,12 +265,12 @@ static int GenerateAssembly(const std::string &OutputFilename, return sys::Program::ExecuteAndWait(llc, &args[0], 0, 0, 0, 0, &ErrMsg); } -/// GenerateCFile - generates a C source file from the specified bytecode file. +/// GenerateCFile - generates a C source file from the specified bitcode file. static int GenerateCFile(const std::string &OutputFile, const std::string &InputFile, const sys::Path &llc, std::string& ErrMsg) { - // Run LLC to convert the bytecode file into C. + // Run LLC to convert the bitcode file into C. std::vector args; args.push_back(llc.c_str()); args.push_back("-march=c"); @@ -283,13 +289,15 @@ static int GenerateCFile(const std::string &OutputFile, } /// GenerateNative - generates a native object file from the -/// specified bytecode file. +/// specified bitcode file. /// /// Inputs: -/// InputFilename - The name of the input bytecode file. +/// InputFilename - The name of the input bitcode file. /// OutputFilename - The name of the file to generate. /// NativeLinkItems - The native libraries, files, code with which to link /// LibPaths - The list of directories in which to find libraries. +/// FrameworksPaths - The list of directories in which to find frameworks. +/// Frameworks - The list of frameworks (dynamic libraries) /// gcc - The pathname to use for GGC. /// envp - A copy of the process's current environment. /// @@ -334,17 +342,17 @@ static int GenerateNative(const std::string &OutputFilename, args.push_back(OutputFilename); args.push_back(InputFilename); - // Add in the library paths + // Add in the library and framework paths for (unsigned index = 0; index < LibPaths.size(); index++) { - args.push_back("-L"); - args.push_back(LibPaths[index]); + args.push_back("-L" + LibPaths[index]); + } + for (unsigned index = 0; index < FrameworkPaths.size(); index++) { + args.push_back("-F" + FrameworkPaths[index]); } // Add the requested options - for (unsigned index = 0; index < XLinker.size(); index++) { + for (unsigned index = 0; index < XLinker.size(); index++) args.push_back(XLinker[index]); - args.push_back(Libraries[index]); - } // Add in the libraries to link. for (unsigned index = 0; index < LinkItems.size(); index++) @@ -355,6 +363,11 @@ static int GenerateNative(const std::string &OutputFilename, args.push_back(LinkItems[index].first); } + // Add in frameworks to link. + for (unsigned index = 0; index < Frameworks.size(); index++) { + args.push_back("-framework"); + args.push_back(Frameworks[index]); + } // Now that "args" owns all the std::strings for the arguments, call the c_str // method to get the underlying string array. We do this game so that the @@ -377,7 +390,7 @@ static int GenerateNative(const std::string &OutputFilename, } /// EmitShellScript - Output the wrapper file that invokes the JIT on the LLVM -/// bytecode file for the program. +/// bitcode file for the program. static void EmitShellScript(char **argv) { if (Verbose) cout << "Emitting Shell Script\n"; @@ -472,13 +485,13 @@ int main(int argc, char **argv, char **envp) { progname = sys::Path(argv[0]).getBasename(); // Parse the command line options - cl::ParseCommandLineOptions(argc, argv, " llvm linker\n"); + cl::ParseCommandLineOptions(argc, argv, "llvm linker\n"); sys::PrintStackTraceOnErrorSignal(); // Construct a Linker (now that Verbose is set) Linker TheLinker(progname, OutputFilename, Verbose); - // Keep track of the native link items (versus the bytecode items) + // Keep track of the native link items (versus the bitcode items) Linker::ItemList NativeLinkItems; // Add library paths to the linker @@ -517,10 +530,26 @@ int main(int argc, char **argv, char **envp) { // Optimize the module Optimize(Composite.get()); - // Generate the bytecode for the optimized module. - std::string RealBytecodeOutput = OutputFilename; - if (!LinkAsLibrary) RealBytecodeOutput += ".bc"; - GenerateBytecode(Composite.get(), RealBytecodeOutput); +#if defined(_WIN32) || defined(__CYGWIN__) + if (!LinkAsLibrary) { + // Default to "a.exe" instead of "a.out". + if (OutputFilename.getNumOccurrences() == 0) + OutputFilename = "a.exe"; + + // If there is no suffix add an "exe" one. + sys::Path ExeFile( OutputFilename ); + if (ExeFile.getSuffix() == "") { + ExeFile.appendSuffix("exe"); + OutputFilename = ExeFile.toString(); + } + } +#endif + + // Generate the bitcode for the optimized module. + std::string RealBitcodeOutput = OutputFilename; + + if (!LinkAsLibrary) RealBitcodeOutput += ".bc"; + GenerateBitcode(Composite.get(), RealBitcodeOutput); // If we are not linking a library, generate either a native executable // or a JIT shell script, depending upon what the user wants. @@ -545,17 +574,17 @@ int main(int argc, char **argv, char **envp) { const char* args[4]; args[0] = I->c_str(); - args[1] = RealBytecodeOutput.c_str(); + args[1] = RealBitcodeOutput.c_str(); args[2] = tmp_output.c_str(); args[3] = 0; if (0 == sys::Program::ExecuteAndWait(prog, args, 0,0,0,0, &ErrMsg)) { - if (tmp_output.isBytecodeFile() || tmp_output.isBitcodeFile()) { - sys::Path target(RealBytecodeOutput); + if (tmp_output.isBitcodeFile() || tmp_output.isBitcodeFile()) { + sys::Path target(RealBitcodeOutput); target.eraseFromDisk(); if (tmp_output.renamePathOnDisk(target, &ErrMsg)) PrintAndExit(ErrMsg, 2); } else - PrintAndExit("Post-link optimization output is not bytecode"); + PrintAndExit("Post-link optimization output is not bitcode"); } else { PrintAndExit(ErrMsg); } @@ -563,9 +592,9 @@ int main(int argc, char **argv, char **envp) { } // If the user wants to generate a native executable, compile it from the - // bytecode file. + // bitcode file. // - // Otherwise, create a script that will run the bytecode through the JIT. + // Otherwise, create a script that will run the bitcode through the JIT. if (Native) { // Name of the Assembly Language output file sys::Path AssemblyFile ( OutputFilename); @@ -584,9 +613,9 @@ int main(int argc, char **argv, char **envp) { if (gcc.isEmpty()) PrintAndExit("Failed to find gcc"); - // Generate an assembly language file for the bytecode. + // Generate an assembly language file for the bitcode. std::string ErrMsg; - if (0 != GenerateAssembly(AssemblyFile.toString(), RealBytecodeOutput, + if (0 != GenerateAssembly(AssemblyFile.toString(), RealBitcodeOutput, llc, ErrMsg)) PrintAndExit(ErrMsg); @@ -613,10 +642,10 @@ int main(int argc, char **argv, char **envp) { if (gcc.isEmpty()) PrintAndExit("Failed to find gcc"); - // Generate an assembly language file for the bytecode. + // Generate an assembly language file for the bitcode. std::string ErrMsg; if (0 != GenerateCFile( - CFile.toString(), RealBytecodeOutput, llc, ErrMsg)) + CFile.toString(), RealBitcodeOutput, llc, ErrMsg)) PrintAndExit(ErrMsg); if (0 != GenerateNative(OutputFilename, CFile.toString(), @@ -635,11 +664,11 @@ int main(int argc, char **argv, char **envp) { if (sys::Path(OutputFilename).makeExecutableOnDisk(&ErrMsg)) PrintAndExit(ErrMsg); - // Make the bytecode file readable and directly executable in LLEE as well - if (sys::Path(RealBytecodeOutput).makeExecutableOnDisk(&ErrMsg)) + // Make the bitcode file readable and directly executable in LLEE as well + if (sys::Path(RealBitcodeOutput).makeExecutableOnDisk(&ErrMsg)) PrintAndExit(ErrMsg); - if (sys::Path(RealBytecodeOutput).makeReadableOnDisk(&ErrMsg)) + if (sys::Path(RealBitcodeOutput).makeReadableOnDisk(&ErrMsg)) PrintAndExit(ErrMsg); } } catch (const std::string& msg) {