[llvm] r283022 - Retire bugpoint's -R. hack.

[Joerg Sonnenberger via llvm-commits]

Author: joerg
Date: Sat Oct  1 02:34:18 2016
New Revision: 283022

URL: http://llvm.org/viewvc/llvm-project?rev=283022&view=rev
Log:
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.

Modified:
    llvm/trunk/include/llvm/Config/config.h.cmake
    llvm/trunk/tools/bugpoint/Miscompilation.cpp
    llvm/trunk/tools/bugpoint/ToolRunner.cpp

Modified: llvm/trunk/include/llvm/Config/config.h.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Config/config.h.cmake?rev=283022&r1=283021&r2=283022&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Config/config.h.cmake (original)
+++ llvm/trunk/include/llvm/Config/config.h.cmake Sat Oct  1 02:34:18 2016
@@ -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}
 

Modified: llvm/trunk/tools/bugpoint/Miscompilation.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/bugpoint/Miscompilation.cpp?rev=283022&r1=283021&r2=283022&view=diff
==============================================================================
--- llvm/trunk/tools/bugpoint/Miscompilation.cpp (original)
+++ llvm/trunk/tools/bugpoint/Miscompilation.cpp Sat Oct  1 02:34:18 2016
@@ -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];

Modified: llvm/trunk/tools/bugpoint/ToolRunner.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/bugpoint/ToolRunner.cpp?rev=283022&r1=283021&r2=283022&view=diff
==============================================================================
--- llvm/trunk/tools/bugpoint/ToolRunner.cpp (original)
+++ llvm/trunk/tools/bugpoint/ToolRunner.cpp Sat Oct  1 02:34:18 2016
@@ -679,9 +679,6 @@ Expected<int> CC::ExecuteProgram(const s
 
   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