2.5-18.1

[thirdparty/glibc.git] / sysdeps / x86_64 / memset.S

diff --git a/sysdeps/x86_64/memset.S b/sysdeps/x86_64/memset.S
index 6c47f4c863db26c13eda8893ce3f2d1444e6f64d..1c421c75f3c8cd0b28f2cbba3dbd9b5de153ec5d 100644 (file)
--- a/sysdeps/x86_64/memset.S
+++ b/sysdeps/x86_64/memset.S
@@ -1,6 +1,6 @@
 /* memset/bzero -- set memory area to CH/0
    Optimized version for x86-64.
-   Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Andreas Jaeger <aj@suse.de>.
 
@@ -41,7 +41,7 @@ END (__memset_chk)
 ENTRY (memset)
 #if BZERO_P
        mov     %rsi,%rdx       /* Adjust parameter.  */
-       xorq    %rsi,%rsi       /* Fill with 0s.  */
+       xorl    %esi,%esi       /* Fill with 0s.  */
 #endif
        cmp     $0x7,%rdx       /* Check for small length.  */
        mov     %rdi,%rcx       /* Save ptr as return value.  */
@@ -138,3 +138,9 @@ END (memset)
 #if !BZERO_P
 libc_hidden_builtin_def (memset)
 #endif
+
+#if !BZERO_P && defined PIC && !defined NOT_IN_libc
+strong_alias (__memset_chk, __memset_zero_constant_len_parameter)
+       .section .gnu.warning.__memset_zero_constant_len_parameter
+       .string "memset used with constant zero length parameter; this could be due to transposed parameters"
+#endif