From 130e2a361147a31ae631d3648afdd95a5c0d40f2 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Tue, 27 Jun 2006 20:35:36 +0000 Subject: [PATCH] Pass -Xlinker flags to gcc when it builds the shared object. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28939 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/bugpoint/ExecutionDriver.cpp | 4 +- tools/bugpoint/ToolRunner.cpp | 61 ++++++++++++++++++++---------- tools/bugpoint/ToolRunner.h | 5 ++- 3 files changed, 45 insertions(+), 25 deletions(-) diff --git a/tools/bugpoint/ExecutionDriver.cpp b/tools/bugpoint/ExecutionDriver.cpp index 5743804a146..453833eb8df 100644 --- a/tools/bugpoint/ExecutionDriver.cpp +++ b/tools/bugpoint/ExecutionDriver.cpp @@ -288,7 +288,7 @@ std::string BugDriver::compileSharedObject(const std::string &BytecodeFile) { std::string SharedObjectFile; if (gcc->MakeSharedObject(OutputCFile.toString(), GCC::CFile, - SharedObjectFile)) + SharedObjectFile, AdditionalLinkerArgs)) exit(1); // Remove the intermediate C file @@ -308,7 +308,7 @@ bool BugDriver::diffProgram(const std::string &BytecodeFile, bool ProgramExitedNonzero; // Execute the program, generating an output file... - sys::Path Output (executeProgram("", BytecodeFile, SharedObject, 0, + sys::Path Output(executeProgram("", BytecodeFile, SharedObject, 0, &ProgramExitedNonzero)); // If we're checking the program exit code, assume anything nonzero is bad. diff --git a/tools/bugpoint/ToolRunner.cpp b/tools/bugpoint/ToolRunner.cpp index 7a90efe2108..94cccf27741 100644 --- a/tools/bugpoint/ToolRunner.cpp +++ b/tools/bugpoint/ToolRunner.cpp @@ -459,44 +459,63 @@ int GCC::ExecuteProgram(const std::string &ProgramFile, } int GCC::MakeSharedObject(const std::string &InputFile, FileType fileType, - std::string &OutputFile) { + std::string &OutputFile, + const std::vector &ArgsForGCC) { sys::Path uniqueFilename(InputFile+LTDL_SHLIB_EXT); uniqueFilename.makeUnique(); OutputFile = uniqueFilename.toString(); + std::vector GCCArgs; + + GCCArgs.push_back(GCCPath.c_str()); + + // Compile the C/asm file into a shared object - const char* GCCArgs[] = { - GCCPath.c_str(), - "-x", (fileType == AsmFile) ? "assembler" : "c", - "-fno-strict-aliasing", - InputFile.c_str(), // Specify the input filename... + GCCArgs.push_back("-x"); + GCCArgs.push_back(fileType == AsmFile ? "assembler" : "c"); + GCCArgs.push_back("-fno-strict-aliasing"); + GCCArgs.push_back(InputFile.c_str()); // Specify the input filename. #if defined(sparc) || defined(__sparc__) || defined(__sparcv9) - "-G", // Compile a shared library, `-G' for Sparc + GCCArgs.push_back("-G"); // Compile a shared library, `-G' for Sparc #elif defined(__APPLE__) - "-single_module", // link all source files into a single module - "-dynamiclib", // `-dynamiclib' for MacOS X/PowerPC - "-undefined", // in data segment, rather than generating - "dynamic_lookup", // blocks. dynamic_lookup requires that you set - // MACOSX_DEPLOYMENT_TARGET=10.3 in your env. + // link all source files into a single module in data segment, rather than + // generating blocks. dynamic_lookup requires that you set + // MACOSX_DEPLOYMENT_TARGET=10.3 in your env. FIXME: it would be better for + // bugpoint to just pass that in the environment of GCC. + GCCArgs.push_back("-single_module"); + GCCArgs.push_back("-dynamiclib"); // `-dynamiclib' for MacOS X/PowerPC + GCCArgs.push_back("-undefined"); + GCCArgs.push_back("dynamic_lookup"); #else - "-shared", // `-shared' for Linux/X86, maybe others + GCCArgs.push_back("-shared"); // `-shared' for Linux/X86, maybe others #endif #if defined(__ia64__) || defined(__alpha__) - "-fPIC", // IA64 requires shared objs to contain PIC + GCCArgs.push_back("-fPIC"); // Requires shared objs to contain PIC #endif #ifdef __sparc__ - "-mcpu=v9", + GCCArgs.push_back("-mcpu=v9"); #endif - "-o", OutputFile.c_str(), // Output to the right filename... - "-O2", // Optimize the program a bit... - 0 - }; + GCCArgs.push_back("-o"); + GCCArgs.push_back(OutputFile.c_str()); // Output to the right filename. + GCCArgs.push_back("-O2"); // Optimize the program a bit. + + + + // Add any arguments intended for GCC. We locate them here because this is + // most likely -L and -l options that need to come before other libraries but + // after the source. Other options won't be sensitive to placement on the + // command line, so this should be safe. + for (unsigned i = 0, e = ArgsForGCC.size(); i != e; ++i) + GCCArgs.push_back(ArgsForGCC[i].c_str()); + GCCArgs.push_back(0); // NULL terminator + + std::cout << "" << std::flush; - if (RunProgramWithTimeout(GCCPath, GCCArgs, sys::Path(), sys::Path(), + if (RunProgramWithTimeout(GCCPath, &GCCArgs[0], sys::Path(), sys::Path(), sys::Path())) { - ProcessFailure(GCCPath, GCCArgs); + ProcessFailure(GCCPath, &GCCArgs[0]); return 1; } return 0; diff --git a/tools/bugpoint/ToolRunner.h b/tools/bugpoint/ToolRunner.h index 9d2903cc643..62bf6d2c84e 100644 --- a/tools/bugpoint/ToolRunner.h +++ b/tools/bugpoint/ToolRunner.h @@ -48,7 +48,7 @@ class GCC { public: enum FileType { AsmFile, CFile }; - static GCC* create(const std::string &ProgramPath, std::string &Message); + static GCC *create(const std::string &ProgramPath, std::string &Message); /// ExecuteProgram - Execute the program specified by "ProgramFile" (which is /// either a .s file, or a .c file, specified by FileType), with the specified @@ -70,7 +70,8 @@ public: /// file or a .s file) into a shared object. /// int MakeSharedObject(const std::string &InputFile, FileType fileType, - std::string &OutputFile); + std::string &OutputFile, + const std::vector &ArgsForGCC); };