aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArgyrios Kyrtzidis <akyrtzi@gmail.com>2010-10-15 18:51:34 +0000
committerArgyrios Kyrtzidis <akyrtzi@gmail.com>2010-10-15 18:51:34 +0000
commit63d907bc55ccb6abfc57b409cab3cfa7c0d1f38a (patch)
tree6ad53dc79d66f61cf56eae7b389ea51993adc2e6
parent721f38c7f866259e1472af775239a83d8f06f6a8 (diff)
Revert r116605, a lot more were committed by mistake.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@116606 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--include/clang/Basic/DiagnosticDriverKinds.td2
-rw-r--r--include/clang/Driver/Options.td1
-rw-r--r--lib/Driver/Tools.cpp10
-rw-r--r--test/Driver/pth.c21
4 files changed, 0 insertions, 34 deletions
diff --git a/include/clang/Basic/DiagnosticDriverKinds.td b/include/clang/Basic/DiagnosticDriverKinds.td
index a7c30a744d..19011ace7f 100644
--- a/include/clang/Basic/DiagnosticDriverKinds.td
+++ b/include/clang/Basic/DiagnosticDriverKinds.td
@@ -102,7 +102,5 @@ def warn_drv_objc_gc_unsupported : Warning<
"Objective-C garbage collection is not supported on this platform, ignoring '%0'">;
def warn_drv_pch_not_first_include : Warning<
"precompiled header '%0' was ignored because '%1' is not first '-include'">;
-def warn_drv_pch_missing_language : Warning<
- "ignoring argument '%0' due to missing precompiled header '%1' for language '%2'">;
}
diff --git a/include/clang/Driver/Options.td b/include/clang/Driver/Options.td
index ab87d57d43..cfb9c81b57 100644
--- a/include/clang/Driver/Options.td
+++ b/include/clang/Driver/Options.td
@@ -426,7 +426,6 @@ def iframework : JoinedOrSeparate<"-iframework">, Group<clang_i_Group>;
def imacros : JoinedOrSeparate<"-imacros">, Group<clang_i_Group>;
def image__base : Separate<"-image_base">;
def include_ : JoinedOrSeparate<"-include">, Group<clang_i_Group>, EnumName<"include">;
-def include_pch : Separate<"-include-pch">, Group<clang_i_Group>;
def init : Separate<"-init">;
def install__name : Separate<"-install_name">;
def integrated_as : Flag<"-integrated-as">, Flags<[DriverOption]>;
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index fd57cffbc5..229cf608f3 100644
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -256,16 +256,6 @@ void Clang::AddPreprocessingOptions(const Driver &D,
if (FoundPCH || FoundPTH) {
if (IsFirstImplicitInclude) {
A->claim();
- if (P.isDirectory()) {
- // Expect to find a precompiled header matching the current input type
- P.appendComponent(types::getTypeName(Inputs[0].getType()));
- if (!P.exists()) {
- D.Diag(clang::diag::warn_drv_pch_missing_language)
- << A->getAsString(Args) << P.str()
- << types::getTypeName(Inputs[0].getType());
- continue;
- }
- }
if (UsePCH)
CmdArgs.push_back("-include-pch");
else
diff --git a/test/Driver/pth.c b/test/Driver/pth.c
index d6ed90423b..9c47c55993 100644
--- a/test/Driver/pth.c
+++ b/test/Driver/pth.c
@@ -10,24 +10,3 @@
// RUN: FileCheck -check-prefix CHECK2 -input-file %t.log %s
// CHECK2: "{{.*}}/clang{{.*}}" "-cc1" {{.*}}"-include-pth" "{{.*}}.h.pth" {{.*}}"-x" "c" "{{.*}}pth.c"
-
-// RUN: mkdir -p %t.pth
-// RUN: %clang -ccc-pch-is-pth -x c-header %s -o %t.pth/c -### 2> %t.log
-// RUN: FileCheck -check-prefix CHECK3 -input-file %t.log %s
-
-// CHECK3: "{{.*}}/clang{{.*}}" "-cc1" {{.*}} "-o" "{{.*}}.pth/c" "-x" "c-header" "{{.*}}pth.c"
-
-// RUN: rm -f %t.pth/c
-// RUN: %clang -ccc-pch-is-pth -E -include %t %s -### 2> %t.log
-// RUN: echo "DONE" >> %t.log
-// RUN: FileCheck -check-prefix CHECK4 -input-file %t.log %s
-
-// CHECK4: {{.*}} ignoring argument '-include {{.*}}' due to missing precompiled header '{{.*}}.pth/c' for language 'c'
-// CHECK4-NOT: -include-pth
-// CHECK4: DONE
-
-// RUN: touch %t.pth/c
-// RUN: %clang -ccc-pch-is-pth -E -include %t %s -### 2> %t.log
-// RUN: FileCheck -check-prefix CHECK5 -input-file %t.log %s
-
-// CHECK5: "{{.*}}/clang{{.*}}" "-cc1" {{.*}}"-include-pth" "{{.*}}.pth/c" {{.*}}"-x" "c" "{{.*}}pth.c"