From 1fda216122e43d0385a08ba7abeaf71823f27f34 Mon Sep 17 00:00:00 2001 From: Hans Wennborg Date: Sat, 13 Dec 2014 22:44:46 +0000 Subject: [PATCH] clang-cl: Fix handling of the /volatile flag (PR21893) The /volatile:iso flag is our default behaviour, so it can be ignored. Parse /volatile:ms as unsupported. llvm-svn: 224202 --- clang/include/clang/Driver/CLCompatOptions.td | 3 ++- clang/test/Driver/cl-options.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/clang/include/clang/Driver/CLCompatOptions.td b/clang/include/clang/Driver/CLCompatOptions.td index 6269b7c..71c80d2 100644 --- a/clang/include/clang/Driver/CLCompatOptions.td +++ b/clang/include/clang/Driver/CLCompatOptions.td @@ -211,6 +211,7 @@ def _SLASH_Ob2 : CLIgnoredFlag<"Ob2">; def _SLASH_RTC : CLIgnoredJoined<"RTC">; def _SLASH_sdl : CLIgnoredFlag<"sdl">; def _SLASH_sdl_ : CLIgnoredFlag<"sdl-">; +def _SLASH_volatile_iso : CLIgnoredFlag<"volatile:iso">; def _SLASH_w : CLIgnoredJoined<"w">; def _SLASH_Zc_forScope : CLIgnoredFlag<"Zc:forScope">; def _SLASH_Zc_inline : CLIgnoredFlag<"Zc:inline">; @@ -271,7 +272,7 @@ def _SLASH_Qpar : CLFlag<"Qpar">; def _SLASH_Qvec_report : CLJoined<"Qvec-report">; def _SLASH_u : CLFlag<"u">; def _SLASH_V : CLFlag<"V">; -def _SLASH_volatile : CLFlag<"volatile">; +def _SLASH_volatile_ms : CLFlag<"volatile:ms">; def _SLASH_WL : CLFlag<"WL">; def _SLASH_Wp64 : CLFlag<"Wp64">; def _SLASH_X : CLFlag<"X">; diff --git a/clang/test/Driver/cl-options.c b/clang/test/Driver/cl-options.c index e3017f8..fa3273e 100644 --- a/clang/test/Driver/cl-options.c +++ b/clang/test/Driver/cl-options.c @@ -188,6 +188,7 @@ // RUN: /sdl \ // RUN: /sdl- \ // RUN: /vmg \ +// RUN: /volatile:iso \ // RUN: /w12345 \ // RUN: /wd1234 \ // RUN: /Zc:forScope \ @@ -270,7 +271,7 @@ // RUN: /Qvec-report:2 \ // RUN: /u \ // RUN: /V \ -// RUN: /volatile \ +// RUN: /volatile:ms \ // RUN: /wfoo \ // RUN: /WL \ // RUN: /Wp64 \ -- 2.7.4