24 files changed, 20 insertions, 20 deletions
diff --git a/clang/Driver/ASTConsumers.cpp b/clang/Driver/ASTConsumers.cpp
index 85e379f9763..409df638c98 100644
--- a/clang/Driver/ASTConsumers.cpp
+++ b/clang/Driver/ASTConsumers.cpp
@@ -12,7 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "ASTConsumers.h"
-#include "clang/Driver/PathDiagnosticClients.h"
+#include "clang/Frontend/PathDiagnosticClients.h"
 #include "clang/AST/TranslationUnit.h"
 #include "clang/Basic/Diagnostic.h"
 #include "clang/Basic/SourceManager.h"
diff --git a/clang/Driver/AnalysisConsumer.cpp b/clang/Driver/AnalysisConsumer.cpp
index 860cf156b5a..e37e2c175b7 100644
--- a/clang/Driver/AnalysisConsumer.cpp
+++ b/clang/Driver/AnalysisConsumer.cpp
@@ -12,8 +12,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "ASTConsumers.h"
-#include "clang/Driver/PathDiagnosticClients.h"
-#include "clang/Driver/ManagerRegistry.h"
+#include "clang/Frontend/PathDiagnosticClients.h"
+#include "clang/Frontend/ManagerRegistry.h"
 #include "clang/AST/ASTConsumer.h"
 #include "clang/AST/Decl.h"
 #include "clang/AST/DeclObjC.h"
diff --git a/clang/Driver/Backend.cpp b/clang/Driver/Backend.cpp
index 3c7c1bc0288..cf53f3cc754 100644
--- a/clang/Driver/Backend.cpp
+++ b/clang/Driver/Backend.cpp
@@ -13,7 +13,7 @@
 #include "clang/AST/TranslationUnit.h"
 #include "clang/Basic/TargetInfo.h"
 #include "clang/CodeGen/ModuleBuilder.h"
-#include "clang/Driver/CompileOptions.h"
+#include "clang/Frontend/CompileOptions.h"
 #include "llvm/Module.h"
 #include "llvm/ModuleProvider.h"
 #include "llvm/PassManager.h"
diff --git a/clang/Driver/DiagChecker.cpp b/clang/Driver/DiagChecker.cpp
index 346d9e0b063..e5be10abd52 100644
--- a/clang/Driver/DiagChecker.cpp
+++ b/clang/Driver/DiagChecker.cpp
@@ -13,7 +13,7 @@
 
 #include "clang.h"
 #include "ASTConsumers.h"
-#include "clang/Driver/TextDiagnosticBuffer.h"
+#include "clang/Frontend/TextDiagnosticBuffer.h"
 #include "clang/Sema/ParseAST.h"
 #include "clang/AST/ASTConsumer.h"
 #include "clang/Basic/SourceManager.h"
diff --git a/clang/Driver/Makefile b/clang/Driver/Makefile
index 460c30fe1c8..84a484ed0f2 100644
--- a/clang/Driver/Makefile
+++ b/clang/Driver/Makefile
@@ -13,7 +13,7 @@ include $(LEVEL)/Makefile.config
 
 LINK_COMPONENTS := $(TARGETS_TO_BUILD) bitreader bitwriter codegen ipo selectiondag
 USEDLIBS = clangCodeGen.a clangAnalysis.a clangRewrite.a clangSema.a	\
-           clangDriver.a clangAST.a clangParse.a clangLex.a		\
+           clangFrontend.a clangAST.a clangParse.a clangLex.a		\
            clangBasic.a 
 
 include $(LLVM_SRC_ROOT)/Makefile.rules
diff --git a/clang/Driver/clang.cpp b/clang/Driver/clang.cpp
index 3e7b9cde46f..f402a20c01c 100644
--- a/clang/Driver/clang.cpp
+++ b/clang/Driver/clang.cpp
@@ -24,11 +24,11 @@
 
 #include "clang.h"
 #include "ASTConsumers.h"
