[libcxxabi] r243654 - Merging r243645:

[Daniel Sanders]

Author: dsanders
Date: Thu Jul 30 11:29:05 2015
New Revision: 243654

URL: http://llvm.org/viewvc/llvm-project?rev=243654&view=rev
Log:
Merging r243645:
------------------------------------------------------------------------
r243645 | dsanders | 2015-07-30 17:11:04 +0100 (Thu, 30 Jul 2015) | 11 lines

[libcxxabi][mips] Correct float_data::mangled_size for all ABI's.

Summary:
Patch by Nitesh Jain and Jaydeep Patil with a small revision to use ABIs rather
than Architecture Revisions (which currently imply particular ABIs).

Fixes test_demangle.pass.cpp (PR24149).

Subscribers: mclow.lists, jaydeep, nitesh.jain, hans, cfe-commits

Differential Revision: http://reviews.llvm.org/D11483
------------------------------------------------------------------------

Modified:
    libcxxabi/branches/release_37/src/cxa_demangle.cpp

Modified: libcxxabi/branches/release_37/src/cxa_demangle.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/branches/release_37/src/cxa_demangle.cpp?rev=243654&r1=243653&r2=243654&view=diff
==============================================================================
--- libcxxabi/branches/release_37/src/cxa_demangle.cpp (original)
+++ libcxxabi/branches/release_37/src/cxa_demangle.cpp Thu Jul 30 11:29:05 2015
@@ -156,7 +156,9 @@ constexpr const char* float_data<double>
 template <>
 struct float_data<long double>
 {
-#if defined(__arm__)
+#if defined(__mips__) && defined(__mips_n64)
+    static const size_t mangled_size = 32;
+#elif defined(__arm__) || defined(__mips__)
     static const size_t mangled_size = 16;
 #else
     static const size_t mangled_size = 20;  // May need to be adjusted to 16 or 24 on other platforms