Skip to content

Commit

Permalink
Merging r243645:
Browse files Browse the repository at this point in the history
------------------------------------------------------------------------
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
  • Loading branch information
dsandersllvm committed Jul 30, 2015
1 parent 896c94f commit ca430b6
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion libcxxabi/src/cxa_demangle.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ca430b6

Please sign in to comment.