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.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@283022 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Config/config.h.cmake b/include/llvm/Config/config.h.cmake
index 663fb62d524e289bd966c649ff65d2bffc7f1729..117d8c4d54a8744f2b93da132ef9e885351b7430 100644 (file)
--- a/include/llvm/Config/config.h.cmake
+++ b/include/llvm/Config/config.h.cmake
@@ -120,10 +120,6 @@
 /* Define to 1 if you have the <link.h> header file. */
 #cmakedefine HAVE_LINK_H ${HAVE_LINK_H}
 
-/* Define if you can use -Wl,-R. to pass -R. to the linker, in order to add
-   the current directory to the dynamic linker search path. */
-#undef HAVE_LINK_R
-
 /* Define to 1 if you have the <mach/mach.h> header file. */
 #cmakedefine HAVE_MACH_MACH_H ${HAVE_MACH_MACH_H}
 

diff --git a/tools/bugpoint/Miscompilation.cpp b/tools/bugpoint/Miscompilation.cpp
index 20acb304a02cd7368971574c86392705363844f4..792fab07bf11ebe5fe72c9d4d03d54d24dbaa062 100644 (file)
--- a/tools/bugpoint/Miscompilation.cpp
+++ b/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/tools/bugpoint/ToolRunner.cpp b/tools/bugpoint/ToolRunner.cpp
index 9bd5eabf00ff616ed517db2cab588b9abbda3a80..4633d64373368d591119a45849a7a45bc89335de 100644 (file)
--- a/tools/bugpoint/ToolRunner.cpp
+++ b/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