From 0e4a3cd70809f9e67813fdbd781573f3081127cb Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Mon, 4 Jun 2012 13:45:43 -0700 Subject: [PATCH] Use i486 bits/string.h for i386 and x86_64 --- ChangeLog | 4 ++++ sysdeps/{i386/i486 => x86}/bits/string.h | 0 sysdeps/x86_64/bits/string.h | 25 ------------------------- 3 files changed, 4 insertions(+), 25 deletions(-) rename sysdeps/{i386/i486 => x86}/bits/string.h (100%) delete mode 100644 sysdeps/x86_64/bits/string.h diff --git a/ChangeLog b/ChangeLog index 87123bf..56f7637 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ 2012-06-04 H.J. Lu [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 similarity index 100% rename from sysdeps/i386/i486/bits/string.h rename to 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 0ca5fe2..0000000 --- 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 - . */ - -#ifndef _STRING_H -# 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 for x86-64. */ -#define _STRING_ARCH_unaligned 1 -- 2.7.4