diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | posix/Makefile | 2 | ||||
| -rw-r--r-- | posix/bits/posix1_lim.h | 10 | ||||
| -rw-r--r-- | posix/test-ssize-max.c | 39 |
4 files changed, 56 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index ca14746ce6..15e5f2ae7f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2018-02-06 Joseph Myers <joseph@codesourcery.com> + [BZ #13575] + * posix/bits/posix1_lim.h: Include <bits/wordsize.h>. + [!SSIZE_MAX && !(__WORDSIZE == 64 || __WORDSIZE32_SIZE_ULONG)] + (SSIZE_MAX): Define to INT_MAX. + * posix/test-ssize-max.c: New file. + * posix/Makefile (tests): Add test-ssize-max. + [BZ #19668] * sysdeps/powerpc/fpu/tst-setcontext-fpscr.c: Include <support/support.h>. Do not include <malloc.h>. diff --git a/posix/Makefile b/posix/Makefile index 83b3d7418c..51dcf129ec 100644 --- a/posix/Makefile +++ b/posix/Makefile @@ -95,7 +95,7 @@ tests := test-errno tstgetopt testfnm runtests runptests \ tst-posix_spawn-fd tst-posix_spawn-setsid \ tst-posix_fadvise tst-posix_fadvise64 \ tst-sysconf-empty-chroot tst-glob_symlinks tst-fexecve \ - tst-glob-tilde + tst-glob-tilde test-ssize-max tests-internal := bug-regex5 bug-regex20 bug-regex33 \ tst-rfc3484 tst-rfc3484-2 tst-rfc3484-3 \ tst-glob_lstat_compat diff --git a/posix/bits/posix1_lim.h b/posix/bits/posix1_lim.h index 90066ffae3..18ac47fb2b 100644 --- a/posix/bits/posix1_lim.h +++ b/posix/bits/posix1_lim.h @@ -24,6 +24,7 @@ #ifndef _BITS_POSIX1_LIM_H #define _BITS_POSIX1_LIM_H 1 +#include <bits/wordsize.h> /* These are the standard-mandated minimum values. */ @@ -161,7 +162,14 @@ #ifndef SSIZE_MAX -# define SSIZE_MAX LONG_MAX +/* ssize_t is not formally required to be the signed type + corresponding to size_t, but it is for all configurations supported + by glibc. */ +# if __WORDSIZE == 64 || __WORDSIZE32_SIZE_ULONG +# define SSIZE_MAX LONG_MAX +# else +# define SSIZE_MAX INT_MAX +# endif #endif diff --git a/posix/test-ssize-max.c b/posix/test-ssize-max.c new file mode 100644 index 0000000000..7cfd090aef --- /dev/null +++ b/posix/test-ssize-max.c @@ -0,0 +1,39 @@ +/* Test SSIZE_MAX value and type. + Copyright (C) 2018 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#include <limits.h> +#include <sys/types.h> + +/* Test SSIZE_MAX has type ssize_t. */ +ssize_t x; +extern __typeof (SSIZE_MAX) x; + +/* Test the value of SSIZE_MAX. */ +_Static_assert (SSIZE_MAX == (sizeof (ssize_t) == sizeof (int) + ? INT_MAX + : LONG_MAX), + "value of SSIZE_MAX"); + +static int +do_test (void) +{ + /* This is a compilation test. */ + return 0; +} + +#include <support/test-driver.c> |