[llvm-branch-commits] [cfe-branch] r291951 - Merging r291881:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Fri Jan 13 13:37:35 2017
New Revision: 291951

URL: http://llvm.org/viewvc/llvm-project?rev=291951&view=rev
Log:
Merging r291881:
------------------------------------------------------------------------
r291881 | chandlerc | 2017-01-12 18:47:34 -0800 (Thu, 12 Jan 2017) | 3 lines

Another fix for r291850 because there are apparently targets which add
"-mllvm" flags to the CC1 invocation (notably, Hexagon seems to hit
this).
------------------------------------------------------------------------

Modified:
    cfe/branches/release_40/   (props changed)
    cfe/branches/release_40/test/Driver/disable-llvm.c

Propchange: cfe/branches/release_40/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 13 13:37:35 2017
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:291850,291853,291865,291871,291877,291907
+/cfe/trunk:291850,291853,291865,291871,291877,291881,291907
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_40/test/Driver/disable-llvm.c
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_40/test/Driver/disable-llvm.c?rev=291951&r1=291950&r2=291951&view=diff
==============================================================================
--- cfe/branches/release_40/test/Driver/disable-llvm.c (original)
+++ cfe/branches/release_40/test/Driver/disable-llvm.c Fri Jan 13 13:37:35 2017
@@ -2,8 +2,8 @@
 // RUN: %clang -O2 -Xclang -disable-llvm-passes -### %s 2>&1 \
 // RUN:     | FileCheck --check-prefix=DISABLED %s
 // DISABLED: -cc1
-// DISABLED-NOT: -mllvm
-// DISABLED: -disable-llvm-passes
+// DISABLED-NOT: "-mllvm" "-disable-llvm-passes"
+// DISABLED: "-disable-llvm-passes"
 //
 // We also support two alternative spellings for historical reasons.
 // RUN: %clang -O2 -Xclang -disable-llvm-optzns -### %s 2>&1 \
@@ -11,8 +11,8 @@
 // RUN: %clang -O2 -mllvm -disable-llvm-optzns -### %s 2>&1 \
 // RUN:     | FileCheck --check-prefix=DISABLED-LEGACY %s
 // DISABLED-LEGACY: -cc1
-// DISABLED-LEGACY-NOT: -mllvm
-// DISABLED-LEGACY: -disable-llvm-optzns
+// DISABLED-LEGACY-NOT: "-mllvm" "-disable-llvm-optzns"
+// DISABLED-LEGACY: "-disable-llvm-optzns"
 //
 // The main flag shouldn't be specially handled when used with '-mllvm'.
 // RUN: %clang -O2 -mllvm -disable-llvm-passes -### %s 2>&1 | FileCheck --check-prefix=MLLVM %s