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.21-114-gba7d2c5
- From: vapier at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 24 Feb 2015 18:30:04 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.21-114-gba7d2c5
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 ba7d2c543f7d69883ece7eab39bf6c5cd5dc3081 (commit)
from 9438b237abca11de201dd10483717299eafb1f0b (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=ba7d2c543f7d69883ece7eab39bf6c5cd5dc3081
commit ba7d2c543f7d69883ece7eab39bf6c5cd5dc3081
Author: Mike Frysinger <vapier@gentoo.org>
Date: Tue Feb 24 00:15:41 2015 -0500
alloca: fix buf interaction
The stack-grows-down case is missing paren around the buf cast.
The stack-grows-up case is missing a cast with the buf assignment.
This leads to build failures due to -Werror:
vfprintf.c: In function '_IO_vfprintf_internal':
vfprintf.c:1738:16: error: initialization from incompatible pointer type [-Werror]
diff --git a/ChangeLog b/ChangeLog
index 8ae6cf1..b8da862 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-24 Mike Frysinger <vapier@gentoo.org>
+
+ * include/alloca.h [_STACK_GROWS_DOWN] (extend_alloca): Add
+ parenthesis around the buf assignment.
+ [_STACK_GROWS_UP] (extend_alloca): Add a char* cast.
+
2015-02-24 Joseph Myers <joseph@codesourcery.com>
[BZ #16783]
diff --git a/include/alloca.h b/include/alloca.h
index f741d25..0150025 100644
--- a/include/alloca.h
+++ b/include/alloca.h
@@ -28,7 +28,7 @@ libc_hidden_proto (__libc_alloca_cutoff)
# define extend_alloca(buf, len, newlen) \
(__typeof (buf)) ({ size_t __newlen = stackinfo_alloca_round (newlen); \
char *__newbuf = __alloca (__newlen); \
- if (__newbuf + __newlen == (char *) buf) \
+ if (__newbuf + __newlen == (char *) (buf)) \
len += __newlen; \
else \
len = __newlen; \
@@ -37,7 +37,7 @@ libc_hidden_proto (__libc_alloca_cutoff)
# define extend_alloca(buf, len, newlen) \
(__typeof (buf)) ({ size_t __newlen = stackinfo_alloca_round (newlen); \
char *__newbuf = __alloca (__newlen); \
- char *__buf = (buf); \
+ char *__buf = (char *) (buf); \
if (__buf + len == __newbuf) \
{ \
len += __newlen; \
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
include/alloca.h | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources