From f85a9e72e21c3fc79dbad53c170251a16d1760ab Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 5 Jun 2009 11:39:45 -0700
Subject: [PATCH] Add missing cleanups from SSE4.2 x86-64 strlen.

---
 sysdeps/x86_64/multiarch/strlen.S | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/sysdeps/x86_64/multiarch/strlen.S b/sysdeps/x86_64/multiarch/strlen.S
index bf889c1ab6..3f03b6930c 100644
--- a/sysdeps/x86_64/multiarch/strlen.S
+++ b/sysdeps/x86_64/multiarch/strlen.S
@@ -40,6 +40,7 @@ ENTRY(strlen)
 END(strlen)
 
 
+	.align 	16
 	.type	__strlen_sse42, @function
 __strlen_sse42:
 	pxor	%xmm2, %xmm2
@@ -63,9 +64,9 @@ __strlen_sse42:
 	subq	%r8, %rax
 	ret
 
-1:	bsfl	%edx, %eax
-	leaq	(%rdi,%rax), %rax
-	subq	%r8, %rax
+1:	subq	%r8, %rdi
+	bsfl	%edx, %eax
+	addq	%rdi, %rax
 	ret
 	.size	__strlen_sse42, .-__strlen_sse42