Changes in directory llvm/tools/bugpoint:
ExecutionDriver.cpp updated: 1.61 -> 1.62
ToolRunner.cpp updated: 1.53 -> 1.54
ToolRunner.h updated: 1.21 -> 1.22
---
Log message:
Pass -Xlinker flags to gcc when it builds the shared object.
---
Diffs of the changes: (+45 -25)
ExecutionDriver.cpp | 4 +--
ToolRunner.cpp | 61 ++++++++++++++++++++++++++++++++++------------------
ToolRunner.h | 5 ++--
3 files changed, 45 insertions(+), 25 deletions(-)
Index: llvm/tools/bugpoint/ExecutionDriver.cpp
diff -u llvm/tools/bugpoint/ExecutionDriver.cpp:1.61
llvm/tools/bugpoint/ExecutionDriver.cpp:1.62
--- llvm/tools/bugpoint/ExecutionDriver.cpp:1.61 Mon Jun 12 22:10:48 2006
+++ llvm/tools/bugpoint/ExecutionDriver.cpp Tue Jun 27 15:35:36 2006
@@ -288,7 +288,7 @@
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 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.
Index: llvm/tools/bugpoint/ToolRunner.cpp
diff -u llvm/tools/bugpoint/ToolRunner.cpp:1.53
llvm/tools/bugpoint/ToolRunner.cpp:1.54
--- llvm/tools/bugpoint/ToolRunner.cpp:1.53 Fri Jun 9 16:31:53 2006
+++ llvm/tools/bugpoint/ToolRunner.cpp Tue Jun 27 15:35:36 2006
@@ -459,44 +459,63 @@
}
int GCC::MakeSharedObject(const std::string &InputFile, FileType fileType,
- std::string &OutputFile) {
+ std::string &OutputFile,
+ const std::vector<std::string> &ArgsForGCC) {
sys::Path uniqueFilename(InputFile+LTDL_SHLIB_EXT);
uniqueFilename.makeUnique();
OutputFile = uniqueFilename.toString();
+ std::vector<const char*> 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 << "<gcc>" << 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;
Index: llvm/tools/bugpoint/ToolRunner.h
diff -u llvm/tools/bugpoint/ToolRunner.h:1.21
llvm/tools/bugpoint/ToolRunner.h:1.22
--- llvm/tools/bugpoint/ToolRunner.h:1.21 Tue Jun 6 17:30:59 2006
+++ llvm/tools/bugpoint/ToolRunner.h Tue Jun 27 15:35:36 2006
@@ -48,7 +48,7 @@
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 @@
/// 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<std::string> &ArgsForGCC);
};
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
