ccc/Driver: Normalize phase spelling in -ccc-print-phases.

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

diff --git a/lib/Driver/Action.cpp b/lib/Driver/Action.cpp
index 86d676f698a675e66bf4efd229c1ebbda9e21234..0ffc8f0f64febd8b93d3ae93c59c503438c06f20 100644 (file)
--- a/lib/Driver/Action.cpp
+++ b/lib/Driver/Action.cpp
@@ -18,12 +18,12 @@ const char *Action::getClassName(ActionClass AC) {
   switch (AC) {
   case InputClass: return "input";
   case BindArchClass: return "bind-arch";
-  case PreprocessJobClass: return "preprocess";
-  case PrecompileJobClass: return "precompile";
-  case AnalyzeJobClass: return "analyze";
-  case CompileJobClass: return "compile";
-  case AssembleJobClass: return "assemble";
-  case LinkJobClass: return "link";
+  case PreprocessJobClass: return "preprocessor";
+  case PrecompileJobClass: return "precompiler";
+  case AnalyzeJobClass: return "analyzer";
+  case CompileJobClass: return "compiler";
+  case AssembleJobClass: return "assembler";
+  case LinkJobClass: return "linker";
   case LipoJobClass: return "lipo";
   }
   

diff --git a/lib/Driver/Phases.cpp b/lib/Driver/Phases.cpp
index 71f88eec568cbc7fc87d24e3cc90494da3f3f67f..df4cdee77500cd2349ed917fdeaab6054094229b 100644 (file)
--- a/lib/Driver/Phases.cpp
+++ b/lib/Driver/Phases.cpp
@@ -15,7 +15,7 @@ using namespace clang::driver;
 
 const char *phases::getPhaseName(ID Id) {
   switch (Id) {
-  case Preprocess: return "preprocesser";
+  case Preprocess: return "preprocessor";
   case Precompile: return "precompiler";
   case Compile: return "compiler";
   case Assemble: return "assembler";

diff --git a/tools/ccc/ccclib/Phases.py b/tools/ccc/ccclib/Phases.py
index a126027ae6b6bba679f9610cb129eda3af5dc930..0998fd611b3c43fcb76575f196bec207fb5cf6b1 100644 (file)
--- a/tools/ccc/ccclib/Phases.py
+++ b/tools/ccc/ccclib/Phases.py
@@ -70,7 +70,7 @@ class PrecompilePhase(Phase):
 
 class AnalyzePhase(Phase):
     def __init__(self):
-        super(AnalyzePhase, self).__init__("analyze", Phase.eOrderCompile)
+        super(AnalyzePhase, self).__init__("analyzer", Phase.eOrderCompile)
 
 class SyntaxOnlyPhase(Phase):
     def __init__(self):