Move clang-cc.h to lib/Frontend/Utils.h, and move the associated .cpp

files to lib/Frontend.

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

diff --git a/tools/clang-cc/clang-cc.h b/include/clang/Frontend/Utils.h
similarity index 92%
rename from tools/clang-cc/clang-cc.h
rename to include/clang/Frontend/Utils.h
index 354d73b9ac5a4af834a291828c3bdbc5998d4340..41eb31a0fc357584db8d613c06a3776683ed23b6 100644 (file)
--- a/tools/clang-cc/clang-cc.h
+++ b/include/clang/Frontend/Utils.h
@@ -1,4 +1,4 @@
-//===--- clang-cc.h - C-Language Front-end --------------------------------===//
+//===--- Utils.h - Misc utilities for the front-end------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -7,12 +7,12 @@
 //
 //===----------------------------------------------------------------------===//
 //
-//  This is the header file that pulls together the top-level driver.
+//  This header contains miscellaneous utilities for various front-end actions.
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_CLANG_CC_H
-#define LLVM_CLANG_CLANG_CC_H
+#ifndef LLVM_CLANG_FRONTEND_UTILS_H
+#define LLVM_CLANG_FRONTEND_UTILS_H
 
 #include <vector>
 #include <string>

diff --git a/tools/clang-cc/CacheTokens.cpp b/lib/Frontend/CacheTokens.cpp
similarity index 99%
rename from tools/clang-cc/CacheTokens.cpp
rename to lib/Frontend/CacheTokens.cpp
index 53352360fbcb1d982b40badfc177dff7532c35f9..0065828c6de83e5cf98939ec79b13e6f60617fea 100644 (file)
--- a/tools/clang-cc/CacheTokens.cpp
+++ b/lib/Frontend/CacheTokens.cpp
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang-cc.h"
+#include "clang/Frontend/Utils.h"
 #include "clang/Basic/FileManager.h"
 #include "clang/Basic/SourceManager.h"
 #include "clang/Basic/IdentifierTable.h"

diff --git a/tools/clang-cc/DependencyFile.cpp b/lib/Frontend/DependencyFile.cpp
similarity index 99%
rename from tools/clang-cc/DependencyFile.cpp
rename to lib/Frontend/DependencyFile.cpp
index 3306f82aea718127ef3ba824e6ea873364401742..4cee280ebf5364836e29cc6b6802e37eaa907da8 100644 (file)
--- a/tools/clang-cc/DependencyFile.cpp
+++ b/lib/Frontend/DependencyFile.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang-cc.h"
+#include "clang/Frontend/Utils.h"
 #include "clang/Basic/SourceManager.h"
 #include "clang/Basic/FileManager.h"
 #include "clang/Lex/Preprocessor.h"

diff --git a/tools/clang-cc/DiagChecker.cpp b/lib/Frontend/DiagChecker.cpp
similarity index 99%
rename from tools/clang-cc/DiagChecker.cpp
rename to lib/Frontend/DiagChecker.cpp
index 5e964dcfb7acf9dc8cc1275941b5d2258f6ac82f..2eaf2fe62f5c1f8e83950dbd9fff7bf520fb335b 100644 (file)
--- a/tools/clang-cc/DiagChecker.cpp
+++ b/lib/Frontend/DiagChecker.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang-cc.h"
+#include "clang/Frontend/Utils.h"
 #include "clang/Frontend/TextDiagnosticBuffer.h"
 #include "clang/Sema/ParseAST.h"
 #include "clang/AST/ASTConsumer.h"

diff --git a/tools/clang-cc/PrintParserCallbacks.cpp b/lib/Frontend/PrintParserCallbacks.cpp
similarity index 99%
rename from tools/clang-cc/PrintParserCallbacks.cpp
rename to lib/Frontend/PrintParserCallbacks.cpp
index e5b7d0455cf9c90f6dfd9a747185033d7e68cddb..e9aece968fd8afa369dcdc2308dd2fff29531179 100644 (file)
--- a/tools/clang-cc/PrintParserCallbacks.cpp
+++ b/lib/Frontend/PrintParserCallbacks.cpp
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang-cc.h"
+#include "clang/Frontend/Utils.h"
 #include "clang/Parse/Action.h"
 #include "clang/Parse/DeclSpec.h"
 #include "llvm/Support/raw_ostream.h"

