From: H.J. Lu <hjl.tools@gmail.com>
Date: Mon, 19 Mar 2012 20:33:20 +0000 (-0700)
Subject: Cast _Unwind_GetCFA return to _Unwind_Ptr first
X-Git-Tag: glibc-2.16-tps~758
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=56965fd71c5484cab6f817851b0f89fcbe3243d3;p=platform%2Fupstream%2Fglibc.git

Cast _Unwind_GetCFA return to _Unwind_Ptr first
---

diff --git a/ChangeLog b/ChangeLog
index e806afc..66782ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-19  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.
+
 2012-03-19  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #13629]
diff --git a/sysdeps/x86_64/jmpbuf-unwind.h b/sysdeps/x86_64/jmpbuf-unwind.h
index 646615d..890037e 100644
--- a/sysdeps/x86_64/jmpbuf-unwind.h
+++ b/sysdeps/x86_64/jmpbuf-unwind.h
@@ -28,7 +28,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)