do not provide /usr/lib/locale

[platform/upstream/glibc.git] / include / alloca.h

diff --git a/include/alloca.h b/include/alloca.h
index b99c3d1..f741d25 100644 (file)
--- a/include/alloca.h
+++ b/include/alloca.h
@@ -20,9 +20,13 @@ libc_hidden_proto (__libc_alloca_cutoff)
 
 #include <allocalim.h>
 
+#ifndef stackinfo_alloca_round
+# define stackinfo_alloca_round(l) (((l) + 15) & -16)
+#endif
+
 #if _STACK_GROWS_DOWN
 # define extend_alloca(buf, len, newlen) \
-  (__typeof (buf)) ({ size_t __newlen = (newlen);                            \
+  (__typeof (buf)) ({ size_t __newlen = stackinfo_alloca_round (newlen);      \
                      char *__newbuf = __alloca (__newlen);                   \
                      if (__newbuf + __newlen == (char *) buf)                \
                        len += __newlen;                                      \
@@ -31,10 +35,10 @@ libc_hidden_proto (__libc_alloca_cutoff)
                      __newbuf; })
 #elif _STACK_GROWS_UP
 # define extend_alloca(buf, len, newlen) \
-  (__typeof (buf)) ({ size_t __newlen = (newlen);                            \
+  (__typeof (buf)) ({ size_t __newlen = stackinfo_alloca_round (newlen);      \
                      char *__newbuf = __alloca (__newlen);                   \
                      char *__buf = (buf);                                    \
-                     if (__buf + __newlen == __newbuf)                       \
+                     if (__buf + len == __newbuf)                            \
                        {                                                     \
                          len += __newlen;                                    \
                          __newbuf = __buf;                                   \
@@ -49,15 +53,24 @@ libc_hidden_proto (__libc_alloca_cutoff)
 
 #if defined stackinfo_get_sp && defined stackinfo_sub_sp
 # define alloca_account(size, avar) \
-  ({ void *old__ = stackinfo_get_sp ();                        \
-     void *m__ = __alloca (size);                      \
-     avar += stackinfo_sub_sp (old__);                 \
+  ({ void *old__ = stackinfo_get_sp ();                                              \
+     void *m__ = __alloca (size);                                            \
+     avar += stackinfo_sub_sp (old__);                                       \
+     m__; })
+# define extend_alloca_account(buf, len, newlen, avar) \
+  ({ void *old__ = stackinfo_get_sp ();                                              \
+     void *m__ = extend_alloca (buf, len, newlen);                           \
+     avar += stackinfo_sub_sp (old__);                                       \
      m__; })
 #else
 # define alloca_account(size, avar) \
-  ({ size_t s__ = (size);                  \
-     avar += s__;                          \
+  ({ size_t s__ = (size);                                                    \
+     avar += s__;                                                            \
      __alloca (s__); })
+# define extend_alloca_account(buf, len, newlen, avar) \
+  ({ size_t s__ = (newlen);                                                  \
+     avar += s__;                                                            \
+     extend_alloca (buf, len, s__); })
 #endif
 
 #endif