-#include "clang/Driver/CompileOptions.h"
-#include "clang/Driver/PathDiagnosticClients.h"
-#include "clang/Driver/InitHeaderSearch.h"
-#include "clang/Driver/TextDiagnosticBuffer.h"
-#include "clang/Driver/TextDiagnosticPrinter.h"
+#include "clang/Frontend/CompileOptions.h"
+#include "clang/Frontend/PathDiagnosticClients.h"
+#include "clang/Frontend/InitHeaderSearch.h"
+#include "clang/Frontend/TextDiagnosticBuffer.h"
+#include "clang/Frontend/TextDiagnosticPrinter.h"
 #include "clang/Analysis/PathDiagnostic.h"
 #include "clang/AST/Decl.h"
 #include "clang/AST/TranslationUnit.h"
diff --git a/clang/include/clang/Driver/CompileOptions.h b/clang/include/clang/Frontend/CompileOptions.h
index 2ccd356ff43..2ccd356ff43 100644
--- a/clang/include/clang/Driver/CompileOptions.h
+++ b/clang/include/clang/Frontend/CompileOptions.h
diff --git a/clang/include/clang/Driver/InitHeaderSearch.h b/clang/include/clang/Frontend/InitHeaderSearch.h
index 6654c3b38e3..6654c3b38e3 100644
--- a/clang/include/clang/Driver/InitHeaderSearch.h
+++ b/clang/include/clang/Frontend/InitHeaderSearch.h
diff --git a/clang/include/clang/Driver/ManagerRegistry.h b/clang/include/clang/Frontend/ManagerRegistry.h
index 90c33e14518..90c33e14518 100644
--- a/clang/include/clang/Driver/ManagerRegistry.h
+++ b/clang/include/clang/Frontend/ManagerRegistry.h
diff --git a/clang/include/clang/Driver/PathDiagnosticClients.h b/clang/include/clang/Frontend/PathDiagnosticClients.h
index b227bbb03a2..b227bbb03a2 100644
--- a/clang/include/clang/Driver/PathDiagnosticClients.h
+++ b/clang/include/clang/Frontend/PathDiagnosticClients.h
diff --git a/clang/include/clang/Driver/TextDiagnosticBuffer.h b/clang/include/clang/Frontend/TextDiagnosticBuffer.h
index e803475ae0b..e803475ae0b 100644
--- a/clang/include/clang/Driver/TextDiagnosticBuffer.h
+++ b/clang/include/clang/Frontend/TextDiagnosticBuffer.h
diff --git a/clang/include/clang/Driver/TextDiagnosticPrinter.h b/clang/include/clang/Frontend/TextDiagnosticPrinter.h
index 4a332b28a8a..4a332b28a8a 100644
--- a/clang/include/clang/Driver/TextDiagnosticPrinter.h
+++ b/clang/include/clang/Frontend/TextDiagnosticPrinter.h
diff --git a/clang/lib/Analysis/RangeConstraintManager.cpp b/clang/lib/Analysis/RangeConstraintManager.cpp
index fabc57950ff..08323c48b9a 100644
--- a/clang/lib/Analysis/RangeConstraintManager.cpp
+++ b/clang/lib/Analysis/RangeConstraintManager.cpp
@@ -16,7 +16,7 @@
 #include "clang/Analysis/PathSensitive/GRState.h"
 #include "clang/Analysis/PathSensitive/GRStateTrait.h"
 #include "clang/Analysis/PathSensitive/GRTransferFuncs.h"
-#include "clang/Driver/ManagerRegistry.h"
+#include "clang/Frontend/ManagerRegistry.h"
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/ADT/FoldingSet.h"
diff --git a/clang/lib/Driver/CMakeLists.txt b/clang/lib/Frontend/CMakeLists.txt
index 2ff67953f7e..2ff67953f7e 100644
--- a/clang/lib/Driver/CMakeLists.txt
+++ b/clang/lib/Frontend/CMakeLists.txt
diff --git a/clang/lib/Driver/HTMLDiagnostics.cpp b/clang/lib/Frontend/HTMLDiagnostics.cpp
index 8ab9b18eccb..cb05e55a43a 100644
--- a/clang/lib/Driver/HTMLDiagnostics.cpp
+++ b/clang/lib/Frontend/HTMLDiagnostics.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Driver/PathDiagnosticClients.h"
+#include "clang/Frontend/PathDiagnosticClients.h"
 #include "clang/Analysis/PathDiagnostic.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/Decl.h"
