diff -Naur glibc/sysdeps/i386/i686/multiarch/Makefile glibc-new/sysdeps/i386/i686/multiarch/Makefile --- glibc/sysdeps/i386/i686/multiarch/Makefile 2011-12-18 05:53:21.000000000 +0000 +++ glibc-new/sysdeps/i386/i686/multiarch/Makefile 2012-01-28 04:55:24.627296228 +0000 @@ -36,9 +36,8 @@ endif ifeq ($(subdir),wcsmbs) -sysdep_routines += wcscmp-sse2 wcscmp-c wcslen-sse2 wcslen-c \ - wmemcmp-sse4 wmemcmp-ssse3 wmemcmp-c wcschr-sse2 \ - wcschr-c wcsrchr-sse2 wcsrchr-c wcscpy-ssse3 wcscpy-c +sysdep_routines += wcscmp-sse2 wcscmp-c wmemcmp-sse4 wmemcmp-ssse3 wmemcmp-c \ + wcschr-sse2 wcschr-c wcsrchr-sse2 wcsrchr-c wcscpy-ssse3 wcscpy-c endif ifeq (mathyes,$(subdir)$(config-cflags-avx)) diff -Naur glibc/sysdeps/i386/i686/multiarch/wcslen-c.c glibc-new/sysdeps/i386/i686/multiarch/wcslen-c.c --- glibc/sysdeps/i386/i686/multiarch/wcslen-c.c 2011-12-18 05:53:21.000000000 +0000 +++ glibc-new/sysdeps/i386/i686/multiarch/wcslen-c.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -#include - -#ifndef NOT_IN_libc -# define WCSLEN __wcslen_ia32 -#endif - -extern __typeof (wcslen) __wcslen_ia32; - -#include "wcsmbs/wcslen.c" diff -Naur glibc/sysdeps/i386/i686/multiarch/wcslen.S glibc-new/sysdeps/i386/i686/multiarch/wcslen.S --- glibc/sysdeps/i386/i686/multiarch/wcslen.S 2011-12-18 05:52:31.000000000 +0000 +++ glibc-new/sysdeps/i386/i686/multiarch/wcslen.S 1970-01-01 01:00:00.000000000 +0100 @@ -1,56 +0,0 @@ -/* Multiple versions of wcslen - Copyright (C) 2011 Free Software Foundation, Inc. - Contributed by Intel Corporation. - 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, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -#include -#include - -#ifndef NOT_IN_libc - .section .gnu.linkonce.t.__i686.get_pc_thunk.bx,"ax",@progbits - .globl __i686.get_pc_thunk.bx - .hidden __i686.get_pc_thunk.bx - .p2align 4 - .type __i686.get_pc_thunk.bx,@function -__i686.get_pc_thunk.bx: - movl (%esp), %ebx - ret - - .text -ENTRY(__wcslen) - .type __wcslen, @gnu_indirect_function - pushl %ebx - cfi_adjust_cfa_offset (4) - cfi_rel_offset (ebx, 0) - call __i686.get_pc_thunk.bx - addl $_GLOBAL_OFFSET_TABLE_, %ebx - cmpl $0, KIND_OFFSET+__cpu_features@GOTOFF(%ebx) - jne 1f - call __init_cpu_features -1: leal __wcslen_ia32@GOTOFF(%ebx), %eax - testl $bit_SSE2, CPUID_OFFSET+index_SSE2+__cpu_features@GOTOFF(%ebx) - jz 2f - leal __wcslen_sse2@GOTOFF(%ebx), %eax -2: popl %ebx - cfi_adjust_cfa_offset (-4); - cfi_restore (ebx) - ret -END(__wcslen) - -weak_alias(__wcslen, wcslen) -#endif diff -Naur glibc/sysdeps/i386/i686/multiarch/wcslen-sse2.S glibc-new/sysdeps/i386/i686/multiarch/wcslen-sse2.S --- glibc/sysdeps/i386/i686/multiarch/wcslen-sse2.S 2011-12-18 05:52:31.000000000 +0000 +++ glibc-new/sysdeps/i386/i686/multiarch/wcslen-sse2.S 1970-01-01 01:00:00.000000000 +0100 @@ -1,194 +0,0 @@ -/* wcslen with SSE2 - Copyright (C) 2011 Free Software Foundation, Inc. - Contributed by Intel Corporation. - 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, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -#ifndef NOT_IN_libc -# include -# define STR 4 - - .text -ENTRY (__wcslen_sse2) - mov STR(%esp), %edx - - cmp $0, (%edx) - jz L(exit_tail0) - cmp $0, 4(%edx) - jz L(exit_tail1) - cmp $0, 8(%edx) - jz L(exit_tail2) - cmp $0, 12(%edx) - jz L(exit_tail3) - cmp $0, 16(%edx) - jz L(exit_tail4) - cmp $0, 20(%edx) - jz L(exit_tail5) - cmp $0, 24(%edx) - jz L(exit_tail6) - cmp $0, 28(%edx) - jz L(exit_tail7) - - pxor %xmm0, %xmm0 - - lea 32(%edx), %eax - lea 16(%edx), %ecx - and $-16, %eax - - pcmpeqd (%eax), %xmm0 - pmovmskb %xmm0, %edx - pxor %xmm1, %xmm1 - test %edx, %edx - lea 16(%eax), %eax - jnz L(exit) - - pcmpeqd (%eax), %xmm1 - pmovmskb %xmm1, %edx - pxor %xmm2, %xmm2 - test %edx, %edx - lea 16(%eax), %eax - jnz L(exit) - - pcmpeqd (%eax), %xmm2 - pmovmskb %xmm2, %edx - pxor %xmm3, %xmm3 - test %edx, %edx - lea 16(%eax), %eax - jnz L(exit) - - pcmpeqd (%eax), %xmm3 - pmovmskb %xmm3, %edx - test %edx, %edx - lea 16(%eax), %eax - jnz L(exit) - - and $-0x40, %eax - - .p2align 4 -L(aligned_64_loop): - movaps (%eax), %xmm0 - movaps 16(%eax), %xmm1 - movaps 32(%eax), %xmm2 - movaps 48(%eax), %xmm6 - - pminub %xmm1, %xmm0 - pminub %xmm6, %xmm2 - pminub %xmm0, %xmm2 - pcmpeqd %xmm3, %xmm2 - pmovmskb %xmm2, %edx - test %edx, %edx - lea 64(%eax), %eax - jz L(aligned_64_loop) - - pcmpeqd -64(%eax), %xmm3 - pmovmskb %xmm3, %edx - test %edx, %edx - lea 48(%ecx), %ecx - jnz L(exit) - - pcmpeqd %xmm1, %xmm3 - pmovmskb %xmm3, %edx - test %edx, %edx - lea -16(%ecx), %ecx - jnz L(exit) - - pcmpeqd -32(%eax), %xmm3 - pmovmskb %xmm3, %edx - test %edx, %edx - lea -16(%ecx), %ecx - jnz L(exit) - - pcmpeqd %xmm6, %xmm3 - pmovmskb %xmm3, %edx - test %edx, %edx - lea -16(%ecx), %ecx - jnz L(exit) - - jmp L(aligned_64_loop) - - .p2align 4 -L(exit): - sub %ecx, %eax - shr $2, %eax - test %dl, %dl - jz L(exit_high) - - mov %dl, %cl - and $15, %cl - jz L(exit_1) - ret - - .p2align 4 -L(exit_high): - mov %dh, %ch - and $15, %ch - jz L(exit_3) - add $2, %eax - ret - - .p2align 4 -L(exit_1): - add $1, %eax - ret - - .p2align 4 -L(exit_3): - add $3, %eax - ret - - .p2align 4 -L(exit_tail0): - xor %eax, %eax - ret - - .p2align 4 -L(exit_tail1): - mov $1, %eax - ret - - .p2align 4 -L(exit_tail2): - mov $2, %eax - ret - - .p2align 4 -L(exit_tail3): - mov $3, %eax - ret - - .p2align 4 -L(exit_tail4): - mov $4, %eax - ret - - .p2align 4 -L(exit_tail5): - mov $5, %eax - ret - - .p2align 4 -L(exit_tail6): - mov $6, %eax - ret - - .p2align 4 -L(exit_tail7): - mov $7, %eax - ret - -END (__wcslen_sse2) -#endif diff -Naur glibc/wcsmbs/wcslen.c glibc-new/wcsmbs/wcslen.c --- glibc/wcsmbs/wcslen.c 2011-12-18 05:52:31.000000000 +0000 +++ glibc-new/wcsmbs/wcslen.c 2012-01-28 04:52:17.203273593 +0000 @@ -20,10 +20,6 @@ #include /* Return length of string S. */ -#ifdef WCSLEN -# define __wcslen WCSLEN -#endif - size_t __wcslen (s) const wchar_t *s; @@ -43,6 +39,5 @@ return len; } -#ifndef WCSLEN weak_alias (__wcslen, wcslen) -#endif +