[llvm-branch-commits] [cfe-branch] r235842 - Merging r230253:

[Daniel Sanders]

Author: dsanders
Date: Mon Apr 27 03:14:57 2015
New Revision: 235842

URL: http://llvm.org/viewvc/llvm-project?rev=235842&view=rev
Log:
Merging r230253:
------------------------------------------------------------------------
r230253 | zjovanovic | 2015-02-23 20:20:49 +0000 (Mon, 23 Feb 2015) | 2 lines

Fixed typo.

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

Modified:
    cfe/branches/release_36/   (props changed)
    cfe/branches/release_36/lib/Basic/TargetInfo.cpp

Propchange: cfe/branches/release_36/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 27 03:14:57 2015
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:226008,226049,226136,226282,226382,226384,226624,226707,226754,226863,226877,227062,227088,227220,227251,227278,227295,227368,227393,227861,227979,228053,228464,228785,228792,228918,229408,229680,229719,230255,230469,231245,231280,231986,232389,233819,234629,234636
+/cfe/trunk:226008,226049,226136,226282,226382,226384,226624,226707,226754,226863,226877,227062,227088,227220,227251,227278,227295,227368,227393,227861,227979,228053,228464,228785,228792,228918,229408,229680,229719,230253,230255,230469,231245,231280,231986,232389,233819,234629,234636
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_36/lib/Basic/TargetInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_36/lib/Basic/TargetInfo.cpp?rev=235842&r1=235841&r2=235842&view=diff
==============================================================================
--- cfe/branches/release_36/lib/Basic/TargetInfo.cpp (original)
+++ cfe/branches/release_36/lib/Basic/TargetInfo.cpp Mon Apr 27 03:14:57 2015
@@ -655,7 +655,7 @@ bool TargetCXXABI::tryParse(llvm::String
     .Case("ios", iOS)
     .Case("itanium", GenericItanium)
     .Case("microsoft", Microsoft)
-    .Case("arm", GenericMIPS)
+    .Case("mips", GenericMIPS)
     .Default(unknown);
   if (kind == unknown) return false;