diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | sysdeps/x86_64/multiarch/strstr-c.c | 32 |
2 files changed, 30 insertions, 6 deletions
@@ -1,5 +1,9 @@ 2012-08-15 Roland McGrath <roland@hack.frob.com> + * sysdeps/x86_64/multiarch/strstr-c.c: Add copyright header. + Move #define and #undef of memmove to just before and after + including <string.h>. + * sysdeps/x86_64/multiarch/memmove.c: Don't include <stddef.h>. [!NOT_IN_libc]: Move #define and #undef of memmove to just before and after including <string.h>. Move declarations of diff --git a/sysdeps/x86_64/multiarch/strstr-c.c b/sysdeps/x86_64/multiarch/strstr-c.c index 795789e..e05c5f1 100644 --- a/sysdeps/x86_64/multiarch/strstr-c.c +++ b/sysdeps/x86_64/multiarch/strstr-c.c @@ -1,4 +1,27 @@ -#include "init-arch.h" +/* Multiple versions of strstr. + Copyright (C) 2012 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/>. */ + +/* Redefine strstr so that the compiler won't complain about the type + mismatch with the IFUNC selector in strong_alias, below. */ +#undef strstr +#define strstr __redirect_strstr +#include <string.h> +#undef strstr #define STRSTR __strstr_sse2 #ifdef SHARED @@ -7,16 +30,13 @@ __hidden_ver1 (__strstr_sse2, __GI_strstr, __strstr_sse2); #endif -/* Redefine strstr so that the compiler won't complain about the type - mismatch with the IFUNC selector in strong_alias, below. */ -#undef strstr -#define strstr __redirect_strstr - #include "string/strstr.c" extern __typeof (__redirect_strstr) __strstr_sse42 attribute_hidden; extern __typeof (__redirect_strstr) __strstr_sse2 attribute_hidden; +#include "init-arch.h" + /* Avoid DWARF definition DIE on ifunc symbol so that GDB can handle ifunc symbol properly. */ extern __typeof (__redirect_strstr) __libc_strstr; |