diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2012-06-04 13:45:43 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2012-06-04 13:45:43 -0700 |
| commit | 0e4a3cd70809f9e67813fdbd781573f3081127cb (patch) | |
| tree | 1856ddc041372a61700b311792ebd7044a6272d6 | |
| parent | 6704c645b05b8516915e07ccba4703b2924a9842 (diff) | |
| download | glibc-0e4a3cd70809f9e67813fdbd781573f3081127cb.tar.gz glibc-0e4a3cd70809f9e67813fdbd781573f3081127cb.tar.xz glibc-0e4a3cd70809f9e67813fdbd781573f3081127cb.zip | |
Use i486 bits/string.h for i386 and x86_64
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | sysdeps/x86/bits/string.h (renamed from sysdeps/i386/i486/bits/string.h) | 0 | ||||
| -rw-r--r-- | sysdeps/x86_64/bits/string.h | 25 |
3 files changed, 4 insertions, 25 deletions
diff --git a/ChangeLog b/ChangeLog index 87123bf4a7..56f7637a3e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ 2012-06-04 H.J. Lu <hongjiu.lu@intel.com> [BZ #14117] + * sysdeps/i386/i486/bits/string.h: Renamed to ... + * sysdeps/x86/bits/string.h: This. + * sysdeps/x86_64/bits/string.h: Removed. + * sysdeps/i386/i486/bits/string.h: Define inline functions only if not compiling for x86-64, but compiling for >= i486. diff --git a/sysdeps/i386/i486/bits/string.h b/sysdeps/x86/bits/string.h index d47a31cb35..d47a31cb35 100644 --- a/sysdeps/i386/i486/bits/string.h +++ b/sysdeps/x86/bits/string.h diff --git a/sysdeps/x86_64/bits/string.h b/sysdeps/x86_64/bits/string.h deleted file mode 100644 index 0ca5fe28d6..0000000000 --- a/sysdeps/x86_64/bits/string.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Optimized, inlined string functions. AMD x86-64 version. - Copyright (C) 2001 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/>. */ - -#ifndef _STRING_H -# 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 for x86-64. */ -#define _STRING_ARCH_unaligned 1 |