public inbox for libc-alpha@sourceware.org
 help / color / mirror / Atom feed
From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org
Cc: Paul Eggert <eggert@cs.ucla.edu>
Subject: [PATCH 4/9] Sync scratch_buffer with gnulib
Date: Tue, 05 Sep 2017 20:25:00 -0000	[thread overview]
Message-ID: <1504643122-14874-5-git-send-email-adhemerval.zanella@linaro.org> (raw)
In-Reply-To: <1504643122-14874-1-git-send-email-adhemerval.zanella@linaro.org>

This patch syncs the scratch_buffer grom gnulib commit 3866ef6 with
GLIBC code.

Checked on x86_64-linux-gnu and on a build using build-many-glibcs.py
for all major architectures.

	* include/scratch_buffer.h (scratch_buffer): Use a C99 align method
	instead of GCC extension.
	* malloc/scratch_buffer_grow.c [!_LIBC]: Include libc-config.h.
	* malloc/scratch_buffer_grow_preserve.c [!_LIBC]: Likewise.
	* malloc/scratch_buffer_set_array_size.c [!_LIBC]: Likewise.
---
 ChangeLog                              | 6 ++++++
 include/scratch_buffer.h               | 3 +--
 malloc/scratch_buffer_grow.c           | 6 +++++-
 malloc/scratch_buffer_grow_preserve.c  | 6 +++++-
 malloc/scratch_buffer_set_array_size.c | 6 +++++-
 5 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/include/scratch_buffer.h b/include/scratch_buffer.h
