diff options
Diffstat (limited to 'string')
| -rw-r--r-- | string/Makefile | 5 | ||||
| -rw-r--r-- | string/endian.h | 25 | ||||
| -rw-r--r-- | string/test-endian-types.c | 49 |
3 files changed, 65 insertions, 14 deletions
diff --git a/string/Makefile b/string/Makefile index 04e9da951e..7b3afa01ae 100644 --- a/string/Makefile +++ b/string/Makefile @@ -25,7 +25,7 @@ include ../Makeconfig headers := string.h strings.h memory.h endian.h bits/endian.h \ argz.h envz.h byteswap.h bits/byteswap.h bits/byteswap-16.h \ bits/string.h bits/string2.h bits/string3.h \ - bits/strings_fortified.h + bits/strings_fortified.h bits/uintn-identity.h routines := strcat strchr strcmp strcoll strcpy strcspn \ strverscmp strdup strndup \ @@ -56,7 +56,8 @@ tests := tester inl-tester noinl-tester testcopy test-ffs \ tst-strtok tst-strxfrm bug-strcoll1 tst-strfry \ bug-strtok1 $(addprefix test-,$(strop-tests)) \ bug-envz1 tst-strxfrm2 tst-endian tst-svc2 \ - tst-strtok_r bug-strcoll2 tst-cmp tst-xbzero-opt + tst-strtok_r bug-strcoll2 tst-cmp tst-xbzero-opt \ + test-endian-types xtests = tst-strcoll-overflow diff --git a/string/endian.h b/string/endian.h index 18e67085b4..dcc9a65df7 100644 --- a/string/endian.h +++ b/string/endian.h @@ -58,37 +58,38 @@ #if defined __USE_MISC && !defined __ASSEMBLER__ /* Conversion interfaces. */ # include <bits/byteswap.h> +# include <bits/uintn-identity.h> # if __BYTE_ORDER == __LITTLE_ENDIAN # define htobe16(x) __bswap_16 (x) -# define htole16(x) (x) +# define htole16(x) __uint16_identity (x) # define be16toh(x) __bswap_16 (x) -# define le16toh(x) (x) +# define le16toh(x) __uint16_identity (x) # define htobe32(x) __bswap_32 (x) -# define htole32(x) (x) +# define htole32(x) __uint32_identity (x) # define be32toh(x) __bswap_32 (x) -# define le32toh(x) (x) +# define le32toh(x) __uint32_identity (x) # define htobe64(x) __bswap_64 (x) -# define htole64(x) (x) +# define htole64(x) __uint64_identity (x) # define be64toh(x) __bswap_64 (x) -# define le64toh(x) (x) +# define le64toh(x) __uint64_identity (x) # else -# define htobe16(x) (x) +# define htobe16(x) __uint16_identity (x) # define htole16(x) __bswap_16 (x) -# define be16toh(x) (x) +# define be16toh(x) __uint16_identity (x) # define le16toh(x) __bswap_16 (x) -# define htobe32(x) (x) +# define htobe32(x) __uint32_identity (x) # define htole32(x) __bswap_32 (x) -# define be32toh(x) (x) +# define be32toh(x) __uint32_identity (x) # define le32toh(x) __bswap_32 (x) -# define htobe64(x) (x) +# define htobe64(x) __uint64_identity (x) # define htole64(x) __bswap_64 (x) -# define be64toh(x) (x) +# define be64toh(x) __uint64_identity (x) # define le64toh(x) __bswap_64 (x) # endif #endif diff --git a/string/test-endian-types.c b/string/test-endian-types.c new file mode 100644 index 0000000000..86a89324f7 --- /dev/null +++ b/string/test-endian-types.c @@ -0,0 +1,49 @@ +/* Test endian.h endian-conversion macros always return the correct type. + Copyright (C) 2017 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 <endian.h> +#include <stdint.h> + +int i; +uint16_t u16; +uint32_t u32; +uint64_t u64; + +int +do_test (void) +{ + /* This is a compilation test. */ + extern __typeof (htobe16 (i)) u16; + extern __typeof (htole16 (i)) u16; + extern __typeof (be16toh (i)) u16; + extern __typeof (le16toh (i)) u16; + extern __typeof (htobe32 (i)) u32; + extern __typeof (htole32 (i)) u32; + extern __typeof (be32toh (i)) u32; + extern __typeof (le32toh (i)) u32; + extern __typeof (htobe64 (i)) u64; + extern __typeof (htole64 (i)) u64; + extern __typeof (be64toh (i)) u64; + extern __typeof (le64toh (i)) u64; + (void) u16; + (void) u32; + (void) u64; + return 0; +} + +#include <support/test-driver.c> |