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 /sysdeps/m68k/m680x0 | |
| parent | NEWS: List additional fixed security bugs (diff) | |
| download | glibc-16396c41deab45f715ffd813280d9d685b3b281e.tar.gz glibc-16396c41deab45f715ffd813280d9d685b3b281e.tar.bz2 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 'sysdeps/m68k/m680x0')
| -rw-r--r-- | sysdeps/m68k/m680x0/m68020/bits/string.h | 5 | ||||
| -rw-r--r-- | sysdeps/m68k/m680x0/m68020/string_private.h | 21 |
2 files changed, 23 insertions, 3 deletions
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 <bits/string.h> directly; include <string.h> 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 + <http://www.gnu.org/licenses/>. */ + +/* Tell the generic inline macros that unaligned memory access is + possible. */ +#define _STRING_ARCH_unaligned 1 |