summaryrefslogtreecommitdiffstats
path: root/clang/lib/Frontend
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2014-10-31 02:28:58 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2014-10-31 02:28:58 +0000
commit1e2cf0dd4bd7c76fc5a7862e42e2bac2da451fc7 (patch)
treea3e3b09843dd8512b605135326be004408011503 /clang/lib/Frontend
parentd5e7ff856c2c8d58cb1ef4ed0bce838a70215b18 (diff)
downloadbcm5719-llvm-1e2cf0dd4bd7c76fc5a7862e42e2bac2da451fc7.tar.gz
bcm5719-llvm-1e2cf0dd4bd7c76fc5a7862e42e2bac2da451fc7.zip
[modules] When a .pcm file is explicitly built separately from the translation
unit, allow the -O settings of the two compilations to differ. llvm-svn: 220943
Diffstat (limited to 'clang/lib/Frontend')
-rw-r--r--clang/lib/Frontend/ASTUnit.cpp4
-rw-r--r--clang/lib/Frontend/FrontendActions.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/clang/lib/Frontend/ASTUnit.cpp b/clang/lib/Frontend/ASTUnit.cpp
index 1d8c6a15586..bd81c0d60a5 100644
--- a/clang/lib/Frontend/ASTUnit.cpp
+++ b/clang/lib/Frontend/ASTUnit.cpp
@@ -508,8 +508,8 @@ public:
: PP(PP), Context(Context), LangOpt(LangOpt), TargetOpts(TargetOpts),
Target(Target), Counter(Counter), InitializedLanguage(false) {}
- bool ReadLanguageOptions(const LangOptions &LangOpts,
- bool Complain) override {
+ bool ReadLanguageOptions(const LangOptions &LangOpts, bool Complain,
+ bool AllowCompatibleDifferences) override {
if (InitializedLanguage)
return false;
diff --git a/clang/lib/Frontend/FrontendActions.cpp b/clang/lib/Frontend/FrontendActions.cpp
index 6634e19fc2c..6a2ac60570d 100644
--- a/clang/lib/Frontend/FrontendActions.cpp
+++ b/clang/lib/Frontend/FrontendActions.cpp
@@ -431,8 +431,8 @@ namespace {
Out.indent(2) << "Module map file: " << ModuleMapPath << "\n";
}
- bool ReadLanguageOptions(const LangOptions &LangOpts,
- bool Complain) override {
+ bool ReadLanguageOptions(const LangOptions &LangOpts, bool Complain,
+ bool AllowCompatibleDifferences) override {
Out.indent(2) << "Language options:\n";
#define LANGOPT(Name, Bits, Default, Description) \
DUMP_BOOLEAN(LangOpts.Name, Description);
OpenPOWER on IntegriCloud