diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2017-09-04 16:44:12 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2017-09-08 15:51:34 +0200 |
| commit | e00f2425996829632de5abff88bc1797558ce92e (patch) | |
| tree | eae9e3fa6942c533535a7ad704447f6a32c2a590 | |
| parent | 5554304f0dddf75dc27cc6250fc53355161fd16a (diff) | |
| download | glibc-e00f2425996829632de5abff88bc1797558ce92e.tar.gz glibc-e00f2425996829632de5abff88bc1797558ce92e.tar.xz glibc-e00f2425996829632de5abff88bc1797558ce92e.zip | |
Sync scratch_buffer with gnulib
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.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | include/scratch_buffer.h | 3 | ||||
| -rw-r--r-- | malloc/scratch_buffer_grow.c | 6 | ||||
| -rw-r--r-- | malloc/scratch_buffer_grow_preserve.c | 6 | ||||
| -rw-r--r-- | malloc/scratch_buffer_set_array_size.c | 6 |
5 files changed, 22 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 5f9bc6244f..c8d46e9954 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2017-09-08 Adhemerval Zanella <adhemerval.zanella@linaro.org> + * 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. + [BZ #866] [BZ #1062] * posix/Makefile (tests): Remove bug-glob1 and tst-glob_symlinks. diff --git a/include/scratch_buffer.h b/include/scratch_buffer.h index dd17a4a7e1..bb04662eb2 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 22bae506a1..d2df028654 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 18543ef85b..9268615311 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 8ab6d9d300..6fcc115340 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) |