about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2007-10-18 00:09:32 +0000
committerJakub Jelinek <jakub@redhat.com>2007-10-18 00:09:32 +0000
commited13ccf1f789aecf1bbdabd4f9f7ff5af085278e (patch)
treecfb8569e81b273a2a3fb6b5f8e53188aa5e03704
parentee9fd869a12b55f835a7295b65e9f702836ba7a2 (diff)
downloadglibc-ed13ccf1f789aecf1bbdabd4f9f7ff5af085278e.tar.gz
glibc-ed13ccf1f789aecf1bbdabd4f9f7ff5af085278e.tar.xz
glibc-ed13ccf1f789aecf1bbdabd4f9f7ff5af085278e.zip
* sysdeps/x86_64/memset.S (bzero): Renamed to __bzero. Add glibc-2.7 cvs/glibc-2_7-base cvs/glibc-2_7
weak_alias.
2007-10-17  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/x86_64/memset.S (bzero): Renamed to __bzero.  Add
	weak_alias.
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/x86_64/memset.S5
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3d4df9fb38..7348573c6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-17  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/x86_64/memset.S (bzero): Renamed to __bzero.  Add
+	weak_alias.
+
 2007-10-17  Roland McGrath  <roland@frob.com>
 
 	* sysdeps/mach/hurd/bits/fcntl.h [__USE_GNU__] (F_DUPFD_CLOEXEC): New.
diff --git a/sysdeps/x86_64/memset.S b/sysdeps/x86_64/memset.S
index db39b09c89..bf2ef005b4 100644
--- a/sysdeps/x86_64/memset.S
+++ b/sysdeps/x86_64/memset.S
@@ -30,11 +30,12 @@
 
         .text
 #ifndef NOT_IN_libc
-ENTRY(bzero)
+ENTRY(__bzero)
 	mov	%rsi,%rdx	/* Adjust parameter.  */
 	xorl	%esi,%esi	/* Fill with 0s.  */
 	jmp	L(memset_entry)
-END(bzero)
+END(__bzero)
+weak_alias (__bzero, bzero)
 #endif
 
 #if defined PIC && !defined NOT_IN_libc