summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--clang/test/Driver/preprocessor.c6
-rw-r--r--clang/test/Preprocessor/include-pth.c2
-rw-r--r--clang/test/Sema/carbon.c3
-rw-r--r--clang/test/SemaObjC/cocoa.m6
-rw-r--r--clang/test/SemaObjCXX/cocoa.mm4
-rw-r--r--clang/tools/clang-cc/clang-cc.cpp57
6 files changed, 22 insertions, 56 deletions
diff --git a/clang/test/Driver/preprocessor.c b/clang/test/Driver/preprocessor.c
new file mode 100644
index 00000000000..ec1f42f5baf
--- /dev/null
+++ b/clang/test/Driver/preprocessor.c
@@ -0,0 +1,6 @@
+// RUN: clang -E -x c-header %s > %t &&
+// RUN: grep 'B B' %t
+
+#define A B
+A A
+
diff --git a/clang/test/Preprocessor/include-pth.c b/clang/test/Preprocessor/include-pth.c
index 2bdc7dc8746..2afc66a55b0 100644
--- a/clang/test/Preprocessor/include-pth.c
+++ b/clang/test/Preprocessor/include-pth.c
@@ -1,3 +1,3 @@
-// RUN: clang-cc -x c-header %s -o %t &&
+// RUN: clang-cc -emit-pth %s -o %t &&
// RUN: clang-cc -include-pth %t %s -E | grep 'file_to_include' | count 2
#include "file_to_include.h"
diff --git a/clang/test/Sema/carbon.c b/clang/test/Sema/carbon.c
index edb4d9729b1..983a000b2cf 100644
--- a/clang/test/Sema/carbon.c
+++ b/clang/test/Sema/carbon.c
@@ -1,5 +1,4 @@
-// RUN: clang-cc %s -fsyntax-only -print-stats &&
-// RUN: clang-cc -x c-header -o %t %s && clang-cc -token-cache %t %s
+// RUN: clang-cc %s -fsyntax-only -print-stats
#ifdef __APPLE__
#include <Carbon/Carbon.h>
#endif
diff --git a/clang/test/SemaObjC/cocoa.m b/clang/test/SemaObjC/cocoa.m
index cba4481a5b6..153c46e1034 100644
--- a/clang/test/SemaObjC/cocoa.m
+++ b/clang/test/SemaObjC/cocoa.m
@@ -1,9 +1,5 @@
// RUN: clang-cc %s -print-stats &&
-// RUN: clang-cc %s -disable-free &&
-// RUN: clang-cc -x objective-c-header -o %t %s &&
-// RUN: clang-cc -token-cache %t %s &&
-// RUN: clang-cc -x objective-c-header -o %t %s &&
-// RUN: clang-cc -token-cache %t %s -E %s -o /dev/null
+// RUN: clang-cc %s -disable-free
#ifdef __APPLE__
#include <Cocoa/Cocoa.h>
#endif
diff --git a/clang/test/SemaObjCXX/cocoa.mm b/clang/test/SemaObjCXX/cocoa.mm
index 00b6d747c3d..dd9684ce065 100644
--- a/clang/test/SemaObjCXX/cocoa.mm
+++ b/clang/test/SemaObjCXX/cocoa.mm
@@ -1,6 +1,4 @@
-// RUN: clang-cc %s -print-stats &&
-// RUN: clang-cc -x objective-c++-header -o %t %s &&
-// RUN: clang-cc -token-cache %t %s
+// RUN: clang-cc %s -print-stats
#ifdef __APPLE__
#include <Cocoa/Cocoa.h>
#endif
diff --git a/clang/tools/clang-cc/clang-cc.cpp b/clang/tools/clang-cc/clang-cc.cpp
index 58538067bc4..6cfd168278a 100644
--- a/clang/tools/clang-cc/clang-cc.cpp
+++ b/clang/tools/clang-cc/clang-cc.cpp
@@ -253,16 +253,12 @@ enum LangKind {
langkind_c,
langkind_c_cpp,
langkind_asm_cpp,
- langkind_c_pch,
langkind_cxx,
langkind_cxx_cpp,
- langkind_cxx_pch,
langkind_objc,
langkind_objc_cpp,
- langkind_objc_pch,
langkind_objcxx,
- langkind_objcxx_cpp,
- langkind_objcxx_pch
+ langkind_objcxx_cpp
};
static llvm::cl::opt<LangKind>
@@ -282,14 +278,14 @@ BaseLang("x", llvm::cl::desc("Base language to compile"),
"Preprocessed Objective C"),
clEnumValN(langkind_objcxx_cpp, "objective-c++-cpp-output",
"Preprocessed Objective C++"),
- clEnumValN(langkind_c_pch, "c-header",
- "Precompiled C header"),
- clEnumValN(langkind_objc_pch, "objective-c-header",
- "Precompiled Objective-C header"),
- clEnumValN(langkind_cxx_pch, "c++-header",
- "Precompiled C++ header"),
- clEnumValN(langkind_objcxx_pch, "objective-c++-header",
- "Precompiled Objective-C++ header"),
+ clEnumValN(langkind_c, "c-header",
+ "C header"),
+ clEnumValN(langkind_objc, "objective-c-header",
+ "Objective-C header"),
+ clEnumValN(langkind_cxx, "c++-header",
+ "C++ header"),
+ clEnumValN(langkind_objcxx, "objective-c++-header",
+ "Objective-C++ header"),
clEnumValEnd));
static llvm::cl::opt<bool>
@@ -358,32 +354,9 @@ static void InitializeObjCOptions(LangOptions &Options) {
}
-static bool InitializeLangOptions(LangOptions &Options, LangKind LK){
+static void InitializeLangOptions(LangOptions &Options, LangKind LK){
// FIXME: implement -fpreprocessed mode.
bool NoPreprocess = false;
- bool PCH = false;
-
- // Test for 'PCH'.
- switch (LK) {
- default:
- break;
- case langkind_c_pch:
- LK = langkind_c;
- PCH = true;
- break;
- case langkind_objc_pch:
- LK = langkind_objc;
- PCH = true;
- break;
- case langkind_cxx_pch:
- LK = langkind_cxx;
- PCH = true;
- break;
- case langkind_objcxx_pch:
- LK = langkind_objcxx;
- PCH = true;
- break;
- }
switch (LK) {
default: assert(0 && "Unknown language kind!");
@@ -416,8 +389,6 @@ static bool InitializeLangOptions(LangOptions &Options, LangKind LK){
Options.CPlusPlus = 1;
break;
}
-
- return PCH;
}
/// LangStds - Language standards we support.
@@ -581,18 +552,14 @@ static void InitializeLanguageStandard(LangOptions &Options, LangKind LK,
case langkind_c:
case langkind_asm_cpp:
case langkind_c_cpp:
- case langkind_c_pch:
case langkind_objc:
case langkind_objc_cpp:
- case langkind_objc_pch:
LangStd = lang_gnu99;
break;
case langkind_cxx:
case langkind_cxx_cpp:
- case langkind_cxx_pch:
case langkind_objcxx:
case langkind_objcxx_cpp:
- case langkind_objcxx_pch:
LangStd = lang_gnucxx98;
break;
}
@@ -1657,7 +1624,7 @@ int main(int argc, char **argv) {
LangOptions LangInfo;
InitializeBaseLanguage();
LangKind LK = GetLanguage(InFile);
- bool PCH = InitializeLangOptions(LangInfo, LK);
+ InitializeLangOptions(LangInfo, LK);
InitializeGCMode(LangInfo);
InitializeLanguageStandard(LangInfo, LK, Target.get());
@@ -1688,7 +1655,7 @@ int main(int argc, char **argv) {
Diags.setClient(TextDiagClient);
// Process the source file.
- ProcessInputFile(*PP, PPFactory, InFile, PCH ? GeneratePCH : ProgAction);
+ ProcessInputFile(*PP, PPFactory, InFile, ProgAction);
HeaderInfo.ClearFileInfo();
}
OpenPOWER on IntegriCloud