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