diff options
| author | H.J. Lu <hongjiu.lu@intel.com> | 2016-02-18 11:00:33 -0200 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2016-02-18 14:55:29 -0200 |
| commit | 16396c41deab45f715ffd813280d9d685b3b281e (patch) | |
| tree | 5ed0830f0b3524559d6a099c3a19af14223ef28a /string | |
| parent | 6400ae6ecf6376af230d3ec82a8541848d3239e9 (diff) | |
| download | glibc-16396c41deab45f715ffd813280d9d685b3b281e.tar.gz glibc-16396c41deab45f715ffd813280d9d685b3b281e.tar.xz glibc-16396c41deab45f715ffd813280d9d685b3b281e.zip | |
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 <bits/string.h>, 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 <string.h> for glibc build. [BZ #19462] * bits/string.h (_STRING_ARCH_unaligned): Renamed to ... (_STRING_INLINE_unaligned): This. * include/string.h: Include <string_private.h>. * 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.
Diffstat (limited to 'string')
| -rw-r--r-- | string/bits/string2.h | 10 |
1 files changed, 5 insertions, 5 deletions
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 <endian.h> # include <bits/types.h> @@ -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), \ |