diff --git a/tools/clang-cc/PrintPreprocessedOutput.cpp b/lib/Frontend/PrintPreprocessedOutput.cpp
similarity index 99%
rename from tools/clang-cc/PrintPreprocessedOutput.cpp
rename to lib/Frontend/PrintPreprocessedOutput.cpp
index 429b8296490f00f2b0dc66a918ef96a2c4252c0a..6a7ad31b53ec73e755adbe2fb14a29907976f7c1 100644 (file)
--- a/tools/clang-cc/PrintPreprocessedOutput.cpp
+++ b/lib/Frontend/PrintPreprocessedOutput.cpp
@@ -12,8 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Basic/SourceManager.h"
-#include "clang-cc.h"
+#include "clang/Frontend/Utils.h"
 #include "clang/Lex/MacroInfo.h"
 #include "clang/Lex/PPCallbacks.h"
 #include "clang/Lex/Preprocessor.h"

diff --git a/tools/clang-cc/RewriteMacros.cpp b/lib/Frontend/RewriteMacros.cpp
similarity index 99%
rename from tools/clang-cc/RewriteMacros.cpp
rename to lib/Frontend/RewriteMacros.cpp
index c9c4444ad475e09079c9a3477fe41866456e331b..5ef4892e5bc148e2b396d0d162c9add18b10e491 100644 (file)
--- a/tools/clang-cc/RewriteMacros.cpp
+++ b/lib/Frontend/RewriteMacros.cpp
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang-cc.h"
+#include "clang/Frontend/Utils.h"
 #include "clang/Rewrite/Rewriter.h"
 #include "clang/Lex/Preprocessor.h"
 #include "clang/Basic/SourceManager.h"

diff --git a/tools/clang-cc/RewriteTest.cpp b/lib/Frontend/RewriteTest.cpp
similarity index 97%
rename from tools/clang-cc/RewriteTest.cpp
rename to lib/Frontend/RewriteTest.cpp
index c4b3a7795650974ab34a4743d616d5d59469a140..f9eb58f86740dbfe7c17c6a34c78fbe00662e161 100644 (file)
--- a/tools/clang-cc/RewriteTest.cpp
+++ b/lib/Frontend/RewriteTest.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang-cc.h"
+#include "clang/Frontend/Utils.h"
 #include "clang/Lex/Preprocessor.h"
 #include "clang/Rewrite/TokenRewriter.h"
 #include "llvm/Support/raw_ostream.h"

diff --git a/tools/clang-cc/Warnings.cpp b/lib/Frontend/Warnings.cpp
similarity index 99%
rename from tools/clang-cc/Warnings.cpp
rename to lib/Frontend/Warnings.cpp
index b3e21e105273494eb01d06927a7c1087bbeb5311..8d6ca68de9aab0dbdf7dfcc1490d5ff005159a73 100644 (file)
--- a/tools/clang-cc/Warnings.cpp
+++ b/lib/Frontend/Warnings.cpp
@@ -20,7 +20,7 @@
 // Given a warning option 'foo', the following are valid:
 //    -Wfoo, -Wno-foo, -Werror=foo
 //
-#include "clang-cc.h"
+#include "clang/Frontend/Utils.h"
 #include "clang/Basic/Diagnostic.h"
 #include "clang/Sema/SemaDiagnostic.h"
 #include "clang/Lex/LexDiagnostic.h"

diff --git a/tools/clang-cc/clang-cc.cpp b/tools/clang-cc/clang-cc.cpp
index 40333d22d304d93a6c57e1e7e8c468ce7a60dd03..51b3ffda27429fac6633d4b1627a1df4dc90d11c 100644 (file)
--- a/tools/clang-cc/clang-cc.cpp
+++ b/tools/clang-cc/clang-cc.cpp
@@ -22,7 +22,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang-cc.h"
 #include "AnalysisConsumer.h"
 #include "clang/Frontend/ASTConsumers.h"
 #include "clang/Frontend/CompileOptions.h"
@@ -34,6 +33,7 @@
 #include "clang/Frontend/PCHReader.h"
 #include "clang/Frontend/TextDiagnosticBuffer.h"
 #include "clang/Frontend/TextDiagnosticPrinter.h"
+#include "clang/Frontend/Utils.h"
 #include "clang/Analysis/PathDiagnostic.h"
 #include "clang/CodeGen/ModuleBuilder.h"
 #include "clang/Sema/ParseAST.h"