From f9a421a6b2e3ba46cc615e128091e5eacabb1dac Mon Sep 17 00:00:00 2001
From: joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>
Date: Sat, 5 Mar 2011 19:39:34 +0000
Subject: Merge changes between r12752 and r13053 from /fsf/trunk. Regenerate
 configure scripts as part of merge.

git-svn-id: svn://svn.eglibc.org/trunk@13054 7b3dc134-2b1b-0410-93df-9e9f96275f8d
---
 libc/sysdeps/sparc/sparc64/multiarch/memset.S | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'libc/sysdeps/sparc')

diff --git a/libc/sysdeps/sparc/sparc64/multiarch/memset.S b/libc/sysdeps/sparc/sparc64/multiarch/memset.S
index 23e513f18..befd7edc8 100644
--- a/libc/sysdeps/sparc/sparc64/multiarch/memset.S
+++ b/libc/sysdeps/sparc/sparc64/multiarch/memset.S
@@ -114,8 +114,8 @@ ENTRY(__bzero)
 	 nop
 9:
 # ifdef SHARED
-	sethi	%gdop_hix22(__memset_ultra1), %o1
-	xor	%o1, %gdop_lox10(__memset_ultra1), %o1
+	sethi	%gdop_hix22(__bzero_ultra1), %o1
+	xor	%o1, %gdop_lox10(__bzero_ultra1), %o1
 # else
 	set	__bzero_ultra1, %o1
 # endif
-- 
cgit v1.2.3