From 6aeb2498914b915fc7ffaa5ddb97c77248440914 Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Tue, 6 Dec 2016 10:23:07 +0000 Subject: [PATCH] Also recognize -std=iso9899:201x It should already be handled but a typo in the LANGSTANDARD() definition was introduced in r147220. Patch by Alexander Richardson, test case by me. Differential Revision:https://reviews.llvm.org/D27427 llvm-svn: 288793 --- clang/include/clang/Frontend/LangStandards.def | 2 +- clang/test/Preprocessor/init.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/clang/include/clang/Frontend/LangStandards.def b/clang/include/clang/Frontend/LangStandards.def index a3036932f049..06fe1a3350ce 100644 --- a/clang/include/clang/Frontend/LangStandards.def +++ b/clang/include/clang/Frontend/LangStandards.def @@ -81,7 +81,7 @@ LANGSTANDARD(iso9899_2011, "iso9899:2011", "ISO C 2011", LineComment | C99 | C11 | Digraphs | HexFloat) LANGSTANDARD(iso9899_201x, - "iso9899:2011", "ISO C 2011", + "iso9899:201x", "ISO C 2011", LineComment | C99 | C11 | Digraphs | HexFloat) LANGSTANDARD(gnu11, "gnu11", diff --git a/clang/test/Preprocessor/init.c b/clang/test/Preprocessor/init.c index d5d83da0fb35..b003404df6ff 100644 --- a/clang/test/Preprocessor/init.c +++ b/clang/test/Preprocessor/init.c @@ -64,6 +64,9 @@ // // // RUN: %clang_cc1 -std=c11 -E -dM < /dev/null | FileCheck -match-full-lines -check-prefix C11 %s +// RUN: %clang_cc1 -std=c1x -E -dM < /dev/null | FileCheck -match-full-lines -check-prefix C11 %s +// RUN: %clang_cc1 -std=iso9899:2011 -E -dM < /dev/null | FileCheck -match-full-lines -check-prefix C11 %s +// RUN: %clang_cc1 -std=iso9899:201x -E -dM < /dev/null | FileCheck -match-full-lines -check-prefix C11 %s // // C11:#define __STDC_UTF_16__ 1 // C11:#define __STDC_UTF_32__ 1