diff options
| author | Martell Malone <martellmalone@gmail.com> | 2017-10-15 17:27:58 +0000 |
|---|---|---|
| committer | Martell Malone <martellmalone@gmail.com> | 2017-10-15 17:27:58 +0000 |
| commit | f6f6a9c199b5d31ac6793a48dfe1aa200a212d67 (patch) | |
| tree | f0a4fb098802bebc6d5a4beaf01b0940de37e27d /clang | |
| parent | b95b867dd83703cc52ace3ed5c14eeba568005f4 (diff) | |
| download | bcm5719-llvm-f6f6a9c199b5d31ac6793a48dfe1aa200a212d67.tar.gz bcm5719-llvm-f6f6a9c199b5d31ac6793a48dfe1aa200a212d67.zip | |
[driver] [cl] Add/fix c++17/c++latest
Patch by: daxpedda
Differential Revision: https://reviews.llvm.org/D38123
llvm-svn: 315864
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Driver/ToolChains/Clang.cpp | 3 | ||||
| -rw-r--r-- | clang/test/Driver/cl-options.c | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp index 6c285dec653..f0f2bc21986 100644 --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/lib/Driver/ToolChains/Clang.cpp @@ -4075,7 +4075,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, if (const Arg *StdArg = Args.getLastArg(options::OPT__SLASH_std)) { LanguageStandard = llvm::StringSwitch<StringRef>(StdArg->getValue()) .Case("c++14", "-std=c++14") - .Case("c++latest", "-std=c++1z") + .Case("c++17", "-std=c++17") + .Case("c++latest", "-std=c++2a") .Default(""); if (LanguageStandard.empty()) D.Diag(clang::diag::warn_drv_unused_argument) diff --git a/clang/test/Driver/cl-options.c b/clang/test/Driver/cl-options.c index 5d866e5f17b..59aefe2e7ca 100644 --- a/clang/test/Driver/cl-options.c +++ b/clang/test/Driver/cl-options.c @@ -520,8 +520,11 @@ // RUN: %clang_cl -fmsc-version=1900 -TP -std:c++14 -### -- %s 2>&1 | FileCheck -check-prefix=STDCXX14 %s // STDCXX14: -std=c++14 +// RUN: %clang_cl -fmsc-version=1900 -TP -std:c++17 -### -- %s 2>&1 | FileCheck -check-prefix=STDCXX17 %s +// STDCXX14: -std=c++17 + // RUN: %clang_cl -fmsc-version=1900 -TP -std:c++latest -### -- %s 2>&1 | FileCheck -check-prefix=STDCXXLATEST %s -// STDCXXLATEST: -std=c++1z +// STDCXXLATEST: -std=c++2a // RUN: env CL="/Gy" %clang_cl -### -- %s 2>&1 | FileCheck -check-prefix=ENV-CL %s // ENV-CL: "-ffunction-sections" |
