diff options
| author | Asiri Rathnayake <asiri.rathnayake@arm.com> | 2016-05-26 21:45:54 +0000 |
|---|---|---|
| committer | Asiri Rathnayake <asiri.rathnayake@arm.com> | 2016-05-26 21:45:54 +0000 |
| commit | c6a4ab0ce3bb3d4cb3533d3581d8ae6abb230494 (patch) | |
| tree | 045622ae06e816a5241200e4d618cee03a9291e2 /libunwind/src/UnwindCursor.hpp | |
| parent | 1ecdedad8d839f5522aabbbdf6dd17541f9cf501 (diff) | |
| download | bcm5719-llvm-c6a4ab0ce3bb3d4cb3533d3581d8ae6abb230494.tar.gz bcm5719-llvm-c6a4ab0ce3bb3d4cb3533d3581d8ae6abb230494.zip | |
Fix gcc libunwind build.
r270692 seems to have broken gcc builds of libunwind. This is because
statements like:
static_assert(check_fit<Registers_or1k, unw_context_t>::does_fit,
"or1k registers do not fit into unw_context_t");
Do not work when static_assert is a macro taking two parameters, the
extra comma separating the template parameters confuses the pre-processor.
The fix is to change those statements to:
static_assert((check_fit<Registers_or1k, unw_context_t>::does_fit),
"or1k registers do not fit into unw_context_t");
Also fixed a gcc warning about a trivial un-intended narrowing.
Differential revision: http://reviews.llvm.org/D20119
llvm-svn: 270925
Diffstat (limited to 'libunwind/src/UnwindCursor.hpp')
| -rw-r--r-- | libunwind/src/UnwindCursor.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libunwind/src/UnwindCursor.hpp b/libunwind/src/UnwindCursor.hpp index 661ef4a264c..18a780919b1 100644 --- a/libunwind/src/UnwindCursor.hpp +++ b/libunwind/src/UnwindCursor.hpp @@ -603,7 +603,7 @@ template <typename A, typename R> UnwindCursor<A, R>::UnwindCursor(unw_context_t *context, A &as) : _addressSpace(as), _registers(context), _unwindInfoMissing(false), _isSignalFrame(false) { - static_assert(check_fit<UnwindCursor<A, R>, unw_cursor_t>::does_fit, + static_assert((check_fit<UnwindCursor<A, R>, unw_cursor_t>::does_fit), "UnwindCursor<> does not fit in unw_cursor_t"); memset(&_info, 0, sizeof(_info)); } |
