summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/x86_64/memset.S3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d5ff2b5a9d..7b67fe8609 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-16  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/x86_64/memset.S: Jump from bzero to memset using
+	a local label rather than HIDDEN_JUMPTARGET.
+
 2007-10-15  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/x86_64/cacheinfo.c (__x86_64_shared_cache_size): Define.
diff --git a/sysdeps/x86_64/memset.S b/sysdeps/x86_64/memset.S
index cfc32837e7..2b56a65df3 100644
--- a/sysdeps/x86_64/memset.S
+++ b/sysdeps/x86_64/memset.S
@@ -24,7 +24,7 @@
 ENTRY (bzero)
 	mov	%rsi,%rdx	/* Adjust parameter.  */
 	xorl	%esi,%esi	/* Fill with 0s.  */
-	jmp	HIDDEN_JUMPTARGET (memset)
+	jmp	L(memset_entry)
 END (bzero)
 
 #if defined PIC && !defined NOT_IN_libc
@@ -35,6 +35,7 @@ END (__memset_chk)
 #endif
 
 ENTRY (memset)
+L(memset_entry):
 	cmp    $0x1,%rdx
 	mov    %rdi,%rax	/* memset returns the dest address.  */
 	jne    L(ck2)