r237769 - [OPENMP] -fopenmp enables OpenMP support (fix for http://llvm.org/PR23492)

Chandler Carruth chandlerc at google.com
Wed May 20 00:02:24 PDT 2015


I don't think this should have been committed yet.

1) The CMake build for the OpenMP stuff is still really broken and not well
integrated with the rest of the LLVM project

2) Because of #1, I suspect very few users of Clang and LLVM have the
libraries installed.

3) If they do, its still called 'libiomp' and not the final name that we
planned for.

Now, I have users that have libgomp installed and have been successfully
using '-fopenmp' to link against it for over a year in order to satisfy the
runtime library calls against its API. With this patch, all of them are
broken because we haven't yet been able to build and deploy the LLVM OpenMP
library to them, largely because of the above problems.

I'd much rather this not go in yet, or at least expose some CMake variable
to revert to the old behavior so we can continue supporting users that had
a working setup before this patch and now are broken.

=[ I'm still really interested in fixing all of the above and deploying the
LLVM OpenMP library so that we *can* make this the default. I'm 100% behind
that end goal. But I don't think the library is quite ready.

-Chandler

On Tue, May 19, 2015 at 9:31 PM Alexey Bataev <a.bataev at hotmail.com> wrote:

> Author: abataev
> Date: Tue May 19 23:24:19 2015
> New Revision: 237769
>
> URL: http://llvm.org/viewvc/llvm-project?rev=237769&view=rev
> Log:
> [OPENMP] -fopenmp enables OpenMP support (fix for http://llvm.org/PR23492)
>
> -fopenmp turns on OpenMP support and links libiomp5 as OpenMP library.
> Also there is -fopenmp={libiomp5|libgomp} option that allows to override
> effect of -fopenmp and link libgomp library (if -fopenmp=libgomp is
> specified).
> Differential Revision: http://reviews.llvm.org/D9736
>
> Modified:
>     cfe/trunk/include/clang/Driver/Options.td
>     cfe/trunk/lib/Driver/Tools.cpp
>     cfe/trunk/lib/Frontend/CompilerInvocation.cpp
>     cfe/trunk/test/OpenMP/atomic_ast_print.cpp
>     cfe/trunk/test/OpenMP/atomic_capture_codegen.cpp
>     cfe/trunk/test/OpenMP/atomic_codegen.cpp
>     cfe/trunk/test/OpenMP/atomic_messages.c
>     cfe/trunk/test/OpenMP/atomic_messages.cpp
>     cfe/trunk/test/OpenMP/atomic_read_codegen.c
>     cfe/trunk/test/OpenMP/atomic_update_codegen.cpp
>     cfe/trunk/test/OpenMP/atomic_write_codegen.c
>     cfe/trunk/test/OpenMP/barrier_ast_print.cpp
>     cfe/trunk/test/OpenMP/barrier_codegen.cpp
>     cfe/trunk/test/OpenMP/barrier_messages.cpp
>     cfe/trunk/test/OpenMP/critical_ast_print.cpp
>     cfe/trunk/test/OpenMP/critical_codegen.cpp
>     cfe/trunk/test/OpenMP/critical_messages.cpp
>     cfe/trunk/test/OpenMP/flush_ast_print.cpp
>     cfe/trunk/test/OpenMP/flush_codegen.cpp
>     cfe/trunk/test/OpenMP/flush_messages.cpp
>     cfe/trunk/test/OpenMP/for_ast_print.cpp
>     cfe/trunk/test/OpenMP/for_codegen.cpp
>     cfe/trunk/test/OpenMP/for_collapse_messages.cpp
>     cfe/trunk/test/OpenMP/for_firstprivate_codegen.cpp
>     cfe/trunk/test/OpenMP/for_firstprivate_messages.cpp
>     cfe/trunk/test/OpenMP/for_lastprivate_codegen.cpp
>     cfe/trunk/test/OpenMP/for_lastprivate_messages.cpp
>     cfe/trunk/test/OpenMP/for_loop_messages.cpp
>     cfe/trunk/test/OpenMP/for_misc_messages.c
>     cfe/trunk/test/OpenMP/for_private_codegen.cpp
>     cfe/trunk/test/OpenMP/for_private_messages.cpp
>     cfe/trunk/test/OpenMP/for_reduction_codegen.cpp
>     cfe/trunk/test/OpenMP/for_reduction_messages.cpp
>     cfe/trunk/test/OpenMP/for_schedule_messages.cpp
>     cfe/trunk/test/OpenMP/for_simd_aligned_messages.cpp
>     cfe/trunk/test/OpenMP/for_simd_ast_print.cpp
>     cfe/trunk/test/OpenMP/for_simd_collapse_messages.cpp
>     cfe/trunk/test/OpenMP/for_simd_firstprivate_messages.cpp
>     cfe/trunk/test/OpenMP/for_simd_lastprivate_messages.cpp
>     cfe/trunk/test/OpenMP/for_simd_linear_messages.cpp
>     cfe/trunk/test/OpenMP/for_simd_loop_messages.cpp
>     cfe/trunk/test/OpenMP/for_simd_misc_messages.c
>     cfe/trunk/test/OpenMP/for_simd_private_messages.cpp
>     cfe/trunk/test/OpenMP/for_simd_reduction_messages.cpp
>     cfe/trunk/test/OpenMP/for_simd_safelen_messages.cpp
>     cfe/trunk/test/OpenMP/for_simd_schedule_messages.cpp
>     cfe/trunk/test/OpenMP/linking.c
>     cfe/trunk/test/OpenMP/master_ast_print.cpp
>     cfe/trunk/test/OpenMP/master_codegen.cpp
>     cfe/trunk/test/OpenMP/master_messages.cpp
>     cfe/trunk/test/OpenMP/nesting_of_regions.cpp
>     cfe/trunk/test/OpenMP/openmp_common.c
>     cfe/trunk/test/OpenMP/ordered_ast_print.cpp
>     cfe/trunk/test/OpenMP/ordered_codegen.cpp
>     cfe/trunk/test/OpenMP/ordered_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_ast_print.cpp
>     cfe/trunk/test/OpenMP/parallel_codegen.cpp
>     cfe/trunk/test/OpenMP/parallel_copyin_codegen.cpp
>     cfe/trunk/test/OpenMP/parallel_copyin_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_default_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_firstprivate_codegen.cpp
>     cfe/trunk/test/OpenMP/parallel_firstprivate_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_for_ast_print.cpp
>     cfe/trunk/test/OpenMP/parallel_for_codegen.cpp
>     cfe/trunk/test/OpenMP/parallel_for_collapse_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_for_copyin_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_for_default_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_for_firstprivate_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_for_if_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_for_lastprivate_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_for_loop_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_for_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_for_misc_messages.c
>     cfe/trunk/test/OpenMP/parallel_for_num_threads_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_for_private_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_for_proc_bind_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_for_reduction_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_for_schedule_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_for_simd_aligned_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_for_simd_ast_print.cpp
>     cfe/trunk/test/OpenMP/parallel_for_simd_collapse_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_for_simd_copyin_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_for_simd_default_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_for_simd_firstprivate_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_for_simd_if_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_for_simd_lastprivate_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_for_simd_linear_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_for_simd_loop_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_for_simd_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_for_simd_misc_messages.c
>     cfe/trunk/test/OpenMP/parallel_for_simd_num_threads_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_for_simd_private_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_for_simd_proc_bind_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_for_simd_reduction_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_for_simd_safelen_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_for_simd_schedule_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_if_codegen.cpp
>     cfe/trunk/test/OpenMP/parallel_if_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_num_threads_codegen.cpp
>     cfe/trunk/test/OpenMP/parallel_num_threads_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_private_codegen.cpp
>     cfe/trunk/test/OpenMP/parallel_private_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_proc_bind_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_reduction_codegen.cpp
>     cfe/trunk/test/OpenMP/parallel_reduction_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_sections_ast_print.cpp
>     cfe/trunk/test/OpenMP/parallel_sections_codegen.cpp
>     cfe/trunk/test/OpenMP/parallel_sections_copyin_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_sections_default_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_sections_firstprivate_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_sections_if_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_sections_lastprivate_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_sections_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_sections_misc_messages.c
>     cfe/trunk/test/OpenMP/parallel_sections_num_threads_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_sections_private_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_sections_proc_bind_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_sections_reduction_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_sections_shared_messages.cpp
>     cfe/trunk/test/OpenMP/parallel_shared_messages.cpp
>     cfe/trunk/test/OpenMP/predefined_macro.c
>     cfe/trunk/test/OpenMP/sections_ast_print.cpp
>     cfe/trunk/test/OpenMP/sections_codegen.cpp
>     cfe/trunk/test/OpenMP/sections_firstprivate_codegen.cpp
>     cfe/trunk/test/OpenMP/sections_firstprivate_messages.cpp
>     cfe/trunk/test/OpenMP/sections_lastprivate_codegen.cpp
>     cfe/trunk/test/OpenMP/sections_lastprivate_messages.cpp
>     cfe/trunk/test/OpenMP/sections_misc_messages.c
>     cfe/trunk/test/OpenMP/sections_private_codegen.cpp
>     cfe/trunk/test/OpenMP/sections_private_messages.cpp
>     cfe/trunk/test/OpenMP/sections_reduction_codegen.cpp
>     cfe/trunk/test/OpenMP/sections_reduction_messages.cpp
>     cfe/trunk/test/OpenMP/simd_aligned_messages.cpp
>     cfe/trunk/test/OpenMP/simd_ast_print.cpp
>     cfe/trunk/test/OpenMP/simd_codegen.cpp
>     cfe/trunk/test/OpenMP/simd_collapse_messages.cpp
>     cfe/trunk/test/OpenMP/simd_lastprivate_messages.cpp
>     cfe/trunk/test/OpenMP/simd_linear_messages.cpp
>     cfe/trunk/test/OpenMP/simd_loop_messages.cpp
>     cfe/trunk/test/OpenMP/simd_metadata.c
>     cfe/trunk/test/OpenMP/simd_misc_messages.c
>     cfe/trunk/test/OpenMP/simd_private_messages.cpp
>     cfe/trunk/test/OpenMP/simd_reduction_messages.cpp
>     cfe/trunk/test/OpenMP/simd_safelen_messages.cpp
>     cfe/trunk/test/OpenMP/single_ast_print.cpp
>     cfe/trunk/test/OpenMP/single_codegen.cpp
>     cfe/trunk/test/OpenMP/single_copyprivate_messages.cpp
>     cfe/trunk/test/OpenMP/single_firstprivate_codegen.cpp
>     cfe/trunk/test/OpenMP/single_firstprivate_messages.cpp
>     cfe/trunk/test/OpenMP/single_misc_messages.c
>     cfe/trunk/test/OpenMP/single_private_codegen.cpp
>     cfe/trunk/test/OpenMP/single_private_messages.cpp
>     cfe/trunk/test/OpenMP/target_ast_print.cpp
>     cfe/trunk/test/OpenMP/target_if_messages.cpp
>     cfe/trunk/test/OpenMP/target_messages.cpp
>     cfe/trunk/test/OpenMP/task_ast_print.cpp
>     cfe/trunk/test/OpenMP/task_codegen.cpp
>     cfe/trunk/test/OpenMP/task_default_messages.cpp
>     cfe/trunk/test/OpenMP/task_final_messages.cpp
>     cfe/trunk/test/OpenMP/task_firstprivate_codegen.cpp
>     cfe/trunk/test/OpenMP/task_firstprivate_messages.cpp
>     cfe/trunk/test/OpenMP/task_if_codegen.cpp
>     cfe/trunk/test/OpenMP/task_if_messages.cpp
>     cfe/trunk/test/OpenMP/task_messages.cpp
>     cfe/trunk/test/OpenMP/task_private_codegen.cpp
>     cfe/trunk/test/OpenMP/task_private_messages.cpp
>     cfe/trunk/test/OpenMP/task_shared_messages.cpp
>     cfe/trunk/test/OpenMP/taskwait_ast_print.cpp
>     cfe/trunk/test/OpenMP/taskwait_codegen.cpp
>     cfe/trunk/test/OpenMP/taskwait_messages.cpp
>     cfe/trunk/test/OpenMP/taskyield_ast_print.cpp
>     cfe/trunk/test/OpenMP/taskyield_codegen.cpp
>     cfe/trunk/test/OpenMP/taskyield_messages.cpp
>     cfe/trunk/test/OpenMP/teams_ast_print.cpp
>     cfe/trunk/test/OpenMP/teams_default_messages.cpp
>     cfe/trunk/test/OpenMP/teams_firstprivate_messages.cpp
>     cfe/trunk/test/OpenMP/teams_messages.cpp
>     cfe/trunk/test/OpenMP/teams_private_messages.cpp
>     cfe/trunk/test/OpenMP/teams_reduction_messages.cpp
>     cfe/trunk/test/OpenMP/teams_shared_messages.cpp
>     cfe/trunk/test/OpenMP/threadprivate_ast_print.cpp
>     cfe/trunk/test/OpenMP/threadprivate_codegen.cpp
>     cfe/trunk/test/OpenMP/threadprivate_messages.cpp
>     cfe/trunk/test/PCH/chain-openmp-threadprivate.cpp
>
> Modified: cfe/trunk/include/clang/Driver/Options.td
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/Options.td?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/include/clang/Driver/Options.td (original)
> +++ cfe/trunk/include/clang/Driver/Options.td Tue May 19 23:24:19 2015
> @@ -876,7 +876,7 @@ def fno_objc_nonfragile_abi : Flag<["-"]
>  def fobjc_sender_dependent_dispatch : Flag<["-"],
> "fobjc-sender-dependent-dispatch">, Group<f_Group>;
>  def fomit_frame_pointer : Flag<["-"], "fomit-frame-pointer">,
> Group<f_Group>;
>  def fopenmp : Flag<["-"], "fopenmp">, Group<f_Group>, Flags<[CC1Option,
> NoArgumentUnused]>;
> -def fopenmp_EQ : Joined<["-"], "fopenmp=">, Group<f_Group>,
> Flags<[CC1Option]>;
> +def fopenmp_EQ : Joined<["-"], "fopenmp=">, Group<f_Group>;
>  def fno_optimize_sibling_calls : Flag<["-"],
> "fno-optimize-sibling-calls">, Group<f_Group>;
>  def foptimize_sibling_calls : Flag<["-"], "foptimize-sibling-calls">,
> Group<f_Group>;
>  def force__cpusubtype__ALL : Flag<["-"], "force_cpusubtype_ALL">;
>
> Modified: cfe/trunk/lib/Driver/Tools.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/lib/Driver/Tools.cpp (original)
> +++ cfe/trunk/lib/Driver/Tools.cpp Tue May 19 23:24:19 2015
> @@ -3793,6 +3793,12 @@ void Clang::ConstructJob(Compilation &C,
>    Args.AddLastArg(CmdArgs, options::OPT_fdiagnostics_show_template_tree);
>    Args.AddLastArg(CmdArgs, options::OPT_fno_elide_type);
>
> +  // Forward flags for OpenMP
> +  if (Args.hasArg(options::OPT_fopenmp_EQ) ||
> +      Args.hasArg(options::OPT_fopenmp)) {
> +    CmdArgs.push_back("-fopenmp");
> +  }
> +
>    const SanitizerArgs &Sanitize = getToolChain().getSanitizerArgs();
>    Sanitize.addArgs(Args, CmdArgs);
>
> @@ -6273,9 +6279,7 @@ void darwin::Link::ConstructJob(Compilat
>    Args.AddAllArgs(CmdArgs, options::OPT_L);
>
>    LibOpenMP UsedOpenMPLib = LibUnknown;
> -  if (Args.hasArg(options::OPT_fopenmp)) {
> -    UsedOpenMPLib = LibGOMP;
> -  } else if (const Arg *A = Args.getLastArg(options::OPT_fopenmp_EQ)) {
> +  if (const Arg *A = Args.getLastArg(options::OPT_fopenmp_EQ)) {
>      UsedOpenMPLib = llvm::StringSwitch<LibOpenMP>(A->getValue())
>          .Case("libgomp",  LibGOMP)
>          .Case("libiomp5", LibIOMP5)
> @@ -6283,6 +6287,8 @@ void darwin::Link::ConstructJob(Compilat
>      if (UsedOpenMPLib == LibUnknown)
>
>  getToolChain().getDriver().Diag(diag::err_drv_unsupported_option_argument)
>          << A->getOption().getName() << A->getValue();
> +  } else if (Args.hasArg(options::OPT_fopenmp)) {
> +    UsedOpenMPLib = LibIOMP5;
>    }
>    switch (UsedOpenMPLib) {
>    case LibGOMP:
> @@ -7998,16 +8004,16 @@ void gnutools::Link::ConstructJob(Compil
>          linkSanitizerRuntimeDeps(ToolChain, CmdArgs);
>
>        LibOpenMP UsedOpenMPLib = LibUnknown;
> -      if (Args.hasArg(options::OPT_fopenmp)) {
> -        UsedOpenMPLib = LibGOMP;
> -      } else if (const Arg *A = Args.getLastArg(options::OPT_fopenmp_EQ))
> {
> +      if (const Arg *A = Args.getLastArg(options::OPT_fopenmp_EQ)) {
>          UsedOpenMPLib = llvm::StringSwitch<LibOpenMP>(A->getValue())
> -            .Case("libgomp",  LibGOMP)
> -            .Case("libiomp5", LibIOMP5)
> -            .Default(LibUnknown);
> +                            .Case("libgomp", LibGOMP)
> +                            .Case("libiomp5", LibIOMP5)
> +                            .Default(LibUnknown);
>          if (UsedOpenMPLib == LibUnknown)
>            D.Diag(diag::err_drv_unsupported_option_argument)
> -            << A->getOption().getName() << A->getValue();
> +              << A->getOption().getName() << A->getValue();
> +      } else if (Args.hasArg(options::OPT_fopenmp)) {
> +        UsedOpenMPLib = LibIOMP5;
>        }
>        switch (UsedOpenMPLib) {
>        case LibGOMP:
>
> Modified: cfe/trunk/lib/Frontend/CompilerInvocation.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/CompilerInvocation.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/lib/Frontend/CompilerInvocation.cpp (original)
> +++ cfe/trunk/lib/Frontend/CompilerInvocation.cpp Tue May 19 23:24:19 2015
> @@ -1643,12 +1643,8 @@ static void ParseLangArgs(LangOptions &O
>      Opts.setMSPointerToMemberRepresentationMethod(InheritanceModel);
>    }
>
> -  // Check if -fopenmp= is specified.
> -  if (const Arg *A = Args.getLastArg(options::OPT_fopenmp_EQ)) {
> -    Opts.OpenMP = llvm::StringSwitch<bool>(A->getValue())
> -        .Case("libiomp5", true)
> -        .Default(false);
> -  }
> +  // Check if -fopenmp is specified.
> +  Opts.OpenMP = Args.hasArg(options::OPT_fopenmp);
>
>    // Record whether the __DEPRECATED define was requested.
>    Opts.Deprecated = Args.hasFlag(OPT_fdeprecated_macro,
>
> Modified: cfe/trunk/test/OpenMP/atomic_ast_print.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/atomic_ast_print.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/atomic_ast_print.cpp (original)
> +++ cfe/trunk/test/OpenMP/atomic_ast_print.cpp Tue May 19 23:24:19 2015
> @@ -1,6 +1,6 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -ast-print %s | FileCheck %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c++ -std=c++11 -emit-pch -o %t %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -std=c++11 -include-pch %t
> -fsyntax-only -verify %s -ast-print | FileCheck %s
> +// RUN: %clang_cc1 -verify -fopenmp -ast-print %s | FileCheck %s
> +// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -emit-pch -o %t %s
> +// RUN: %clang_cc1 -fopenmp -std=c++11 -include-pch %t -fsyntax-only
> -verify %s -ast-print | FileCheck %s
>  // expected-no-diagnostics
>
>  #ifndef HEADER
>
> Modified: cfe/trunk/test/OpenMP/atomic_capture_codegen.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/atomic_capture_codegen.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/atomic_capture_codegen.cpp (original)
> +++ cfe/trunk/test/OpenMP/atomic_capture_codegen.cpp Tue May 19 23:24:19
> 2015
> @@ -1,6 +1,6 @@
> -// RUN: %clang_cc1 -verify -triple x86_64-apple-darwin10
> -fopenmp=libiomp5 -x c -emit-llvm %s -o - | FileCheck %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c -triple x86_64-apple-darwin10
> -emit-pch -o %t %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c -triple x86_64-apple-darwin10
> -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s
> +// RUN: %clang_cc1 -verify -triple x86_64-apple-darwin10 -fopenmp -x c
> -emit-llvm %s -o - | FileCheck %s
> +// RUN: %clang_cc1 -fopenmp -x c -triple x86_64-apple-darwin10 -emit-pch
> -o %t %s
> +// RUN: %clang_cc1 -fopenmp -x c -triple x86_64-apple-darwin10
> -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s
>  // expected-no-diagnostics
>
>  #ifndef HEADER
>
> Modified: cfe/trunk/test/OpenMP/atomic_codegen.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/atomic_codegen.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/atomic_codegen.cpp (original)
> +++ cfe/trunk/test/OpenMP/atomic_codegen.cpp Tue May 19 23:24:19 2015
> @@ -1,5 +1,5 @@
> -// RUN: %clang_cc1 -verify -triple x86_64-apple-darwin10
> -fopenmp=libiomp5 -fexceptions -fcxx-exceptions -x c++ -emit-llvm %s -o - |
> FileCheck %s
> -// RUN: %clang_cc1 -verify -triple x86_64-apple-darwin10
> -fopenmp=libiomp5 -fexceptions -fcxx-exceptions -gline-tables-only -x c++
> -emit-llvm %s -o - | FileCheck %s --check-prefix=TERM_DEBUG
> +// RUN: %clang_cc1 -verify -triple x86_64-apple-darwin10 -fopenmp
> -fexceptions -fcxx-exceptions -x c++ -emit-llvm %s -o - | FileCheck %s
> +// RUN: %clang_cc1 -verify -triple x86_64-apple-darwin10 -fopenmp
> -fexceptions -fcxx-exceptions -gline-tables-only -x c++ -emit-llvm %s -o -
> | FileCheck %s --check-prefix=TERM_DEBUG
>  // expected-no-diagnostics
>
>  int a;
>
> Modified: cfe/trunk/test/OpenMP/atomic_messages.c
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/atomic_messages.c?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/atomic_messages.c (original)
> +++ cfe/trunk/test/OpenMP/atomic_messages.c Tue May 19 23:24:19 2015
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -ferror-limit 100 %s
> +// RUN: %clang_cc1 -verify -fopenmp -ferror-limit 100 %s
>
>  int foo() {
>  L1:
>
> Modified: cfe/trunk/test/OpenMP/atomic_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/atomic_messages.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/atomic_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/atomic_messages.cpp Tue May 19 23:24:19 2015
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -ferror-limit 100 %s
> +// RUN: %clang_cc1 -verify -fopenmp -ferror-limit 100 %s
>
>  int foo() {
>  L1:
>
> Modified: cfe/trunk/test/OpenMP/atomic_read_codegen.c
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/atomic_read_codegen.c?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/atomic_read_codegen.c (original)
> +++ cfe/trunk/test/OpenMP/atomic_read_codegen.c Tue May 19 23:24:19 2015
> @@ -1,6 +1,6 @@
> -// RUN: %clang_cc1 -verify -triple x86_64-apple-darwin10
> -fopenmp=libiomp5 -x c -emit-llvm %s -o - | FileCheck %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c -triple x86_64-apple-darwin10
> -emit-pch -o %t %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c -triple x86_64-apple-darwin10
> -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s
> +// RUN: %clang_cc1 -verify -triple x86_64-apple-darwin10 -fopenmp -x c
> -emit-llvm %s -o - | FileCheck %s
> +// RUN: %clang_cc1 -fopenmp -x c -triple x86_64-apple-darwin10 -emit-pch
> -o %t %s
> +// RUN: %clang_cc1 -fopenmp -x c -triple x86_64-apple-darwin10
> -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s
>  // expected-no-diagnostics
>
>  #ifndef HEADER
>
> Modified: cfe/trunk/test/OpenMP/atomic_update_codegen.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/atomic_update_codegen.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/atomic_update_codegen.cpp (original)
> +++ cfe/trunk/test/OpenMP/atomic_update_codegen.cpp Tue May 19 23:24:19
> 2015
> @@ -1,6 +1,6 @@
> -// RUN: %clang_cc1 -verify -triple x86_64-apple-darwin10
> -fopenmp=libiomp5 -x c -emit-llvm %s -o - | FileCheck %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c -triple x86_64-apple-darwin10
> -emit-pch -o %t %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c -triple x86_64-apple-darwin10
> -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s
> +// RUN: %clang_cc1 -verify -triple x86_64-apple-darwin10 -fopenmp -x c
> -emit-llvm %s -o - | FileCheck %s
> +// RUN: %clang_cc1 -fopenmp -x c -triple x86_64-apple-darwin10 -emit-pch
> -o %t %s
> +// RUN: %clang_cc1 -fopenmp -x c -triple x86_64-apple-darwin10
> -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s
>  // expected-no-diagnostics
>
>  #ifndef HEADER
>
> Modified: cfe/trunk/test/OpenMP/atomic_write_codegen.c
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/atomic_write_codegen.c?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/atomic_write_codegen.c (original)
> +++ cfe/trunk/test/OpenMP/atomic_write_codegen.c Tue May 19 23:24:19 2015
> @@ -1,6 +1,6 @@
> -// RUN: %clang_cc1 -verify -triple x86_64-apple-darwin10
> -fopenmp=libiomp5 -x c -emit-llvm %s -o - | FileCheck %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c -triple x86_64-apple-darwin10
> -emit-pch -o %t %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c -triple x86_64-apple-darwin10
> -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s
> +// RUN: %clang_cc1 -verify -triple x86_64-apple-darwin10 -fopenmp -x c
> -emit-llvm %s -o - | FileCheck %s
> +// RUN: %clang_cc1 -fopenmp -x c -triple x86_64-apple-darwin10 -emit-pch
> -o %t %s
> +// RUN: %clang_cc1 -fopenmp -x c -triple x86_64-apple-darwin10
> -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s
>  // expected-no-diagnostics
>
>  #ifndef HEADER
>
> Modified: cfe/trunk/test/OpenMP/barrier_ast_print.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/barrier_ast_print.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/barrier_ast_print.cpp (original)
> +++ cfe/trunk/test/OpenMP/barrier_ast_print.cpp Tue May 19 23:24:19 2015
> @@ -1,6 +1,6 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -ast-print %s | FileCheck %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c++ -std=c++11 -emit-pch -o %t %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -std=c++11 -include-pch %t
> -fsyntax-only -verify %s -ast-print | FileCheck %s
> +// RUN: %clang_cc1 -verify -fopenmp -ast-print %s | FileCheck %s
> +// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -emit-pch -o %t %s
> +// RUN: %clang_cc1 -fopenmp -std=c++11 -include-pch %t -fsyntax-only
> -verify %s -ast-print | FileCheck %s
>  // expected-no-diagnostics
>
>  #ifndef HEADER
>
> Modified: cfe/trunk/test/OpenMP/barrier_codegen.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/barrier_codegen.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/barrier_codegen.cpp (original)
> +++ cfe/trunk/test/OpenMP/barrier_codegen.cpp Tue May 19 23:24:19 2015
> @@ -1,6 +1,6 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -x c++ -triple
> x86_64-unknown-unknown -emit-llvm %s -o - | FileCheck %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c++ -std=c++11 -triple
> x86_64-unknown-unknown -emit-pch -o %t %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c++ -triple
> x86_64-unknown-unknown -std=c++11 -include-pch %t -verify %s -emit-llvm -o
> - | FileCheck %s
> +// RUN: %clang_cc1 -verify -fopenmp -x c++ -triple x86_64-unknown-unknown
> -emit-llvm %s -o - | FileCheck %s
> +// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple
> x86_64-unknown-unknown -emit-pch -o %t %s
> +// RUN: %clang_cc1 -fopenmp -x c++ -triple x86_64-unknown-unknown
> -std=c++11 -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s
>  // expected-no-diagnostics
>
>  #ifndef HEADER
>
> Modified: cfe/trunk/test/OpenMP/barrier_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/barrier_messages.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/barrier_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/barrier_messages.cpp Tue May 19 23:24:19 2015
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -ferror-limit 100 %s
> +// RUN: %clang_cc1 -verify -fopenmp -ferror-limit 100 %s
>
>  template <class T>
>  T tmain(T argc) {
>
> Modified: cfe/trunk/test/OpenMP/critical_ast_print.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/critical_ast_print.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/critical_ast_print.cpp (original)
> +++ cfe/trunk/test/OpenMP/critical_ast_print.cpp Tue May 19 23:24:19 2015
> @@ -1,6 +1,6 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -ast-print %s | FileCheck %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c++ -std=c++11 -emit-pch -o %t %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -std=c++11 -include-pch %t
> -fsyntax-only -verify %s -ast-print | FileCheck %s
> +// RUN: %clang_cc1 -verify -fopenmp -ast-print %s | FileCheck %s
> +// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -emit-pch -o %t %s
> +// RUN: %clang_cc1 -fopenmp -std=c++11 -include-pch %t -fsyntax-only
> -verify %s -ast-print | FileCheck %s
>  // expected-no-diagnostics
>
>  #ifndef HEADER
>
> Modified: cfe/trunk/test/OpenMP/critical_codegen.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/critical_codegen.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/critical_codegen.cpp (original)
> +++ cfe/trunk/test/OpenMP/critical_codegen.cpp Tue May 19 23:24:19 2015
> @@ -1,7 +1,7 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -x c++ -emit-llvm %s
> -fexceptions -fcxx-exceptions -o - | FileCheck %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c++ -std=c++11 -triple
> x86_64-unknown-unknown -fexceptions -fcxx-exceptions -emit-pch -o %t %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c++ -triple
> x86_64-unknown-unknown -fexceptions -fcxx-exceptions -std=c++11
> -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s
> -// RUN: %clang_cc1 -verify -triple x86_64-apple-darwin10
> -fopenmp=libiomp5 -fexceptions -fcxx-exceptions -gline-tables-only -x c++
> -emit-llvm %s -o - | FileCheck %s --check-prefix=TERM_DEBUG
> +// RUN: %clang_cc1 -verify -fopenmp -x c++ -emit-llvm %s -fexceptions
> -fcxx-exceptions -o - | FileCheck %s
> +// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple
> x86_64-unknown-unknown -fexceptions -fcxx-exceptions -emit-pch -o %t %s
> +// RUN: %clang_cc1 -fopenmp -x c++ -triple x86_64-unknown-unknown
> -fexceptions -fcxx-exceptions -std=c++11 -include-pch %t -verify %s
> -emit-llvm -o - | FileCheck %s
> +// RUN: %clang_cc1 -verify -triple x86_64-apple-darwin10 -fopenmp
> -fexceptions -fcxx-exceptions -gline-tables-only -x c++ -emit-llvm %s -o -
> | FileCheck %s --check-prefix=TERM_DEBUG
>  // expected-no-diagnostics
>
>  #ifndef HEADER
>
> Modified: cfe/trunk/test/OpenMP/critical_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/critical_messages.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/critical_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/critical_messages.cpp Tue May 19 23:24:19 2015
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 %s
> +// RUN: %clang_cc1 -verify -fopenmp %s
>
>  int foo();
>
>
> Modified: cfe/trunk/test/OpenMP/flush_ast_print.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/flush_ast_print.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/flush_ast_print.cpp (original)
> +++ cfe/trunk/test/OpenMP/flush_ast_print.cpp Tue May 19 23:24:19 2015
> @@ -1,6 +1,6 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -ast-print %s | FileCheck %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c++ -std=c++11 -emit-pch -o %t %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -std=c++11 -include-pch %t
> -fsyntax-only -verify %s -ast-print | FileCheck %s
> +// RUN: %clang_cc1 -verify -fopenmp -ast-print %s | FileCheck %s
> +// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -emit-pch -o %t %s
> +// RUN: %clang_cc1 -fopenmp -std=c++11 -include-pch %t -fsyntax-only
> -verify %s -ast-print | FileCheck %s
>  // expected-no-diagnostics
>
>  #ifndef HEADER
>
> Modified: cfe/trunk/test/OpenMP/flush_codegen.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/flush_codegen.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/flush_codegen.cpp (original)
> +++ cfe/trunk/test/OpenMP/flush_codegen.cpp Tue May 19 23:24:19 2015
> @@ -1,6 +1,6 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -x c++ -emit-llvm %s
> -fexceptions -fcxx-exceptions -o - | FileCheck %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c++ -std=c++11 -triple
> x86_64-unknown-unknown -fexceptions -fcxx-exceptions -emit-pch -o %t %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c++ -triple
> x86_64-unknown-unknown -fexceptions -fcxx-exceptions -g -std=c++11
> -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s
> +// RUN: %clang_cc1 -verify -fopenmp -x c++ -emit-llvm %s -fexceptions
> -fcxx-exceptions -o - | FileCheck %s
> +// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple
> x86_64-unknown-unknown -fexceptions -fcxx-exceptions -emit-pch -o %t %s
> +// RUN: %clang_cc1 -fopenmp -x c++ -triple x86_64-unknown-unknown
> -fexceptions -fcxx-exceptions -g -std=c++11 -include-pch %t -verify %s
> -emit-llvm -o - | FileCheck %s
>  // expected-no-diagnostics
>
>  #ifndef HEADER
>
> Modified: cfe/trunk/test/OpenMP/flush_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/flush_messages.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/flush_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/flush_messages.cpp Tue May 19 23:24:19 2015
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -ferror-limit 100 %s
> +// RUN: %clang_cc1 -verify -fopenmp -ferror-limit 100 %s
>
>  struct S1 { // expected-note 2 {{declared here}}
>    int a;
>
> Modified: cfe/trunk/test/OpenMP/for_ast_print.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_ast_print.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/for_ast_print.cpp (original)
> +++ cfe/trunk/test/OpenMP/for_ast_print.cpp Tue May 19 23:24:19 2015
> @@ -1,6 +1,6 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -ast-print %s | FileCheck %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c++ -std=c++11 -emit-pch -o %t %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -std=c++11 -include-pch %t
> -fsyntax-only -verify %s -ast-print | FileCheck %s
> +// RUN: %clang_cc1 -verify -fopenmp -ast-print %s | FileCheck %s
> +// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -emit-pch -o %t %s
> +// RUN: %clang_cc1 -fopenmp -std=c++11 -include-pch %t -fsyntax-only
> -verify %s -ast-print | FileCheck %s
>  // expected-no-diagnostics
>
>  #ifndef HEADER
>
> Modified: cfe/trunk/test/OpenMP/for_codegen.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_codegen.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/for_codegen.cpp (original)
> +++ cfe/trunk/test/OpenMP/for_codegen.cpp Tue May 19 23:24:19 2015
> @@ -1,7 +1,7 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -x c++ -triple
> x86_64-unknown-unknown -emit-llvm %s -fexceptions -fcxx-exceptions -o - |
> FileCheck %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c++ -std=c++11 -triple
> x86_64-unknown-unknown -fexceptions -fcxx-exceptions -emit-pch -o %t %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c++ -triple
> x86_64-unknown-unknown -fexceptions -fcxx-exceptions -std=c++11
> -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s
> -// RUN: %clang_cc1 -verify -triple x86_64-apple-darwin10
> -fopenmp=libiomp5 -fexceptions -fcxx-exceptions -gline-tables-only -x c++
> -emit-llvm %s -o - | FileCheck %s --check-prefix=TERM_DEBUG
> +// RUN: %clang_cc1 -verify -fopenmp -x c++ -triple x86_64-unknown-unknown
> -emit-llvm %s -fexceptions -fcxx-exceptions -o - | FileCheck %s
> +// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple
> x86_64-unknown-unknown -fexceptions -fcxx-exceptions -emit-pch -o %t %s
> +// RUN: %clang_cc1 -fopenmp -x c++ -triple x86_64-unknown-unknown
> -fexceptions -fcxx-exceptions -std=c++11 -include-pch %t -verify %s
> -emit-llvm -o - | FileCheck %s
> +// RUN: %clang_cc1 -verify -triple x86_64-apple-darwin10 -fopenmp
> -fexceptions -fcxx-exceptions -gline-tables-only -x c++ -emit-llvm %s -o -
> | FileCheck %s --check-prefix=TERM_DEBUG
>  //
>  // expected-no-diagnostics
>  #ifndef HEADER
>
> Modified: cfe/trunk/test/OpenMP/for_collapse_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_collapse_messages.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/for_collapse_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/for_collapse_messages.cpp Tue May 19 23:24:19
> 2015
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 %s
> +// RUN: %clang_cc1 -verify -fopenmp %s
>
>  void foo() {
>  }
>
> Modified: cfe/trunk/test/OpenMP/for_firstprivate_codegen.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_firstprivate_codegen.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/for_firstprivate_codegen.cpp (original)
> +++ cfe/trunk/test/OpenMP/for_firstprivate_codegen.cpp Tue May 19 23:24:19
> 2015
> @@ -1,8 +1,8 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -x c++ -triple
> x86_64-apple-darwin10 -emit-llvm %s -o - | FileCheck %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c++ -std=c++11 -triple
> x86_64-apple-darwin10 -emit-pch -o %t %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c++ -triple x86_64-apple-darwin10
> -std=c++11 -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -x c++ -std=c++11 -DLAMBDA
> -triple x86_64-apple-darwin10 -emit-llvm %s -o - | FileCheck
> -check-prefix=LAMBDA %s
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -x c++ -fblocks -DBLOCKS
> -triple x86_64-apple-darwin10 -emit-llvm %s -o - | FileCheck
> -check-prefix=BLOCKS %s
> +// RUN: %clang_cc1 -verify -fopenmp -x c++ -triple x86_64-apple-darwin10
> -emit-llvm %s -o - | FileCheck %s
> +// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple
> x86_64-apple-darwin10 -emit-pch -o %t %s
> +// RUN: %clang_cc1 -fopenmp -x c++ -triple x86_64-apple-darwin10
> -std=c++11 -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s
> +// RUN: %clang_cc1 -verify -fopenmp -x c++ -std=c++11 -DLAMBDA -triple
> x86_64-apple-darwin10 -emit-llvm %s -o - | FileCheck -check-prefix=LAMBDA %s
> +// RUN: %clang_cc1 -verify -fopenmp -x c++ -fblocks -DBLOCKS -triple
> x86_64-apple-darwin10 -emit-llvm %s -o - | FileCheck -check-prefix=BLOCKS %s
>  // expected-no-diagnostics
>  #ifndef HEADER
>  #define HEADER
>
> Modified: cfe/trunk/test/OpenMP/for_firstprivate_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_firstprivate_messages.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/for_firstprivate_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/for_firstprivate_messages.cpp Tue May 19
> 23:24:19 2015
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 %s
> +// RUN: %clang_cc1 -verify -fopenmp %s
>
>  void foo() {
>  }
>
> Modified: cfe/trunk/test/OpenMP/for_lastprivate_codegen.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_lastprivate_codegen.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/for_lastprivate_codegen.cpp (original)
> +++ cfe/trunk/test/OpenMP/for_lastprivate_codegen.cpp Tue May 19 23:24:19
> 2015
> @@ -1,8 +1,8 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -x c++ -triple
> x86_64-apple-darwin10 -emit-llvm %s -o - | FileCheck %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c++ -std=c++11 -triple
> x86_64-apple-darwin10 -emit-pch -o %t %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c++ -triple x86_64-apple-darwin10
> -std=c++11 -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -x c++ -std=c++11 -DLAMBDA
> -triple x86_64-apple-darwin10 -emit-llvm %s -o - | FileCheck
> -check-prefix=LAMBDA %s
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -x c++ -fblocks -DBLOCKS
> -triple x86_64-apple-darwin10 -emit-llvm %s -o - | FileCheck
> -check-prefix=BLOCKS %s
> +// RUN: %clang_cc1 -verify -fopenmp -x c++ -triple x86_64-apple-darwin10
> -emit-llvm %s -o - | FileCheck %s
> +// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple
> x86_64-apple-darwin10 -emit-pch -o %t %s
> +// RUN: %clang_cc1 -fopenmp -x c++ -triple x86_64-apple-darwin10
> -std=c++11 -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s
> +// RUN: %clang_cc1 -verify -fopenmp -x c++ -std=c++11 -DLAMBDA -triple
> x86_64-apple-darwin10 -emit-llvm %s -o - | FileCheck -check-prefix=LAMBDA %s
> +// RUN: %clang_cc1 -verify -fopenmp -x c++ -fblocks -DBLOCKS -triple
> x86_64-apple-darwin10 -emit-llvm %s -o - | FileCheck -check-prefix=BLOCKS %s
>  // expected-no-diagnostics
>  #ifndef HEADER
>  #define HEADER
>
> Modified: cfe/trunk/test/OpenMP/for_lastprivate_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_lastprivate_messages.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/for_lastprivate_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/for_lastprivate_messages.cpp Tue May 19 23:24:19
> 2015
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 %s
> +// RUN: %clang_cc1 -verify -fopenmp %s
>
>  void foo() {
>  }
>
> Modified: cfe/trunk/test/OpenMP/for_loop_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_loop_messages.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/for_loop_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/for_loop_messages.cpp Tue May 19 23:24:19 2015
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -fsyntax-only -fopenmp=libiomp5 -x c++ -std=c++11
> -fexceptions -fcxx-exceptions -verify %s
> +// RUN: %clang_cc1 -fsyntax-only -fopenmp -x c++ -std=c++11 -fexceptions
> -fcxx-exceptions -verify %s
>
>  class S {
>    int a;
>
> Modified: cfe/trunk/test/OpenMP/for_misc_messages.c
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_misc_messages.c?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/for_misc_messages.c (original)
> +++ cfe/trunk/test/OpenMP/for_misc_messages.c Tue May 19 23:24:19 2015
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -fsyntax-only -fopenmp=libiomp5 -triple
> x86_64-unknown-unknown -verify %s
> +// RUN: %clang_cc1 -fsyntax-only -fopenmp -triple x86_64-unknown-unknown
> -verify %s
>
>  // expected-error at +1 {{unexpected OpenMP directive '#pragma omp for'}}
>  #pragma omp for
>
> Modified: cfe/trunk/test/OpenMP/for_private_codegen.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_private_codegen.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/for_private_codegen.cpp (original)
> +++ cfe/trunk/test/OpenMP/for_private_codegen.cpp Tue May 19 23:24:19 2015
> @@ -1,8 +1,8 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -x c++ -triple
> x86_64-unknown-unknown -emit-llvm %s -o - | FileCheck %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c++ -std=c++11 -triple
> x86_64-unknown-unknown -emit-pch -o %t %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c++ -triple
> x86_64-unknown-unknown -std=c++11 -include-pch %t -verify %s -emit-llvm -o
> - | FileCheck %s
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -x c++ -std=c++11 -DLAMBDA
> -triple %itanium_abi_triple -emit-llvm %s -o - | FileCheck
> -check-prefix=LAMBDA %s
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -x c++ -fblocks -DBLOCKS
> -triple %itanium_abi_triple -emit-llvm %s -o - | FileCheck
> -check-prefix=BLOCKS %s
> +// RUN: %clang_cc1 -verify -fopenmp -x c++ -triple x86_64-unknown-unknown
> -emit-llvm %s -o - | FileCheck %s
> +// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple
> x86_64-unknown-unknown -emit-pch -o %t %s
> +// RUN: %clang_cc1 -fopenmp -x c++ -triple x86_64-unknown-unknown
> -std=c++11 -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s
> +// RUN: %clang_cc1 -verify -fopenmp -x c++ -std=c++11 -DLAMBDA -triple
> %itanium_abi_triple -emit-llvm %s -o - | FileCheck -check-prefix=LAMBDA %s
> +// RUN: %clang_cc1 -verify -fopenmp -x c++ -fblocks -DBLOCKS -triple
> %itanium_abi_triple -emit-llvm %s -o - | FileCheck -check-prefix=BLOCKS %s
>  // expected-no-diagnostics
>  #ifndef HEADER
>  #define HEADER
>
> Modified: cfe/trunk/test/OpenMP/for_private_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_private_messages.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/for_private_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/for_private_messages.cpp Tue May 19 23:24:19 2015
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 %s
> +// RUN: %clang_cc1 -verify -fopenmp %s
>
>  void foo() {
>  }
>
> Modified: cfe/trunk/test/OpenMP/for_reduction_codegen.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_reduction_codegen.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/for_reduction_codegen.cpp (original)
> +++ cfe/trunk/test/OpenMP/for_reduction_codegen.cpp Tue May 19 23:24:19
> 2015
> @@ -1,8 +1,8 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -x c++ -triple
> x86_64-apple-darwin10 -emit-llvm %s -o - | FileCheck %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c++ -std=c++11 -triple
> x86_64-apple-darwin10 -emit-pch -o %t %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c++ -triple x86_64-apple-darwin10
> -std=c++11 -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -x c++ -std=c++11 -DLAMBDA
> -triple x86_64-apple-darwin10 -emit-llvm %s -o - | FileCheck
> -check-prefix=LAMBDA %s
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -x c++ -fblocks -DBLOCKS
> -triple x86_64-apple-darwin10 -emit-llvm %s -o - | FileCheck
> -check-prefix=BLOCKS %s
> +// RUN: %clang_cc1 -verify -fopenmp -x c++ -triple x86_64-apple-darwin10
> -emit-llvm %s -o - | FileCheck %s
> +// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple
> x86_64-apple-darwin10 -emit-pch -o %t %s
> +// RUN: %clang_cc1 -fopenmp -x c++ -triple x86_64-apple-darwin10
> -std=c++11 -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s
> +// RUN: %clang_cc1 -verify -fopenmp -x c++ -std=c++11 -DLAMBDA -triple
> x86_64-apple-darwin10 -emit-llvm %s -o - | FileCheck -check-prefix=LAMBDA %s
> +// RUN: %clang_cc1 -verify -fopenmp -x c++ -fblocks -DBLOCKS -triple
> x86_64-apple-darwin10 -emit-llvm %s -o - | FileCheck -check-prefix=BLOCKS %s
>  // expected-no-diagnostics
>  #ifndef HEADER
>  #define HEADER
>
> Modified: cfe/trunk/test/OpenMP/for_reduction_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_reduction_messages.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/for_reduction_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/for_reduction_messages.cpp Tue May 19 23:24:19
> 2015
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -ferror-limit 150 -o - %s
> +// RUN: %clang_cc1 -verify -fopenmp -ferror-limit 150 -o - %s
>
>  void foo() {
>  }
>
> Modified: cfe/trunk/test/OpenMP/for_schedule_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_schedule_messages.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/for_schedule_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/for_schedule_messages.cpp Tue May 19 23:24:19
> 2015
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 %s
> +// RUN: %clang_cc1 -verify -fopenmp %s
>
>  void foo() {
>  }
>
> Modified: cfe/trunk/test/OpenMP/for_simd_aligned_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_simd_aligned_messages.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/for_simd_aligned_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/for_simd_aligned_messages.cpp Tue May 19
> 23:24:19 2015
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -x c++ -std=c++11 -verify -fopenmp=libiomp5 %s
> +// RUN: %clang_cc1 -x c++ -std=c++11 -verify -fopenmp %s
>
>  struct B {
>    static int ib[20]; // expected-note 0 {{'B::ib' declared here}}
>
> Modified: cfe/trunk/test/OpenMP/for_simd_ast_print.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_simd_ast_print.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/for_simd_ast_print.cpp (original)
> +++ cfe/trunk/test/OpenMP/for_simd_ast_print.cpp Tue May 19 23:24:19 2015
> @@ -1,6 +1,6 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -ast-print %s | FileCheck %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c++ -std=c++11 -emit-pch -o %t %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -std=c++11 -include-pch %t
> -fsyntax-only -verify %s -ast-print | FileCheck %s
> +// RUN: %clang_cc1 -verify -fopenmp -ast-print %s | FileCheck %s
> +// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -emit-pch -o %t %s
> +// RUN: %clang_cc1 -fopenmp -std=c++11 -include-pch %t -fsyntax-only
> -verify %s -ast-print | FileCheck %s
>  // expected-no-diagnostics
>
>  #ifndef HEADER
>
> Modified: cfe/trunk/test/OpenMP/for_simd_collapse_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_simd_collapse_messages.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/for_simd_collapse_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/for_simd_collapse_messages.cpp Tue May 19
> 23:24:19 2015
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 %s
> +// RUN: %clang_cc1 -verify -fopenmp %s
>
>  void foo() {
>  }
>
> Modified: cfe/trunk/test/OpenMP/for_simd_firstprivate_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_simd_firstprivate_messages.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/for_simd_firstprivate_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/for_simd_firstprivate_messages.cpp Tue May 19
> 23:24:19 2015
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 %s
> +// RUN: %clang_cc1 -verify -fopenmp %s
>
>  void foo() {
>  }
>
> Modified: cfe/trunk/test/OpenMP/for_simd_lastprivate_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_simd_lastprivate_messages.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/for_simd_lastprivate_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/for_simd_lastprivate_messages.cpp Tue May 19
> 23:24:19 2015
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 %s
> +// RUN: %clang_cc1 -verify -fopenmp %s
>
>  void foo() {
>  }
>
> Modified: cfe/trunk/test/OpenMP/for_simd_linear_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_simd_linear_messages.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/for_simd_linear_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/for_simd_linear_messages.cpp Tue May 19 23:24:19
> 2015
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 %s
> +// RUN: %clang_cc1 -verify -fopenmp %s
>
>  namespace X {
>    int x;
>
> Modified: cfe/trunk/test/OpenMP/for_simd_loop_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_simd_loop_messages.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/for_simd_loop_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/for_simd_loop_messages.cpp Tue May 19 23:24:19
> 2015
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -fsyntax-only -fopenmp=libiomp5 -x c++ -std=c++11
> -fexceptions -fcxx-exceptions -verify %s
> +// RUN: %clang_cc1 -fsyntax-only -fopenmp -x c++ -std=c++11 -fexceptions
> -fcxx-exceptions -verify %s
>
>  class S {
>    int a;
>
> Modified: cfe/trunk/test/OpenMP/for_simd_misc_messages.c
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_simd_misc_messages.c?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/for_simd_misc_messages.c (original)
> +++ cfe/trunk/test/OpenMP/for_simd_misc_messages.c Tue May 19 23:24:19 2015
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -fsyntax-only -fopenmp=libiomp5 -verify %s
> +// RUN: %clang_cc1 -fsyntax-only -fopenmp -verify %s
>
>  // expected-error at +1 {{unexpected OpenMP directive '#pragma omp for
> simd'}}
>  #pragma omp for simd
>
> Modified: cfe/trunk/test/OpenMP/for_simd_private_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_simd_private_messages.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/for_simd_private_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/for_simd_private_messages.cpp Tue May 19
> 23:24:19 2015
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 %s
> +// RUN: %clang_cc1 -verify -fopenmp %s
>
>  void foo() {
>  }
>
> Modified: cfe/trunk/test/OpenMP/for_simd_reduction_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_simd_reduction_messages.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/for_simd_reduction_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/for_simd_reduction_messages.cpp Tue May 19
> 23:24:19 2015
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 %s
> +// RUN: %clang_cc1 -verify -fopenmp %s
>
>  void foo() {
>  }
>
> Modified: cfe/trunk/test/OpenMP/for_simd_safelen_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_simd_safelen_messages.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/for_simd_safelen_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/for_simd_safelen_messages.cpp Tue May 19
> 23:24:19 2015
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 %s
> +// RUN: %clang_cc1 -verify -fopenmp %s
>
>  void foo() {
>  }
>
> Modified: cfe/trunk/test/OpenMP/for_simd_schedule_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/for_simd_schedule_messages.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/for_simd_schedule_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/for_simd_schedule_messages.cpp Tue May 19
> 23:24:19 2015
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 %s
> +// RUN: %clang_cc1 -verify -fopenmp %s
>
>  void foo() {
>  }
>
> Modified: cfe/trunk/test/OpenMP/linking.c
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/linking.c?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/linking.c (original)
> +++ cfe/trunk/test/OpenMP/linking.c Tue May 19 23:24:19 2015
> @@ -1,18 +1,18 @@
>  // Test the that the driver produces reasonable linker invocations with
> -// -fopenmp or -fopenmp=libiomp5|libgomp.
> +// -fopenmp or -fopenmp|libgomp.
>  //
>  // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
>  // RUN:     -fopenmp -target i386-unknown-linux \
>  // RUN:   | FileCheck --check-prefix=CHECK-LD-32 %s
>  // CHECK-LD-32: "{{.*}}ld{{(.exe)?}}"
> -// CHECK-LD-32: "-lgomp" "-lrt" "-lgcc"
> +// CHECK-LD-32: "-liomp5" "-lgcc"
>  // CHECK-LD-32: "-lpthread" "-lc"
>  //
>  // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
>  // RUN:     -fopenmp -target x86_64-unknown-linux \
>  // RUN:   | FileCheck --check-prefix=CHECK-LD-64 %s
>  // CHECK-LD-64: "{{.*}}ld{{(.exe)?}}"
> -// CHECK-LD-64: "-lgomp" "-lrt" "-lgcc"
> +// CHECK-LD-64: "-liomp5" "-lgcc"
>  // CHECK-LD-64: "-lpthread" "-lc"
>  //
>  // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
> @@ -30,14 +30,14 @@
>  // CHECK-GOMP-LD-64: "-lpthread" "-lc"
>  //
>  // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
> -// RUN:     -fopenmp=libiomp5 -target i386-unknown-linux \
> +// RUN:     -fopenmp -target i386-unknown-linux \
>  // RUN:   | FileCheck --check-prefix=CHECK-IOMP5-LD-32 %s
>  // CHECK-IOMP5-LD-32: "{{.*}}ld{{(.exe)?}}"
>  // CHECK-IOMP5-LD-32: "-liomp5" "-lgcc"
>  // CHECK-IOMP5-LD-32: "-lpthread" "-lc"
>  //
>  // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
> -// RUN:     -fopenmp=libiomp5 -target x86_64-unknown-linux \
> +// RUN:     -fopenmp -target x86_64-unknown-linux \
>  // RUN:   | FileCheck --check-prefix=CHECK-IOMP5-LD-64 %s
>  // CHECK-IOMP5-LD-64: "{{.*}}ld{{(.exe)?}}"
>  // CHECK-IOMP5-LD-64: "-liomp5" "-lgcc"
> @@ -54,18 +54,16 @@
>  // CHECK-LIB-LD-64: error: unsupported argument 'lib' to option 'fopenmp='
>  //
>  // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
> -// RUN:     -fopenmp -fopenmp=libiomp5 -target i386-unknown-linux \
> -// RUN:   | FileCheck --check-prefix=CHECK-LD-WARN-32 %s
> -// CHECK-LD-WARN-32: warning: argument unused during compilation:
> '-fopenmp=libiomp5'
> -// CHECK-LD-WARN-32: "{{.*}}ld{{(.exe)?}}"
> -// CHECK-LD-WARN-32: "-lgomp" "-lrt" "-lgcc"
> -// CHECK-LD-WARN-32: "-lpthread" "-lc"
> +// RUN:     -fopenmp -fopenmp=libgomp -target i386-unknown-linux \
> +// RUN:   | FileCheck --check-prefix=CHECK-LD-OVERRIDE-32 %s
> +// CHECK-LD-OVERRIDE-32: "{{.*}}ld{{(.exe)?}}"
> +// CHECK-LD-OVERRIDE-32: "-lgomp" "-lrt" "-lgcc"
> +// CHECK-LD-OVERRIDE-32: "-lpthread" "-lc"
>  //
>  // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
> -// RUN:     -fopenmp -fopenmp=libiomp5 -target x86_64-unknown-linux \
> -// RUN:   | FileCheck --check-prefix=CHECK-LD-WARN-64 %s
> -// CHECK-LD-WARN-64: warning: argument unused during compilation:
> '-fopenmp=libiomp5'
> -// CHECK-LD-WARN-64: "{{.*}}ld{{(.exe)?}}"
> -// CHECK-LD-WARN-64: "-lgomp" "-lrt" "-lgcc"
> -// CHECK-LD-WARN-64: "-lpthread" "-lc"
> +// RUN:     -fopenmp -fopenmp=libgomp -target x86_64-unknown-linux \
> +// RUN:   | FileCheck --check-prefix=CHECK-LD-OVERRIDE-64 %s
> +// CHECK-LD-OVERRIDE-64: "{{.*}}ld{{(.exe)?}}"
> +// CHECK-LD-OVERRIDE-64: "-lgomp" "-lrt" "-lgcc"
> +// CHECK-LD-OVERRIDE-64: "-lpthread" "-lc"
>  //
>
> Modified: cfe/trunk/test/OpenMP/master_ast_print.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/master_ast_print.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/master_ast_print.cpp (original)
> +++ cfe/trunk/test/OpenMP/master_ast_print.cpp Tue May 19 23:24:19 2015
> @@ -1,6 +1,6 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -ast-print %s | FileCheck %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c++ -std=c++11 -emit-pch -o %t %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -std=c++11 -include-pch %t
> -fsyntax-only -verify %s -ast-print | FileCheck %s
> +// RUN: %clang_cc1 -verify -fopenmp -ast-print %s | FileCheck %s
> +// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -emit-pch -o %t %s
> +// RUN: %clang_cc1 -fopenmp -std=c++11 -include-pch %t -fsyntax-only
> -verify %s -ast-print | FileCheck %s
>  // expected-no-diagnostics
>
>  #ifndef HEADER
>
> Modified: cfe/trunk/test/OpenMP/master_codegen.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/master_codegen.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/master_codegen.cpp (original)
> +++ cfe/trunk/test/OpenMP/master_codegen.cpp Tue May 19 23:24:19 2015
> @@ -1,7 +1,7 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -x c++ -emit-llvm %s
> -fexceptions -fcxx-exceptions -o - | FileCheck %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c++ -std=c++11 -triple
> x86_64-unknown-unknown -fexceptions -fcxx-exceptions -emit-pch -o %t %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c++ -triple
> x86_64-unknown-unknown -fexceptions -fcxx-exceptions -std=c++11
> -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s
> -// RUN: %clang_cc1 -verify -triple x86_64-apple-darwin10
> -fopenmp=libiomp5 -fexceptions -fcxx-exceptions -gline-tables-only -x c++
> -emit-llvm %s -o - | FileCheck %s --check-prefix=TERM_DEBUG
> +// RUN: %clang_cc1 -verify -fopenmp -x c++ -emit-llvm %s -fexceptions
> -fcxx-exceptions -o - | FileCheck %s
> +// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple
> x86_64-unknown-unknown -fexceptions -fcxx-exceptions -emit-pch -o %t %s
> +// RUN: %clang_cc1 -fopenmp -x c++ -triple x86_64-unknown-unknown
> -fexceptions -fcxx-exceptions -std=c++11 -include-pch %t -verify %s
> -emit-llvm -o - | FileCheck %s
> +// RUN: %clang_cc1 -verify -triple x86_64-apple-darwin10 -fopenmp
> -fexceptions -fcxx-exceptions -gline-tables-only -x c++ -emit-llvm %s -o -
> | FileCheck %s --check-prefix=TERM_DEBUG
>  // expected-no-diagnostics
>
>  #ifndef HEADER
>
> Modified: cfe/trunk/test/OpenMP/master_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/master_messages.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/master_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/master_messages.cpp Tue May 19 23:24:19 2015
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 %s
> +// RUN: %clang_cc1 -verify -fopenmp %s
>
>  int foo();
>
>
> Modified: cfe/trunk/test/OpenMP/nesting_of_regions.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/nesting_of_regions.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/nesting_of_regions.cpp (original)
> +++ cfe/trunk/test/OpenMP/nesting_of_regions.cpp Tue May 19 23:24:19 2015
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -fsyntax-only -fopenmp=libiomp5 -verify %s
> +// RUN: %clang_cc1 -fsyntax-only -fopenmp -verify %s
>
>  void bar();
>
>
> Modified: cfe/trunk/test/OpenMP/openmp_common.c
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/openmp_common.c?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/openmp_common.c (original)
> +++ cfe/trunk/test/OpenMP/openmp_common.c Tue May 19 23:24:19 2015
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -ferror-limit 100 -o - %s
> +// RUN: %clang_cc1 -verify -fopenmp -ferror-limit 100 -o - %s
>
>  #pragma omp // expected-error {{expected an OpenMP directive}}
>  #pragma omp unknown_directive // expected-error {{expected an OpenMP
> directive}}
>
> Modified: cfe/trunk/test/OpenMP/ordered_ast_print.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/ordered_ast_print.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/ordered_ast_print.cpp (original)
> +++ cfe/trunk/test/OpenMP/ordered_ast_print.cpp Tue May 19 23:24:19 2015
> @@ -1,6 +1,6 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -ast-print %s | FileCheck %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c++ -std=c++11 -emit-pch -o %t %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -std=c++11 -include-pch %t
> -fsyntax-only -verify %s -ast-print | FileCheck %s
> +// RUN: %clang_cc1 -verify -fopenmp -ast-print %s | FileCheck %s
> +// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -emit-pch -o %t %s
> +// RUN: %clang_cc1 -fopenmp -std=c++11 -include-pch %t -fsyntax-only
> -verify %s -ast-print | FileCheck %s
>  // expected-no-diagnostics
>
>  #ifndef HEADER
>
> Modified: cfe/trunk/test/OpenMP/ordered_codegen.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/ordered_codegen.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/ordered_codegen.cpp (original)
> +++ cfe/trunk/test/OpenMP/ordered_codegen.cpp Tue May 19 23:24:19 2015
> @@ -1,6 +1,6 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -x c++ -triple
> x86_64-unknown-unknown -emit-llvm %s -fexceptions -fcxx-exceptions -o - |
> FileCheck %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c++ -std=c++11 -triple
> x86_64-unknown-unknown -fexceptions -fcxx-exceptions -emit-pch -o %t %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c++ -triple
> x86_64-unknown-unknown -fexceptions -fcxx-exceptions -std=c++11
> -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s
> +// RUN: %clang_cc1 -verify -fopenmp -x c++ -triple x86_64-unknown-unknown
> -emit-llvm %s -fexceptions -fcxx-exceptions -o - | FileCheck %s
> +// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple
> x86_64-unknown-unknown -fexceptions -fcxx-exceptions -emit-pch -o %t %s
> +// RUN: %clang_cc1 -fopenmp -x c++ -triple x86_64-unknown-unknown
> -fexceptions -fcxx-exceptions -std=c++11 -include-pch %t -verify %s
> -emit-llvm -o - | FileCheck %s
>  //
>  // expected-no-diagnostics
>  #ifndef HEADER
>
> Modified: cfe/trunk/test/OpenMP/ordered_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/ordered_messages.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/ordered_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/ordered_messages.cpp Tue May 19 23:24:19 2015
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -ferror-limit 100 -o - %s
> +// RUN: %clang_cc1 -verify -fopenmp -ferror-limit 100 -o - %s
>
>  int foo();
>
>
> Modified: cfe/trunk/test/OpenMP/parallel_ast_print.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_ast_print.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/parallel_ast_print.cpp (original)
> +++ cfe/trunk/test/OpenMP/parallel_ast_print.cpp Tue May 19 23:24:19 2015
> @@ -1,6 +1,6 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -ast-print %s | FileCheck %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c++ -std=c++11 -emit-pch -o %t %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -std=c++11 -include-pch %t
> -fsyntax-only -verify %s -ast-print | FileCheck %s
> +// RUN: %clang_cc1 -verify -fopenmp -ast-print %s | FileCheck %s
> +// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -emit-pch -o %t %s
> +// RUN: %clang_cc1 -fopenmp -std=c++11 -include-pch %t -fsyntax-only
> -verify %s -ast-print | FileCheck %s
>  // expected-no-diagnostics
>
>  #ifndef HEADER
>
> Modified: cfe/trunk/test/OpenMP/parallel_codegen.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_codegen.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/parallel_codegen.cpp (original)
> +++ cfe/trunk/test/OpenMP/parallel_codegen.cpp Tue May 19 23:24:19 2015
> @@ -1,6 +1,6 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -x c++ -emit-llvm %s
> -fexceptions -fcxx-exceptions -o - | FileCheck %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c++ -std=c++11 -triple
> x86_64-unknown-unknown -fexceptions -fcxx-exceptions -emit-pch -o %t %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c++ -triple
> x86_64-unknown-unknown -fexceptions -fcxx-exceptions -g -std=c++11
> -include-pch %t -verify %s -emit-llvm -o - | FileCheck
> --check-prefix=CHECK-DEBUG %s
> +// RUN: %clang_cc1 -verify -fopenmp -x c++ -emit-llvm %s -fexceptions
> -fcxx-exceptions -o - | FileCheck %s
> +// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple
> x86_64-unknown-unknown -fexceptions -fcxx-exceptions -emit-pch -o %t %s
> +// RUN: %clang_cc1 -fopenmp -x c++ -triple x86_64-unknown-unknown
> -fexceptions -fcxx-exceptions -g -std=c++11 -include-pch %t -verify %s
> -emit-llvm -o - | FileCheck --check-prefix=CHECK-DEBUG %s
>  // expected-no-diagnostics
>  #ifndef HEADER
>  #define HEADER
>
> Modified: cfe/trunk/test/OpenMP/parallel_copyin_codegen.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_copyin_codegen.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/parallel_copyin_codegen.cpp (original)
> +++ cfe/trunk/test/OpenMP/parallel_copyin_codegen.cpp Tue May 19 23:24:19
> 2015
> @@ -1,9 +1,9 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -x c++ -triple
> %itanium_abi_triple -emit-llvm %s -o - | FileCheck %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c++ -std=c++11 -triple
> %itanium_abi_triple -emit-pch -o %t %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c++ -triple %itanium_abi_triple
> -std=c++11 -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -x c++ -std=c++11 -DLAMBDA
> -triple %itanium_abi_triple -emit-llvm %s -o - | FileCheck
> -check-prefix=LAMBDA %s
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -x c++ -fblocks -DBLOCKS
> -triple %itanium_abi_triple -emit-llvm %s -o - | FileCheck
> -check-prefix=BLOCKS %s
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -x c++ -std=c++11 -DARRAY
> -triple x86_64-apple-darwin10 -emit-llvm %s -o - | FileCheck
> -check-prefix=ARRAY %s
> +// RUN: %clang_cc1 -verify -fopenmp -x c++ -triple %itanium_abi_triple
> -emit-llvm %s -o - | FileCheck %s
> +// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple %itanium_abi_triple
> -emit-pch -o %t %s
> +// RUN: %clang_cc1 -fopenmp -x c++ -triple %itanium_abi_triple -std=c++11
> -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s
> +// RUN: %clang_cc1 -verify -fopenmp -x c++ -std=c++11 -DLAMBDA -triple
> %itanium_abi_triple -emit-llvm %s -o - | FileCheck -check-prefix=LAMBDA %s
> +// RUN: %clang_cc1 -verify -fopenmp -x c++ -fblocks -DBLOCKS -triple
> %itanium_abi_triple -emit-llvm %s -o - | FileCheck -check-prefix=BLOCKS %s
> +// RUN: %clang_cc1 -verify -fopenmp -x c++ -std=c++11 -DARRAY -triple
> x86_64-apple-darwin10 -emit-llvm %s -o - | FileCheck -check-prefix=ARRAY %s
>  // expected-no-diagnostics
>  #ifndef ARRAY
>  #ifndef HEADER
>
> Modified: cfe/trunk/test/OpenMP/parallel_copyin_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_copyin_messages.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/parallel_copyin_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/parallel_copyin_messages.cpp Tue May 19 23:24:19
> 2015
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -ferror-limit 100 -o - %s
> +// RUN: %clang_cc1 -verify -fopenmp -ferror-limit 100 -o - %s
>
>  void foo() {
>  }
>
> Modified: cfe/trunk/test/OpenMP/parallel_default_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_default_messages.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/parallel_default_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/parallel_default_messages.cpp Tue May 19
> 23:24:19 2015
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -ferror-limit 100 -o - %s
> +// RUN: %clang_cc1 -verify -fopenmp -ferror-limit 100 -o - %s
>
>  void foo();
>
>
> Modified: cfe/trunk/test/OpenMP/parallel_firstprivate_codegen.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_firstprivate_codegen.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/parallel_firstprivate_codegen.cpp (original)
> +++ cfe/trunk/test/OpenMP/parallel_firstprivate_codegen.cpp Tue May 19
> 23:24:19 2015
> @@ -1,9 +1,9 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -x c++ -triple
> %itanium_abi_triple -emit-llvm %s -o - | FileCheck %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c++ -std=c++11 -triple
> %itanium_abi_triple -emit-pch -o %t %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c++ -triple %itanium_abi_triple
> -std=c++11 -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -x c++ -std=c++11 -DLAMBDA
> -triple %itanium_abi_triple -emit-llvm %s -o - | FileCheck
> -check-prefix=LAMBDA %s
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -x c++ -fblocks -DBLOCKS
> -triple %itanium_abi_triple -emit-llvm %s -o - | FileCheck
> -check-prefix=BLOCKS %s
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -x c++ -std=c++11 -DARRAY
> -triple x86_64-apple-darwin10 -emit-llvm %s -o - | FileCheck
> -check-prefix=ARRAY %s
> +// RUN: %clang_cc1 -verify -fopenmp -x c++ -triple %itanium_abi_triple
> -emit-llvm %s -o - | FileCheck %s
> +// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple %itanium_abi_triple
> -emit-pch -o %t %s
> +// RUN: %clang_cc1 -fopenmp -x c++ -triple %itanium_abi_triple -std=c++11
> -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s
> +// RUN: %clang_cc1 -verify -fopenmp -x c++ -std=c++11 -DLAMBDA -triple
> %itanium_abi_triple -emit-llvm %s -o - | FileCheck -check-prefix=LAMBDA %s
> +// RUN: %clang_cc1 -verify -fopenmp -x c++ -fblocks -DBLOCKS -triple
> %itanium_abi_triple -emit-llvm %s -o - | FileCheck -check-prefix=BLOCKS %s
> +// RUN: %clang_cc1 -verify -fopenmp -x c++ -std=c++11 -DARRAY -triple
> x86_64-apple-darwin10 -emit-llvm %s -o - | FileCheck -check-prefix=ARRAY %s
>  // expected-no-diagnostics
>  #ifndef ARRAY
>  #ifndef HEADER
>
> Modified: cfe/trunk/test/OpenMP/parallel_firstprivate_messages.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_firstprivate_messages.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/parallel_firstprivate_messages.cpp (original)
> +++ cfe/trunk/test/OpenMP/parallel_firstprivate_messages.cpp Tue May 19
> 23:24:19 2015
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -ferror-limit 100 %s
> +// RUN: %clang_cc1 -verify -fopenmp -ferror-limit 100 %s
>
>  void foo() {
>  }
>
> Modified: cfe/trunk/test/OpenMP/parallel_for_ast_print.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_for_ast_print.cpp?rev=237769&r1=237768&r2=237769&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/OpenMP/parallel_for_ast_print.cpp (original)
> +++ cfe/trunk/test/OpenMP/parallel_for_ast_print.cpp Tue May 19 23:24:19
> 2015
> @@ -1,6 +1,6 @@
> -// RUN: %clang_cc1 -verify -fopenmp=libiomp5 -ast-print %s | FileCheck %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -x c++ -std=c++11 -emit-pch -o %t %s
> -// RUN: %clang_cc1 -fopenmp=libiomp5 -std=c++11 -include-pch %t
> -fsyntax-only -verify %s -ast-print | FileChe
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20150520/387d1509/attachment.html>


More information about the cfe-commits mailing list