index dd17a4a..bb04662 100644
--- a/include/scratch_buffer.h
+++ b/include/scratch_buffer.h
@@ -66,8 +66,7 @@
 struct scratch_buffer {
   void *data;    /* Pointer to the beginning of the scratch area.  */
   size_t length; /* Allocated space at the data pointer, in bytes.  */
-  char __space[1024]
-    __attribute__ ((aligned (__alignof__ (max_align_t))));
+  max_align_t __space[(1023 + sizeof (max_align_t)) / sizeof (max_align_t)];
 };
 
 /* Initializes *BUFFER so that BUFFER->data points to BUFFER->__space
diff --git a/malloc/scratch_buffer_grow.c b/malloc/scratch_buffer_grow.c
index 22bae50..d2df028 100644
--- a/malloc/scratch_buffer_grow.c
+++ b/malloc/scratch_buffer_grow.c
@@ -16,6 +16,10 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+#ifndef _LIBC
+# include <libc-config.h>
+#endif
+
 #include <scratch_buffer.h>
 #include <errno.h>
 
@@ -49,4 +53,4 @@ __libc_scratch_buffer_grow (struct scratch_buffer *buffer)
   buffer->length = new_length;
   return true;
 }
-libc_hidden_def (__libc_scratch_buffer_grow);
+libc_hidden_def (__libc_scratch_buffer_grow)
diff --git a/malloc/scratch_buffer_grow_preserve.c b/malloc/scratch_buffer_grow_preserve.c
index 18543ef..9268615 100644
--- a/malloc/scratch_buffer_grow_preserve.c
+++ b/malloc/scratch_buffer_grow_preserve.c
@@ -16,6 +16,10 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+#ifndef _LIBC
+# include <libc-config.h>
+#endif
+
 #include <scratch_buffer.h>
 #include <errno.h>
 #include <string.h>
@@ -60,4 +64,4 @@ __libc_scratch_buffer_grow_preserve (struct scratch_buffer *buffer)
   buffer->length = new_length;
   return true;
 }
-libc_hidden_def (__libc_scratch_buffer_grow_preserve);
+libc_hidden_def (__libc_scratch_buffer_grow_preserve)
diff --git a/malloc/scratch_buffer_set_array_size.c b/malloc/scratch_buffer_set_array_size.c
index 8ab6d9d..6fcc115 100644
--- a/malloc/scratch_buffer_set_array_size.c
+++ b/malloc/scratch_buffer_set_array_size.c
@@ -16,6 +16,10 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+#ifndef _LIBC
+# include <libc-config.h>
+#endif
+
 #include <scratch_buffer.h>
 #include <errno.h>
 #include <limits.h>
@@ -57,4 +61,4 @@ __libc_scratch_buffer_set_array_size (struct scratch_buffer *buffer,
   buffer->length = new_length;
   return true;
 }
-libc_hidden_def (__libc_scratch_buffer_set_array_size);
+libc_hidden_def (__libc_scratch_buffer_set_array_size)
-- 
2.7.4

  parent reply	other threads:[~2017-09-05 20:25 UTC|newest]

Thread overview: 62+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-05 20:25 [PATCH 0/9] posix: glob fixes and refactor Adhemerval Zanella
2017-09-05 20:25 ` [PATCH 9/9] posix: Fix glob with GLOB_NOCHECK returning modified patterns (BZ#10246) Adhemerval Zanella
2017-09-07 22:14   ` Paul Eggert
2017-09-08  9:16     ` Adhemerval Zanella
2017-09-05 20:25 ` [PATCH 3/9] posix: Allow glob to match dangling symlinks [BZ #866] Adhemerval Zanella
2017-09-06  1:27   ` Paul Eggert
2017-09-06 12:57     ` Adhemerval Zanella
2017-09-09  9:50   ` Andreas Schwab
2017-09-09 11:56     ` Adhemerval Zanella
2017-09-09 17:02       ` Paul Eggert
2017-09-09 17:11         ` Zack Weinberg
2017-09-09 17:26           ` Andreas Schwab
2017-09-09 17:33             ` Zack Weinberg
2017-09-10  8:19         ` Adhemerval Zanella
2017-09-10 17:13           ` Paul Eggert
2017-09-11 14:34           ` Joseph Myers
2017-09-11 14:38             ` Zack Weinberg
2017-09-11 16:53               ` Paul Eggert
2017-09-11 17:25                 ` Zack Weinberg
2017-09-11 17:38                   ` Paul Eggert
2017-09-11 17:56                     ` Zack Weinberg
2017-09-11 18:03                       ` Paul Eggert
2017-09-11 20:09                         ` Adhemerval Zanella
2017-09-13  9:14                           ` Paul Eggert
2017-09-13 12:22                             ` Adhemerval Zanella
2017-09-14 10:05                               ` Szabolcs Nagy
2017-09-14 13:43                                 ` Adhemerval Zanella
2017-09-15 20:18                             ` Florian Weimer
2017-09-15 20:27                               ` Adhemerval Zanella
2017-09-17  7:16                               ` Paul Eggert
2017-09-17  7:48                                 ` Florian Weimer
2017-09-17 14:18                                   ` Adhemerval Zanella
2017-09-05 20:25 ` [PATCH 6/9] posix: fix glob bugs with long login names Adhemerval Zanella
2017-09-05 20:25 ` [PATCH 8/9] posix: Use enum for __glob_pattern_type result Adhemerval Zanella
2017-09-06  1:30   ` Paul Eggert
2017-09-06  4:18   ` Paul Eggert
2017-09-06 13:04     ` Adhemerval Zanella
2017-09-06 16:18       ` Paul Eggert
2017-09-06 16:54         ` Adhemerval Zanella
2017-09-05 20:25 ` [PATCH 5/9] posix: Fix getpwnam_r usage (BZ #1062) Adhemerval Zanella
2017-09-05 20:25 ` [PATCH 7/9] posix: Consolidate glob implementation Adhemerval Zanella
2017-09-12  7:35   ` Andreas Schwab
2017-09-12 14:08     ` Adhemerval Zanella
2017-09-12 14:17       ` Andreas Schwab
2017-09-12 14:29     ` Joseph Myers
2017-09-12 14:39       ` Andreas Schwab
2017-09-12 14:50         ` Joseph Myers
2017-09-12 12:56   ` Andreas Schwab
2017-09-12 14:22     ` Adhemerval Zanella
2017-09-12 14:34       ` Andreas Schwab
2017-09-13 12:26         ` Adhemerval Zanella
2017-09-05 20:25 ` [PATCH 2/9] posix: accept inode 0 is a valid inode number (BZ #19971) Adhemerval Zanella
2017-09-05 20:25 ` Adhemerval Zanella [this message]
2017-09-18  6:09   ` [PATCH 4/9] Sync scratch_buffer with gnulib Florian Weimer
2017-09-18 11:43     ` Adhemerval Zanella
2017-09-18 11:57       ` Florian Weimer
2017-09-18 12:25         ` Adhemerval Zanella
2017-09-05 20:25 ` [PATCH 1/9] posix: Sync glob with gnulib [BZ #1062] Adhemerval Zanella
2017-09-06  2:01   ` Paul Eggert
2017-09-06 12:52     ` Adhemerval Zanella
2017-09-12 14:20   ` Andreas Schwab
2017-09-12 17:06     ` Adhemerval Zanella

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1504643122-14874-5-git-send-email-adhemerval.zanella@linaro.org \
    --to=adhemerval.zanella@linaro.org \
    --cc=eggert@cs.ucla.edu \
    --cc=libc-alpha@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).