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.
This commit is contained in:
parent
5554304f0d
commit
e00f242599
|
@ -1,5 +1,11 @@
|
||||||
2017-09-08 Adhemerval Zanella <adhemerval.zanella@linaro.org>
|
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 #866]
|
||||||
[BZ #1062]
|
[BZ #1062]
|
||||||
* posix/Makefile (tests): Remove bug-glob1 and tst-glob_symlinks.
|
* posix/Makefile (tests): Remove bug-glob1 and tst-glob_symlinks.
|
||||||
|
|
|
@ -66,8 +66,7 @@
|
||||||
struct scratch_buffer {
|
struct scratch_buffer {
|
||||||
void *data; /* Pointer to the beginning of the scratch area. */
|
void *data; /* Pointer to the beginning of the scratch area. */
|
||||||
size_t length; /* Allocated space at the data pointer, in bytes. */
|
size_t length; /* Allocated space at the data pointer, in bytes. */
|
||||||
char __space[1024]
|
max_align_t __space[(1023 + sizeof (max_align_t)) / sizeof (max_align_t)];
|
||||||
__attribute__ ((aligned (__alignof__ (max_align_t))));
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Initializes *BUFFER so that BUFFER->data points to BUFFER->__space
|
/* Initializes *BUFFER so that BUFFER->data points to BUFFER->__space
|
||||||
|
|
|
@ -16,6 +16,10 @@
|
||||||
License along with the GNU C Library; if not, see
|
License along with the GNU C Library; if not, see
|
||||||
<http://www.gnu.org/licenses/>. */
|
<http://www.gnu.org/licenses/>. */
|
||||||
|
|
||||||
|
#ifndef _LIBC
|
||||||
|
# include <libc-config.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <scratch_buffer.h>
|
#include <scratch_buffer.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
|
||||||
|
@ -49,4 +53,4 @@ __libc_scratch_buffer_grow (struct scratch_buffer *buffer)
|
||||||
buffer->length = new_length;
|
buffer->length = new_length;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
libc_hidden_def (__libc_scratch_buffer_grow);
|
libc_hidden_def (__libc_scratch_buffer_grow)
|
||||||
|
|
|
@ -16,6 +16,10 @@
|
||||||
License along with the GNU C Library; if not, see
|
License along with the GNU C Library; if not, see
|
||||||
<http://www.gnu.org/licenses/>. */
|
<http://www.gnu.org/licenses/>. */
|
||||||
|
|
||||||
|
#ifndef _LIBC
|
||||||
|
# include <libc-config.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <scratch_buffer.h>
|
#include <scratch_buffer.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
@ -60,4 +64,4 @@ __libc_scratch_buffer_grow_preserve (struct scratch_buffer *buffer)
|
||||||
buffer->length = new_length;
|
buffer->length = new_length;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
libc_hidden_def (__libc_scratch_buffer_grow_preserve);
|
libc_hidden_def (__libc_scratch_buffer_grow_preserve)
|
||||||
|
|
|
@ -16,6 +16,10 @@
|
||||||
License along with the GNU C Library; if not, see
|
License along with the GNU C Library; if not, see
|
||||||
<http://www.gnu.org/licenses/>. */
|
<http://www.gnu.org/licenses/>. */
|
||||||
|
|
||||||
|
#ifndef _LIBC
|
||||||
|
# include <libc-config.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <scratch_buffer.h>
|
#include <scratch_buffer.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
|
@ -57,4 +61,4 @@ __libc_scratch_buffer_set_array_size (struct scratch_buffer *buffer,
|
||||||
buffer->length = new_length;
|
buffer->length = new_length;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
libc_hidden_def (__libc_scratch_buffer_set_array_size);
|
libc_hidden_def (__libc_scratch_buffer_set_array_size)
|
||||||
|
|
Loading…
Reference in New Issue