aboutsummaryrefslogtreecommitdiff
path: root/nptl
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2012-03-19 13:34:44 -0700
committerH.J. Lu <hjl.tools@gmail.com>2012-03-19 13:34:44 -0700
commitca7b8af5dbd23ecb9549228075327ae6d547d206 (patch)
treee0fc877ae0fff7c3e0d65b09a4b38cbeda3ca11e /nptl
parent56965fd71c5484cab6f817851b0f89fcbe3243d3 (diff)
downloadglibc-ca7b8af5dbd23ecb9549228075327ae6d547d206.zip
glibc-ca7b8af5dbd23ecb9549228075327ae6d547d206.tar.gz
glibc-ca7b8af5dbd23ecb9549228075327ae6d547d206.tar.bz2
Cast _Unwind_GetCFA return to _Unwind_Ptr first
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog5
-rw-r--r--nptl/unwind.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 7c6005b..2e81dfc 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 0571026..7ccb213 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)))
{