[llvm-branch-commits] [llvm-branch] r235884 - Merging r228403:

[Daniel Sanders]

Author: dsanders
Date: Mon Apr 27 09:41:51 2015
New Revision: 235884

URL: http://llvm.org/viewvc/llvm-project?rev=235884&view=rev
Log:
Merging r228403:
------------------------------------------------------------------------
r228403 | dsanders | 2015-02-06 16:37:30 +0000 (Fri, 06 Feb 2015) | 2 lines

[mips] Fix FileCheck prefixes with whitespace between 'CHECK' and ':'

------------------------------------------------------------------------

Modified:
    llvm/branches/release_36/   (props changed)
    llvm/branches/release_36/test/MC/Mips/mips64r2/abi-bad.s

Propchange: llvm/branches/release_36/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 09:41:51 2015
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,226023,226029,226044,226046,226048,226058,226075,226151,226164-226166,226170-226171,226182,226407-226409,226473,226588,226616,226652,226664,226708,226711,226755,226791,226808-226809,226905,227005,227084-227085,227087,227089,227250,227260-227261,227269,227290,227294,227299,227319,227339,227430,227491,227584,227603,227628,227670,227809,227815,227903,227934,227972,227983,228049,228129,228168,228331,228411,228444,228490,228500,228507,228518,228525,228565,228656,228760-228761,228793,228842,228899,228957,228969,228979,229029,229343,229351-229352,229421,229495,229529,229675,229731,229911,230058,230235,230657,230742,230748,231219,231227,231563,231601,232046,232085,232189,232382,233904
+/llvm/trunk:155241,226023,226029,226044,226046,226048,226058,226075,226151,226164-226166,226170-226171,226182,226407-226409,226473,226588,226616,226652,226664,226708,226711,226755,226791,226808-226809,226905,227005,227084-227085,227087,227089,227250,227260-227261,227269,227290,227294,227299,227319,227339,227430,227491,227584,227603,227628,227670,227809,227815,227903,227934,227972,227983,228049,228129,228168,228331,228403,228411,228444,228490,228500,228507,228518,228525,228565,228656,228760-228761,228793,228842,228899,228957,228969,228979,229029,229343,229351-229352,229421,229495,229529,229675,229731,229911,230058,230235,230657,230742,230748,231219,231227,231563,231601,232046,232085,232189,232382,233904

Modified: llvm/branches/release_36/test/MC/Mips/mips64r2/abi-bad.s
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_36/test/MC/Mips/mips64r2/abi-bad.s?rev=235884&r1=235883&r2=235884&view=diff
==============================================================================
--- llvm/branches/release_36/test/MC/Mips/mips64r2/abi-bad.s (original)
+++ llvm/branches/release_36/test/MC/Mips/mips64r2/abi-bad.s Mon Apr 27 09:41:51 2015
@@ -1,9 +1,5 @@
-# RUN: not llvm-mc %s -triple mips-unknown-unknown -mcpu=mips64r2 2>&1 | FileCheck %s
-# CHECK: .text
-
-
-
+# RUN: not llvm-mc %s -triple mips-unknown-linux -mcpu=mips64r2 2>&1 | FileCheck %s
         .set fp=xx
-# CHECK     : error: 'set fp=xx'option requires O32 ABI
-# CHECK     : .set fp=xx
-# CHECK     :          ^
+# CHECK: error: '.set fp=xx' requires the O32 ABI
+# CHECK: .set fp=xx
+# CHECK:          ^