diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-08-20 19:50:45 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-08-20 19:50:45 +0200 |
| commit | 4dd9e35bfd35d3138bc44169baba098005bad51e (patch) | |
| tree | a4939c43a9c3fe00eb27f023e14acc5e1fe8808c /sysdeps/sparc/sparc64/memchr.S | |
| parent | bd42a4599d1b6f77bcfe1e4f67b7cbd9e1cb2dfd (diff) | |
| parent | f76453c31593957fec1a99b986bfa5506618b79c (diff) | |
Merge commit 'refs/top-bases/t/bigmem' into t/bigmem
Diffstat (limited to 'sysdeps/sparc/sparc64/memchr.S')
| -rw-r--r-- | sysdeps/sparc/sparc64/memchr.S | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sysdeps/sparc/sparc64/memchr.S b/sysdeps/sparc/sparc64/memchr.S index 7c756228ad..d92bad156c 100644 --- a/sysdeps/sparc/sparc64/memchr.S +++ b/sysdeps/sparc/sparc64/memchr.S @@ -1,7 +1,7 @@ /* memchr (str, ch, n) -- Return pointer to first occurrence of CH in STR less than N. For SPARC v9. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jan Vondrak <jvon4518@ss1000.ms.mff.cuni.cz> and Jakub Jelinek <jj@ultra.linux.cz>. @@ -63,7 +63,8 @@ ENTRY(__memchr) be,pn %XCC, 12f /* CTI */ #endif sll %o1, 8, %g3 /* IEU0 Group */ - add %o0, %o2, %o2 /* IEU1 */ + addcc %o0, %o2, %o2 /* IEU1 */ + movcs %XCC, -1, %o2 /* IEU0 Group */ sethi %hi(0x01010101), %g1 /* IEU0 Group */ or %g3, %o1, %g3 /* IEU1 */ |