summaryrefslogtreecommitdiffstats
path: root/llvm/tools/bugpoint
diff options
context:
space:
mode:
authorJoerg Sonnenberger <joerg@bec.de>2016-10-01 07:34:18 +0000
committerJoerg Sonnenberger <joerg@bec.de>2016-10-01 07:34:18 +0000
commit8c4e4213903a356620c2c44b4249b60cbf000fbc (patch)
treeabb0a0c8121b898dbe118ee33fc6ee2a55576f91 /llvm/tools/bugpoint
parentd1f31d0a4918dc9eacb2cb4ceaa7c9b8df6277de (diff)
downloadbcm5719-llvm-8c4e4213903a356620c2c44b4249b60cbf000fbc.tar.gz
bcm5719-llvm-8c4e4213903a356620c2c44b4249b60cbf000fbc.zip
Retire bugpoint's -R. hack.
It got disconnected during the cmake conversion. For Miscompilation.cpp, it was purely advisory for the user and the ToolRunner.cpp version was trying to compensate for libs and bins in the same directory, which hasn't been the case for a very long time. llvm-svn: 283022
Diffstat (limited to 'llvm/tools/bugpoint')
-rw-r--r--llvm/tools/bugpoint/Miscompilation.cpp8
-rw-r--r--llvm/tools/bugpoint/ToolRunner.cpp3
2 files changed, 2 insertions, 9 deletions
diff --git a/llvm/tools/bugpoint/Miscompilation.cpp b/llvm/tools/bugpoint/Miscompilation.cpp
index 20acb304a02..792fab07bf1 100644
--- a/llvm/tools/bugpoint/Miscompilation.cpp
+++ b/llvm/tools/bugpoint/Miscompilation.cpp
@@ -1084,12 +1084,8 @@ Error BugDriver::debugCodeGenerator() {
} else {
outs() << " llc " << TestModuleBC << " -o " << TestModuleBC << ".s\n";
outs() << " cc " << *SharedObject << " " << TestModuleBC.str() << ".s -o "
- << TestModuleBC << ".exe";
-#if defined(HAVE_LINK_R)
- outs() << " -Wl,-R.";
-#endif
- outs() << "\n";
- outs() << " " << TestModuleBC << ".exe";
+ << TestModuleBC << ".exe\n";
+ outs() << " ./" << TestModuleBC << ".exe";
}
for (unsigned i = 0, e = InputArgv.size(); i != e; ++i)
outs() << " " << InputArgv[i];
diff --git a/llvm/tools/bugpoint/ToolRunner.cpp b/llvm/tools/bugpoint/ToolRunner.cpp
index 9bd5eabf00f..4633d643733 100644
--- a/llvm/tools/bugpoint/ToolRunner.cpp
+++ b/llvm/tools/bugpoint/ToolRunner.cpp
@@ -679,9 +679,6 @@ Expected<int> CC::ExecuteProgram(const std::string &ProgramFile,
CCArgs.push_back("-lm"); // Hard-code the math library...
CCArgs.push_back("-O2"); // Optimize the program a bit...
-#if defined(HAVE_LINK_R)
- CCArgs.push_back("-Wl,-R."); // Search this dir for .so files
-#endif
if (TargetTriple.getArch() == Triple::sparc)
CCArgs.push_back("-mcpu=v9");
CCArgs.push_back(nullptr); // NULL terminator
OpenPOWER on IntegriCloud