summaryrefslogtreecommitdiff
path: root/libc/sysdeps/sparc
diff options
context:
space:
mode:
authorjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2011-03-05 19:39:34 +0000
committerjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2011-03-05 19:39:34 +0000
commitf9a421a6b2e3ba46cc615e128091e5eacabb1dac (patch)
tree964b2c72623777783109da9c66eb3805606cd0ce /libc/sysdeps/sparc
parentda46ece214ac285902c4a95ca3fb2ce1bf51c47e (diff)
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
Diffstat (limited to 'libc/sysdeps/sparc')
-rw-r--r--libc/sysdeps/sparc/sparc64/multiarch/memset.S4
1 files changed, 2 insertions, 2 deletions
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