Author: aurel32
Date: 2015-09-13 18:10:31 +0000 (Sun, 13 Sep 2015)
New Revision: 6577

Added:
   glibc-package/branches/glibc-2.21/debian/patches/hppa/cvs-alloca-werror.diff
Modified:
   glibc-package/branches/glibc-2.21/debian/changelog
   glibc-package/branches/glibc-2.21/debian/patches/series
Log:
patches/hppa/cvs-alloca-werror.diff: new patch from upstream to fix a
build failure.

Modified: glibc-package/branches/glibc-2.21/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.21/debian/changelog  2015-09-13 17:54:35 UTC 
(rev 6576)
+++ glibc-package/branches/glibc-2.21/debian/changelog  2015-09-13 18:10:31 UTC 
(rev 6577)
@@ -56,6 +56,8 @@
     installed. They are still tested when calling the build-arch or
     binary-arch targets, but not anymore when calling the build-indep or
     binary-indep targets.    
+  * patches/hppa/cvs-alloca-werror.diff: new patch from upstream to fix a
+    build failure.
 
   [ Steven Chamberlain ]
   * sysdeps/kfreebsd.mk: find kfreebsd-kernel-headers in multiarch path.

Added: 
glibc-package/branches/glibc-2.21/debian/patches/hppa/cvs-alloca-werror.diff
===================================================================
--- 
glibc-package/branches/glibc-2.21/debian/patches/hppa/cvs-alloca-werror.diff    
                            (rev 0)
+++ 
glibc-package/branches/glibc-2.21/debian/patches/hppa/cvs-alloca-werror.diff    
    2015-09-13 18:10:31 UTC (rev 6577)
@@ -0,0 +1,26 @@
+2015-02-24  Mike Frysinger  <[email protected]>
+
+       * include/alloca.h [_STACK_GROWS_DOWN] (extend_alloca): Add
+       parenthesis around the buf assignment.
+       [_STACK_GROWS_UP] (extend_alloca): Add a char* cast.
+
+--- 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;                                    \

Modified: glibc-package/branches/glibc-2.21/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.21/debian/patches/series     2015-09-13 
17:54:35 UTC (rev 6576)
+++ glibc-package/branches/glibc-2.21/debian/patches/series     2015-09-13 
18:10:31 UTC (rev 6577)
@@ -67,6 +67,7 @@
 hppa/local-fptr-table-size.diff
 hppa/local-setcontext.diff
 hppa/cvs-start.diff
+hppa/cvs-alloca-werror.diff
 
 hurd-i386/local-enable-ldconfig.diff
 hurd-i386/tg-context_functions.diff

Reply via email to