Fix unwind info in 32bit SSE2/SSSE3 strncpy

diff --git a/ChangeLog b/ChangeLog
index b950dccfeeca0d2e89aad2bf7070fdcac58772ae..390928f0637d3e71931639fb86d86eaf55e0e3e6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-06-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * sysdeps/i386/i686/multiarch/strcpy-sse2.S (RETURN): Fix a typo.
+
+       * sysdeps/i386/i686/multiarch/strcpy-ssse3.S: Correct unwind
+       info.
+
 2011-06-22  H.J. Lu  <hongjiu.lu@intel.com>
 
        * sysdeps/x86_64/multiarch/Makefile (sysdep_routines): Add

diff --git a/sysdeps/i386/i686/multiarch/strcpy-sse2.S b/sysdeps/i386/i686/multiarch/strcpy-sse2.S
index fad1ae2b67a2af56c4bfa979c61d755835b75dc7..fcef748f02e1c4babe01b6950f9f3fb427d347a3 100644 (file)
--- a/sysdeps/i386/i686/multiarch/strcpy-sse2.S
+++ b/sysdeps/i386/i686/multiarch/strcpy-sse2.S
@@ -47,7 +47,7 @@
 #  define PARMS  16
 #  define ENTRANCE PUSH(%ebx); PUSH(%esi); PUSH(%edi)
 #  define RETURN  POP(%edi); POP(%esi); POP(%ebx); ret;          \
-       CFI_PUSH(%ebx); CFI_PUSH(%edi); CFI_PUSH(%edi);
+       CFI_PUSH(%ebx); CFI_PUSH(%esi); CFI_PUSH(%edi);
 
 # ifdef SHARED
 #  define JMPTBL(I, B) I - B

diff --git a/sysdeps/i386/i686/multiarch/strcpy-ssse3.S b/sysdeps/i386/i686/multiarch/strcpy-ssse3.S
index 577d11789cbfc948c2fb16fee31d7a11fd5ce5f0..75a1952e62d36d039f7cec4e4d5ae15ba347844d 100644 (file)
--- a/sysdeps/i386/i686/multiarch/strcpy-ssse3.S
+++ b/sysdeps/i386/i686/multiarch/strcpy-ssse3.S
@@ -3220,6 +3220,8 @@ L(ExitTail16):
 # endif
        RETURN
 # ifdef USE_AS_STRNCPY
+       CFI_PUSH (%esi)
+       CFI_PUSH (%edi)
 L(StrncpyLeaveCase2OrCase3):
        test    %eax, %eax
        jnz     L(Aligned64LeaveCase2)
@@ -3978,6 +3980,8 @@ L(StrncpyExit15):
        lea     1(%esi), %esi
        jmp     L(CopyFrom1To16BytesCase3)
 
+       CFI_POP (%esi)
+       CFI_POP (%edi)
        .p2align 4
 L(ExitTail0):
        movl    %edx, %eax