diff options
| -rw-r--r-- | nptl/ChangeLog | 5 | ||||
| -rw-r--r-- | nptl/unwind.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 7c6005b413..2e81dfcc29 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,8 @@ +2012-03-19 H.J. Lu <hongjiu.lu@intel.com> + + * unwind.c (unwind_stop): Cast _Unwind_GetCFA return to + _Unwind_Ptr first. + 2012-03-16 David S. Miller <davem@davemloft.net> [BZ #13844] diff --git a/nptl/unwind.c b/nptl/unwind.c index 05710269c1..7ccb21382b 100644 --- a/nptl/unwind.c +++ b/nptl/unwind.c @@ -68,7 +68,7 @@ unwind_stop (int version, _Unwind_Action actions, registered with the old method which would be unwound by this step. */ struct _pthread_cleanup_buffer *oldp = buf->priv.data.cleanup; - void *cfa = (void *) _Unwind_GetCFA (context); + void *cfa = (void *) (_Unwind_Ptr) _Unwind_GetCFA (context); if (curp != oldp && (do_longjump || FRAME_LEFT (cfa, curp, adj))) { |