This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch, master, updated. glibc-2.15-437-gca7b8af


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  ca7b8af5dbd23ecb9549228075327ae6d547d206 (commit)
       via  56965fd71c5484cab6f817851b0f89fcbe3243d3 (commit)
      from  1897ad44326bb7761dcda46132ae303f7288aba9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=ca7b8af5dbd23ecb9549228075327ae6d547d206

commit ca7b8af5dbd23ecb9549228075327ae6d547d206
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Mon Mar 19 13:34:44 2012 -0700

    Cast _Unwind_GetCFA return to _Unwind_Ptr first

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)))
 	{

http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=56965fd71c5484cab6f817851b0f89fcbe3243d3

commit 56965fd71c5484cab6f817851b0f89fcbe3243d3
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Mon Mar 19 13:33:20 2012 -0700

    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)

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                      |    5 +++++
 nptl/ChangeLog                 |    5 +++++
 nptl/unwind.c                  |    2 +-
 sysdeps/x86_64/jmpbuf-unwind.h |    4 +++-
 4 files changed, 14 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]