diff --git a/clang/lib/Driver/InitHeaderSearch.cpp b/clang/lib/Frontend/InitHeaderSearch.cpp
index 78750ba8a3c..e7dd207abed 100644
--- a/clang/lib/Driver/InitHeaderSearch.cpp
+++ b/clang/lib/Frontend/InitHeaderSearch.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Driver/InitHeaderSearch.h"
+#include "clang/Frontend/InitHeaderSearch.h"
 #include "clang/Lex/HeaderSearch.h"
 #include "clang/Basic/FileManager.h"
 #include "clang/Basic/LangOptions.h"
diff --git a/clang/lib/Driver/Makefile b/clang/lib/Frontend/Makefile
index 01902fd88af..d009cffea08 100644
--- a/clang/lib/Driver/Makefile
+++ b/clang/lib/Frontend/Makefile
@@ -12,7 +12,7 @@
 ##===----------------------------------------------------------------------===##
 
 LEVEL = ../../../..
-LIBRARYNAME := clangDriver
+LIBRARYNAME := clangFrontend
 BUILD_ARCHIVE = 1
 CXXFLAGS = -fno-rtti
 
diff --git a/clang/lib/Driver/ManagerRegistry.cpp b/clang/lib/Frontend/ManagerRegistry.cpp
index 0748fd9a35d..79f1e8178e1 100644
--- a/clang/lib/Driver/ManagerRegistry.cpp
+++ b/clang/lib/Frontend/ManagerRegistry.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Driver/ManagerRegistry.h"
+#include "clang/Frontend/ManagerRegistry.h"
 
 using namespace clang;
 
diff --git a/clang/lib/Driver/PlistDiagnostics.cpp b/clang/lib/Frontend/PlistDiagnostics.cpp
index b7e8385409b..4a87d5d7e50 100644
--- a/clang/lib/Driver/PlistDiagnostics.cpp
+++ b/clang/lib/Frontend/PlistDiagnostics.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Driver/PathDiagnosticClients.h"
+#include "clang/Frontend/PathDiagnosticClients.h"
 #include "clang/Analysis/PathDiagnostic.h"
 #include "clang/Basic/SourceManager.h"
 #include "clang/Basic/FileManager.h"
diff --git a/clang/lib/Driver/TextDiagnosticBuffer.cpp b/clang/lib/Frontend/TextDiagnosticBuffer.cpp
index 81cd4ec3a74..a4518ee7e68 100644
--- a/clang/lib/Driver/TextDiagnosticBuffer.cpp
+++ b/clang/lib/Frontend/TextDiagnosticBuffer.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Driver/TextDiagnosticBuffer.h"
+#include "clang/Frontend/TextDiagnosticBuffer.h"
 #include "llvm/ADT/SmallString.h"
 using namespace clang;
 
diff --git a/clang/lib/Driver/TextDiagnosticPrinter.cpp b/clang/lib/Frontend/TextDiagnosticPrinter.cpp
index 8a7e40f13e2..939a65f406d 100644
--- a/clang/lib/Driver/TextDiagnosticPrinter.cpp
+++ b/clang/lib/Frontend/TextDiagnosticPrinter.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Driver/TextDiagnosticPrinter.h"
+#include "clang/Frontend/TextDiagnosticPrinter.h"
 #include "clang/Basic/SourceManager.h"
 #include "clang/Lex/Lexer.h"
 #include "llvm/Support/raw_ostream.h"
diff --git a/clang/lib/Makefile b/clang/lib/Makefile
index c72c353f8b5..802c91e9432 100755
--- a/clang/lib/Makefile
+++ b/clang/lib/Makefile
@@ -8,7 +8,7 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../../..
 
-PARALLEL_DIRS = Headers Basic Lex Parse AST Sema CodeGen Analysis Rewrite Driver
+PARALLEL_DIRS = Headers Basic Lex Parse AST Sema CodeGen Analysis Rewrite Frontend
 
 include $(LEVEL)/Makefile.common
 
diff --git a/clang/test/Driver/dependency-gen.c b/clang/test/Frontend/dependency-gen.c
index cd668f1ab5e..cd668f1ab5e 100644
--- a/clang/test/Driver/dependency-gen.c
+++ b/clang/test/Frontend/dependency-gen.c
diff --git a/clang/test/Driver/rewrite-macros.c b/clang/test/Frontend/rewrite-macros.c
index deb54f4297f..deb54f4297f 100644
--- a/clang/test/Driver/rewrite-macros.c
+++ b/clang/test/Frontend/rewrite-macros.c