Renaming `dis' -> `llvm-dis'.

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

2 files changed, 8 insertions, 7 deletions

diff --git a/tools/bugpoint/CodeGeneratorBug.cpp b/tools/bugpoint/CodeGeneratorBug.cpp
index 603bf77a70..19a23ea007 100644
--- a/tools/bugpoint/CodeGeneratorBug.cpp
+++ b/tools/bugpoint/CodeGeneratorBug.cpp
@@ -253,7 +253,7 @@ bool ReduceMisCodegenFunctions::TestFuncs(const std::vector<Function*> &Funcs,
     for (unsigned i=0, e = InputArgv.size(); i != e; ++i)
       std::cout << " " << InputArgv[i];
     std::cout << "\n";
-    std::cout << "The shared object was created with:\n  dis -c "
+    std::cout << "The shared object was created with:\n  llvm-dis -c "
               << SafeModuleBC << " -o temporary.c\n"
               << "  gcc -xc temporary.c -O2 -o " << SharedObject
 #if defined(sparc) || defined(__sparc__) || defined(__sparcv9)
diff --git a/tools/bugpoint/ExecutionDriver.cpp b/tools/bugpoint/ExecutionDriver.cpp
index a89aaec4d3..657432d801 100644
--- a/tools/bugpoint/ExecutionDriver.cpp
+++ b/tools/bugpoint/ExecutionDriver.cpp
@@ -394,7 +394,7 @@ int JIT::ExecuteProgram(const std::string &Bytecode,
 // CBE Implementation of AbstractIntepreter interface
 //
 class CBE : public AbstractInterpreter {
-  std::string DISPath;          // The path to the LLVM 'dis' executable
+  std::string DISPath;          // The path to the `llvm-dis' executable
   GCC *gcc;
 public:
   CBE(const std::string &disPath, GCC *Gcc) : DISPath(disPath), gcc(Gcc) { }
@@ -402,13 +402,14 @@ public:
 
   // CBE create method - Try to find the 'dis' executable
   static CBE *create(BugDriver *BD, std::string &Message) {
-    std::string DISPath = FindExecutable("dis", BD->getToolName());
+    std::string DISPath = FindExecutable("llvm-dis", BD->getToolName());
     if (DISPath.empty()) {
-      Message = "Cannot find `dis' in bugpoint executable directory or PATH!\n";
+      Message = 
+        "Cannot find `llvm-dis' in bugpoint executable directory or PATH!\n";
       return 0;
     }
 
-    Message = "Found dis: " + DISPath + "\n";
+    Message = "Found llvm-dis: " + DISPath + "\n";
 
     GCC *gcc = GCC::create(BD, Message);
     if (!gcc) {
@@ -445,7 +446,7 @@ int CBE::OutputC(const std::string &Bytecode,
   if (RunProgramWithTimeout(DISPath, DisArgs, "/dev/null", "/dev/null",
                             "/dev/null")) {                            
     // If dis failed on the bytecode, print error...
-    std::cerr << "bugpoint error: `dis -c' failed!\n";
+    std::cerr << "bugpoint error: `llvm-dis -c' failed!\n";
     return 1;
   }
 
@@ -458,7 +459,7 @@ int CBE::ExecuteProgram(const std::string &Bytecode,
                         const std::string &SharedLib) {
   std::string OutputCFile;
   if (OutputC(Bytecode, OutputCFile)) {
-    std::cerr << "Could not generate C code with `dis', exiting.\n";
+    std::cerr << "Could not generate C code with `llvm-dis', exiting.\n";
     exit(1);
   }