This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.19-580-gf5d71e1
- From: schwab at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 13 Jun 2014 21:37:56 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.19-580-gf5d71e1
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 f5d71e140d9a5adfc7f6c190032d6bdaa3c3a171 (commit)
via 03ed7738e7e4d58b35bb6d5ca04f90640549d181 (commit)
from b7aa8caacee9ec707835ee48d14ab46bfdbae4e9 (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://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=f5d71e140d9a5adfc7f6c190032d6bdaa3c3a171
commit f5d71e140d9a5adfc7f6c190032d6bdaa3c3a171
Author: Andreas Schwab <schwab@linux-m68k.org>
Date: Fri Jun 13 23:31:36 2014 +0200
m68k: avoid pointer to integer conversion warning
diff --git a/ChangeLog b/ChangeLog
index afc58cd..ff239f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-13 Andreas Schwab <schwab@linux-m68k.org>
+
+ * sysdeps/m68k/jmpbuf-unwind.h (_JMPBUF_UNWINDS, _jmpbuf_sp): Cast
+ __sp to uintptr_t.
+
2014-06-13 Andi Kleen <ak@linux.intel.com>
* sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S: Remove.
diff --git a/sysdeps/m68k/jmpbuf-unwind.h b/sysdeps/m68k/jmpbuf-unwind.h
index 8739abb..c0c62bc 100644
--- a/sysdeps/m68k/jmpbuf-unwind.h
+++ b/sysdeps/m68k/jmpbuf-unwind.h
@@ -23,7 +23,7 @@
/* Test if longjmp to JMPBUF would unwind the frame
containing a local variable at ADDRESS. */
#define _JMPBUF_UNWINDS(jmpbuf, address, demangle) \
- ((void *) (address) < (void *) demangle ((jmpbuf)->__sp))
+ ((void *) (address) < (void *) demangle ((uintptr_t) (jmpbuf)->__sp))
#define _JMPBUF_CFA_UNWINDS_ADJ(_jmpbuf, _context, _adj) \
_JMPBUF_UNWINDS_ADJ (_jmpbuf, (void *) _Unwind_GetCFA (_context), _adj)
@@ -31,7 +31,7 @@
static inline uintptr_t __attribute__ ((unused))
_jmpbuf_sp (__jmp_buf regs)
{
- uintptr_t sp = regs[0].__sp;
+ uintptr_t sp = (uintptr_t) regs[0].__sp;
#ifdef PTR_DEMANGLE
PTR_DEMANGLE (sp);
#endif
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=03ed7738e7e4d58b35bb6d5ca04f90640549d181
commit 03ed7738e7e4d58b35bb6d5ca04f90640549d181
Author: Andreas Schwab <schwab@linux-m68k.org>
Date: Fri Jun 13 23:29:50 2014 +0200
ChangeLog fix
diff --git a/ChangeLog b/ChangeLog
index 5960dff..afc58cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -79,7 +79,7 @@
2014-06-13 Meador Inge <meadori@codesourcery.com>
[BZ #16996]
- sysdeps/unix/sysv/linux/getsysstats.c (__get_nprocs): Ensure
+ * sysdeps/unix/sysv/linux/getsysstats.c (__get_nprocs): Ensure
that the cached result has been set before returning it.
2014-06-12 Roland McGrath <roland@hack.frob.com>
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 7 ++++++-
sysdeps/m68k/jmpbuf-unwind.h | 4 ++--
2 files changed, 8 insertions(+), 3 deletions(-)
hooks/post-receive
--
GNU C Library master sources