diff options
| author |   Daniel Sanders <daniel.sanders@imgtec.com> | 2015-07-30 16:29:05 +0000 |
|---|---|---|
| committer | Daniel Sanders <daniel.sanders@imgtec.com> | 2015-07-30 16:29:05 +0000 |
| commit | ca430b6e4266a00fb3592dd89be471c04e294fd0 (patch) | |
| tree | bdb7a078c3e5b19272cfe08a57a4ca3e3b464fc6 | |
| parent | Merging r243206: (diff) | |
| download | llvm-project-ca430b6e4266a00fb3592dd89be471c04e294fd0.tar.gz llvm-project-ca430b6e4266a00fb3592dd89be471c04e294fd0.tar.bz2 llvm-project-ca430b6e4266a00fb3592dd89be471c04e294fd0.zip | |
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
------------------------------------------------------------------------
llvm-svn: 243654
| -rw-r--r-- | libcxxabi/src/cxa_demangle.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libcxxabi/src/cxa_demangle.cpp b/libcxxabi/src/cxa_demangle.cpp index d80843e3eb1a..f2878f35e6d9 100644 --- a/libcxxabi/src/cxa_demangle.cpp +++ b/libcxxabi/src/cxa_demangle.cpp @@ -156,7 +156,9 @@ constexpr const char* float_data<double>::spec; 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 |