diff options
| -rw-r--r-- | include/clang/Driver/Options.td | 2 | ||||
| -rw-r--r-- | lib/Driver/Tools.cpp | 4 | ||||
| -rw-r--r-- | lib/Frontend/CompilerInvocation.cpp | 2 | ||||
| -rw-r--r-- | test/Driver/clang_f_opts.c | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/include/clang/Driver/Options.td b/include/clang/Driver/Options.td index a655826ba0..c7698a28f9 100644 --- a/include/clang/Driver/Options.td +++ b/include/clang/Driver/Options.td @@ -454,7 +454,7 @@ def fmerge_all_constants : Flag<"-fmerge-all-constants">, Group<f_Group>; def fmessage_length_EQ : Joined<"-fmessage-length=">, Group<f_Group>; def fms_extensions : Flag<"-fms-extensions">, Group<f_Group>, Flags<[CC1Option]>, HelpText<"Accept some non-standard constructs supported by the Microsoft compiler">; -def fms_inline_asm : Flag<"-fms-inline-asm">, Group<f_Group>, Flags<[CC1Option]>, +def fenable_experimental_ms_inline_asm : Flag<"-fenable-experimental-ms-inline-asm">, Group<f_Group>, Flags<[CC1Option]>, HelpText<"Enable support for Microsoft style inine assembly">; def fms_compatibility : Flag<"-fms-compatibility">, Group<f_Group>, Flags<[CC1Option]>, HelpText<"Enable Microsoft compatibility mode">; diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index 5c00a7f591..df1d5bfec7 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -2457,8 +2457,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, CmdArgs.push_back("-fms-extensions"); // -fms-inline-asm. - if (Args.hasArg(options::OPT_fms_inline_asm)) - CmdArgs.push_back("-fms-inline-asm"); + if (Args.hasArg(options::OPT_fenable_experimental_ms_inline_asm)) + CmdArgs.push_back("-fenable-experimental-ms-inline-asm"); // -fms-compatibility=0 is default. if (Args.hasFlag(options::OPT_fms_compatibility, diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp index 4f3f6bdcc9..5fa01d3719 100644 --- a/lib/Frontend/CompilerInvocation.cpp +++ b/lib/Frontend/CompilerInvocation.cpp @@ -1261,7 +1261,7 @@ static bool ParseCodeGenArgs(CodeGenOptions &Opts, ArgList &Args, InputKind IK, Opts.EmitGcovArcs = Args.hasArg(OPT_femit_coverage_data); Opts.EmitGcovNotes = Args.hasArg(OPT_femit_coverage_notes); Opts.EmitOpenCLArgMetadata = Args.hasArg(OPT_cl_kernel_arg_info); - Opts.EmitMicrosoftInlineAsm = Args.hasArg(OPT_fms_inline_asm); + Opts.EmitMicrosoftInlineAsm = Args.hasArg(OPT_fenable_experimental_ms_inline_asm); Opts.CoverageFile = Args.getLastArgValue(OPT_coverage_file); Opts.DebugCompilationDir = Args.getLastArgValue(OPT_fdebug_compilation_dir); Opts.LinkBitcodeFile = Args.getLastArgValue(OPT_mlink_bitcode_file); diff --git a/test/Driver/clang_f_opts.c b/test/Driver/clang_f_opts.c index 621026eeeb..0ee7d2dabe 100644 --- a/test/Driver/clang_f_opts.c +++ b/test/Driver/clang_f_opts.c @@ -36,5 +36,5 @@ // FP-CONTRACT-FAST-CHECK: -ffp-contract=fast // FP-CONTRACT-OFF-CHECK: -ffp-contract=off -// RUN: %clang -fms-extensions -fms-inline-asm %s -### 2>&1 | FileCheck -check-prefix=CHECK-OPTIONS3 %s -// CHECK-OPTIONS3: -fms-inline-asm +// RUN: %clang -fms-extensions -fenable-experimental-ms-inline-asm %s -### 2>&1 | FileCheck -check-prefix=CHECK-OPTIONS3 %s +// CHECK-OPTIONS3: -fenable-experimental-ms-inline-asm |