From 16396c41deab45f715ffd813280d9d685b3b281e Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 18 Feb 2016 11:00:33 -0200 Subject: Add _STRING_INLINE_unaligned and string_private.h As discussed in https://sourceware.org/ml/libc-alpha/2015-10/msg00403.html the setting of _STRING_ARCH_unaligned currently controls the external GLIBC ABI as well as selecting the use of unaligned accesses withing GLIBC. Since _STRING_ARCH_unaligned was recently changed for AArch64, this would potentially break the ABI in GLIBC 2.23, so split the uses and add _STRING_INLINE_unaligned to select the string ABI. This setting must be fixed for each target, while _STRING_ARCH_unaligned may be changed from release to release. _STRING_ARCH_unaligned is used unconditionally in glibc. But , which defines _STRING_ARCH_unaligned, isn't included with -Os. Since _STRING_ARCH_unaligned is internal to glibc and may change between glibc releases, it should be made private to glibc. _STRING_ARCH_unaligned should defined in the new string_private.h heade file which is included unconditionally from internal for glibc build. [BZ #19462] * bits/string.h (_STRING_ARCH_unaligned): Renamed to ... (_STRING_INLINE_unaligned): This. * include/string.h: Include . * string/bits/string2.h: Replace _STRING_ARCH_unaligned with _STRING_INLINE_unaligned. * sysdeps/aarch64/bits/string.h (_STRING_ARCH_unaligned): Removed. (_STRING_INLINE_unaligned): New. * sysdeps/aarch64/string_private.h: New file. * sysdeps/generic/string_private.h: Likewise. * sysdeps/m68k/m680x0/m68020/string_private.h: Likewise. * sysdeps/s390/string_private.h: Likewise. * sysdeps/x86/string_private.h: Likewise. * sysdeps/m68k/m680x0/m68020/bits/string.h (_STRING_ARCH_unaligned): Renamed to ... (_STRING_INLINE_unaligned): This. * sysdeps/s390/bits/string.h (_STRING_ARCH_unaligned): Renamed to ... (_STRING_INLINE_unaligned): This. * sysdeps/sparc/bits/string.h (_STRING_ARCH_unaligned): Renamed to ... (_STRING_INLINE_unaligned): This. * sysdeps/x86/bits/string.h (_STRING_ARCH_unaligned): Renamed to ... (_STRING_INLINE_unaligned): This. --- ChangeLog | 29 +++++++++++++++++++++++++++++ bits/string.h | 8 ++++++-- include/string.h | 3 +++ string/bits/string2.h | 10 +++++----- sysdeps/aarch64/bits/string.h | 4 ++-- sysdeps/aarch64/string_private.h | 20 ++++++++++++++++++++ sysdeps/generic/string_private.h | 21 +++++++++++++++++++++ sysdeps/m68k/m680x0/m68020/bits/string.h | 5 ++--- sysdeps/m68k/m680x0/m68020/string_private.h | 21 +++++++++++++++++++++ sysdeps/s390/bits/string.h | 4 ++-- sysdeps/s390/string_private.h | 20 ++++++++++++++++++++ sysdeps/sparc/bits/string.h | 4 ++-- sysdeps/x86/bits/string.h | 4 ++-- sysdeps/x86/string_private.h | 20 ++++++++++++++++++++ 14 files changed, 155 insertions(+), 18 deletions(-) create mode 100644 sysdeps/aarch64/string_private.h create mode 100644 sysdeps/generic/string_private.h create mode 100644 sysdeps/m68k/m680x0/m68020/string_private.h create mode 100644 sysdeps/s390/string_private.h create mode 100644 sysdeps/x86/string_private.h diff --git a/ChangeLog b/ChangeLog index ec7d6bc40d..48605da15c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,32 @@ +2016-02-18 H.J. Lu + Wilco Dijkstra + + [BZ #19462] + * bits/string.h (_STRING_ARCH_unaligned): Renamed to ... + (_STRING_INLINE_unaligned): This. + * include/string.h: Include . + * string/bits/string2.h: Replace _STRING_ARCH_unaligned with + _STRING_INLINE_unaligned. + * sysdeps/aarch64/bits/string.h (_STRING_ARCH_unaligned): Removed. + (_STRING_INLINE_unaligned): New. + * sysdeps/aarch64/string_private.h: New file. + * sysdeps/generic/string_private.h: Likewise. + * sysdeps/m68k/m680x0/m68020/string_private.h: Likewise. + * sysdeps/s390/string_private.h: Likewise. + * sysdeps/x86/string_private.h: Likewise. + * sysdeps/m68k/m680x0/m68020/bits/string.h + (_STRING_ARCH_unaligned): Renamed to ... + (_STRING_INLINE_unaligned): This. + * sysdeps/s390/bits/string.h (_STRING_ARCH_unaligned): Renamed + to ... + (_STRING_INLINE_unaligned): This. + * sysdeps/sparc/bits/string.h (_STRING_ARCH_unaligned): Renamed + to ... + (_STRING_INLINE_unaligned): This. + * sysdeps/x86/bits/string.h (_STRING_ARCH_unaligned): Renamed + to ... + (_STRING_INLINE_unaligned): This. + 2016-02-17 Andrew Senkevich H.J. Lu diff --git a/bits/string.h b/bits/string.h index b88a6bc601..89c627c182 100644 --- a/bits/string.h +++ b/bits/string.h @@ -8,7 +8,11 @@ #ifndef _BITS_STRING_H #define _BITS_STRING_H 1 -/* Define if architecture can access unaligned multi-byte variables. */ -#define _STRING_ARCH_unaligned 0 +/* Define whether to use the unaligned string inline ABI. + The string inline functions are an external ABI, thus cannot be changed + after the first release of a new target (unlike _STRING_ARCH_unaligned + which may be changed from release to release). Targets must support + unaligned accesses in hardware if either define is set to true. */ +#define _STRING_INLINE_unaligned 0 #endif /* bits/string.h */ diff --git a/include/string.h b/include/string.h index a684fd9624..e145bfdb4c 100644 --- a/include/string.h +++ b/include/string.h @@ -46,6 +46,9 @@ extern int __ffs (int __i) __attribute__ ((const)); extern char *__strerror_r (int __errnum, char *__buf, size_t __buflen); #endif +/* Get _STRING_ARCH_unaligned. */ +#include + /* Now the real definitions. We do this here since some of the functions above are defined as macros in the headers. */ #include diff --git a/string/bits/string2.h b/string/bits/string2.h index b93be06835..8200ef173d 100644 --- a/string/bits/string2.h +++ b/string/bits/string2.h @@ -46,7 +46,7 @@ # endif #endif -#if _STRING_ARCH_unaligned +#if _STRING_INLINE_unaligned /* If we can do unaligned memory accesses we must know the endianess. */ # include # include @@ -95,7 +95,7 @@ __STRING2_COPY_TYPE (8); /* Set N bytes of S to C. */ #if !defined _HAVE_STRING_ARCH_memset # if !__GNUC_PREREQ (3, 0) -# if _STRING_ARCH_unaligned +# if _STRING_INLINE_unaligned # define memset(s, c, n) \ (__extension__ (__builtin_constant_p (n) && (n) <= 16 \ ? ((n) == 1 \ @@ -223,7 +223,7 @@ __STRING2_COPY_TYPE (8); # endif # if !__GNUC_PREREQ (3, 0) || defined _FORCE_INLINES -# if _STRING_ARCH_unaligned +# if _STRING_INLINE_unaligned # ifndef _FORCE_INLINES # define __mempcpy_args(src) \ ((const char *) (src))[0], ((const char *) (src))[2], \ @@ -419,7 +419,7 @@ extern void *__rawmemchr (const void *__s, int __c); : strcpy (dest, src))) # endif -# if _STRING_ARCH_unaligned +# if _STRING_INLINE_unaligned # ifndef _FORCE_INLINES # define __strcpy_args(src) \ __extension__ __STRING2_SMALL_GET16 (src, 0), \ @@ -598,7 +598,7 @@ __strcpy_small (char *__dest, # endif # if !__GNUC_PREREQ (3, 0) || defined _FORCE_INLINES -# if _STRING_ARCH_unaligned +# if _STRING_INLINE_unaligned # ifndef _FORCE_INLINES # define __stpcpy_args(src) \ __extension__ __STRING2_SMALL_GET16 (src, 0), \ diff --git a/sysdeps/aarch64/bits/string.h b/sysdeps/aarch64/bits/string.h index 3c2a50ba75..0a508f72c0 100644 --- a/sysdeps/aarch64/bits/string.h +++ b/sysdeps/aarch64/bits/string.h @@ -20,5 +20,5 @@ # error "Never use directly; include instead." #endif -/* AArch64 implementations support efficient unaligned access. */ -#define _STRING_ARCH_unaligned 1 +/* AArch64 uses the aligned string inline ABI. */ +#define _STRING_INLINE_unaligned 0 diff --git a/sysdeps/aarch64/string_private.h b/sysdeps/aarch64/string_private.h new file mode 100644 index 0000000000..8b194a41a6 --- /dev/null +++ b/sysdeps/aarch64/string_private.h @@ -0,0 +1,20 @@ +/* Define _STRING_ARCH_unaligned. AArch64 version. + Copyright (C) 2016 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 + . */ + +/* AArch64 implementations support efficient unaligned access. */ +#define _STRING_ARCH_unaligned 1 diff --git a/sysdeps/generic/string_private.h b/sysdeps/generic/string_private.h new file mode 100644 index 0000000000..c880aae4f2 --- /dev/null +++ b/sysdeps/generic/string_private.h @@ -0,0 +1,21 @@ +/* Define _STRING_ARCH_unaligned. Generic version. + Copyright (C) 2016 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 + . */ + +/* Define to 1 if architecture can access unaligned multi-byte + variables. */ +#define _STRING_ARCH_unaligned 0 diff --git a/sysdeps/m68k/m680x0/m68020/bits/string.h b/sysdeps/m68k/m680x0/m68020/bits/string.h index 88505bbda4..78c95943e1 100644 --- a/sysdeps/m68k/m680x0/m68020/bits/string.h +++ b/sysdeps/m68k/m680x0/m68020/bits/string.h @@ -20,6 +20,5 @@ # error "Never use directly; include instead." #endif -/* Currently the only purpose of this file is to tell the generic inline - macros that unaligned memory access is possible. */ -#define _STRING_ARCH_unaligned 1 +/* Use the unaligned string inline ABI. */ +#define _STRING_INLINE_unaligned 1 diff --git a/sysdeps/m68k/m680x0/m68020/string_private.h b/sysdeps/m68k/m680x0/m68020/string_private.h new file mode 100644 index 0000000000..6846663811 --- /dev/null +++ b/sysdeps/m68k/m680x0/m68020/string_private.h @@ -0,0 +1,21 @@ +/* Define _STRING_ARCH_unaligned. m680x0 version, x >= 2. + Copyright (C) 2016 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 + . */ + +/* Tell the generic inline macros that unaligned memory access is + possible. */ +#define _STRING_ARCH_unaligned 1 diff --git a/sysdeps/s390/bits/string.h b/sysdeps/s390/bits/string.h index 09201d97e5..39e0b7fe7c 100644 --- a/sysdeps/s390/bits/string.h +++ b/sysdeps/s390/bits/string.h @@ -21,8 +21,8 @@ # error "Never use directly; include instead." #endif -/* The s390 processors can access unaligned multi-byte variables. */ -#define _STRING_ARCH_unaligned 1 +/* Use the unaligned string inline ABI. */ +#define _STRING_INLINE_unaligned 1 /* We only provide optimizations if the user selects them and if GNU CC is used. */ diff --git a/sysdeps/s390/string_private.h b/sysdeps/s390/string_private.h new file mode 100644 index 0000000000..9e11eee3dc --- /dev/null +++ b/sysdeps/s390/string_private.h @@ -0,0 +1,20 @@ +/* Define _STRING_ARCH_unaligned. S/390 version. + Copyright (C) 2016 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 + . */ + +/* The s390 processors can access unaligned multi-byte variables. */ +#define _STRING_ARCH_unaligned 1 diff --git a/sysdeps/sparc/bits/string.h b/sysdeps/sparc/bits/string.h index 3054f62afc..10beca6a5a 100644 --- a/sysdeps/sparc/bits/string.h +++ b/sysdeps/sparc/bits/string.h @@ -20,8 +20,8 @@ # error "Never use directly; include instead." #endif -/* Define if architecture can access unaligned multi-byte variables. */ -#define _STRING_ARCH_unaligned 0 +/* sparc uses the aligned string inline ABI. */ +#define _STRING_INLINE_unaligned 0 /* sparc32 and sparc64 strchr(x, '\0') perform better than __rawmemchr(x, '\0'). */ diff --git a/sysdeps/x86/bits/string.h b/sysdeps/x86/bits/string.h index 1a0682b881..e4e019f1fc 100644 --- a/sysdeps/x86/bits/string.h +++ b/sysdeps/x86/bits/string.h @@ -20,8 +20,8 @@ # error "Never use directly; include instead." #endif -/* The ix86 processors can access unaligned multi-byte variables. */ -#define _STRING_ARCH_unaligned 1 +/* Use the unaligned string inline ABI. */ +#define _STRING_INLINE_unaligned 1 /* Enable inline functions only for i486 or better when compiling for ia32. */ diff --git a/sysdeps/x86/string_private.h b/sysdeps/x86/string_private.h new file mode 100644 index 0000000000..e7281eb4ea --- /dev/null +++ b/sysdeps/x86/string_private.h @@ -0,0 +1,20 @@ +/* Define _STRING_ARCH_unaligned. i486/x86-64 version. + Copyright (C) 2016 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 + . */ + +/* The ix86 processors can access unaligned multi-byte variables. */ +#define _STRING_ARCH_unaligned 1 -- cgit v1.2.3