diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2011-11-21 14:50:46 -0800 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2011-11-23 09:19:28 -0800 |
| commit | 73955886148e2258fec8217c8b10a89733cbe7ac (patch) | |
| tree | c348f499bda456f451619772d9d31bad9a8f306d | |
| parent | 9fc571856d55f38302784542be0ec9d6679e2696 (diff) | |
| download | glibc-73955886148e2258fec8217c8b10a89733cbe7ac.tar.gz glibc-73955886148e2258fec8217c8b10a89733cbe7ac.tar.xz glibc-73955886148e2258fec8217c8b10a89733cbe7ac.zip | |
Cast _Unwind_GetCFA return to _Unwind_Ptr first.
| -rw-r--r-- | ChangeLog.x32 | 5 | ||||
| -rw-r--r-- | sysdeps/x86_64/jmpbuf-unwind.h | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog.x32 b/ChangeLog.x32 index be2015dd34..23fc99f0e0 100644 --- a/ChangeLog.x32 +++ b/ChangeLog.x32 @@ -1,5 +1,10 @@ 2011-11-21 H.J. Lu <hongjiu.lu@intel.com> + * sysdeps/x86_64/jmpbuf-unwind.h (_JMPBUF_CFA_UNWINDS_ADJ): Cast + _Unwind_GetCFA return to _Unwind_Ptr first. + +2011-11-21 H.J. Lu <hongjiu.lu@intel.com> + * sysdeps/x86_64/bits/mathdef.h: Don't include <bits/wordsize.h>. Check __x86_64__ instead of __WORDSIZE. * sysdeps/x86_64/bits/setjmp.h: Likewise. diff --git a/sysdeps/x86_64/jmpbuf-unwind.h b/sysdeps/x86_64/jmpbuf-unwind.h index 299a4a8d14..ce31ea57f4 100644 --- a/sysdeps/x86_64/jmpbuf-unwind.h +++ b/sysdeps/x86_64/jmpbuf-unwind.h @@ -29,7 +29,9 @@ ((void *) (address) < (void *) demangle ((jmpbuf)[JB_RSP])) #define _JMPBUF_CFA_UNWINDS_ADJ(_jmpbuf, _context, _adj) \ - _JMPBUF_UNWINDS_ADJ (_jmpbuf, (void *) _Unwind_GetCFA (_context), _adj) + _JMPBUF_UNWINDS_ADJ (_jmpbuf, \ + (void *) (_Unwind_Ptr) _Unwind_GetCFA (_context), \ + _adj) static inline uintptr_t __attribute__ ((unused)) _jmpbuf_sp (__jmp_buf regs) |