diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-09-05 12:46:12 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-09-05 12:46:12 -0400 |
| commit | 3b142ce5728f6d683f3375fb33099ebf243f6681 (patch) | |
| tree | 896f73d70426cd798e72bd786c0cb000d55b50ad /sysdeps/sparc/sparc64/multiarch/memcpy.S | |
| parent | 2f0ad8f3a470fa5e9aeb9c5a41984f96ae58d7ba (diff) | |
| parent | 5f4318d102d604e2f80bc97927e2d80f76063639 (diff) | |
| download | glibc-3b142ce5728f6d683f3375fb33099ebf243f6681.tar.gz glibc-3b142ce5728f6d683f3375fb33099ebf243f6681.tar.xz glibc-3b142ce5728f6d683f3375fb33099ebf243f6681.zip | |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts: ChangeLog
Diffstat (limited to 'sysdeps/sparc/sparc64/multiarch/memcpy.S')
| -rw-r--r-- | sysdeps/sparc/sparc64/multiarch/memcpy.S | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sysdeps/sparc/sparc64/multiarch/memcpy.S b/sysdeps/sparc/sparc64/multiarch/memcpy.S index c12dc3bbed..c022a40526 100644 --- a/sysdeps/sparc/sparc64/multiarch/memcpy.S +++ b/sysdeps/sparc/sparc64/multiarch/memcpy.S @@ -1,5 +1,5 @@ /* Multiple versions of memcpy - Copyright (C) 2010 Free Software Foundation, Inc. + Copyright (C) 2010, 2011 Free Software Foundation, Inc. Contributed by David S. Miller (davem@davemloft.net) This file is part of the GNU C Library. @@ -33,9 +33,9 @@ ENTRY(memcpy) 1: add %o7, %o3, %o3 mov %o5, %o7 # endif - andcc %o0, 0x80, %g0 ! HWCAP_SPARC_N2 + andcc %o0, HWCAP_SPARC_N2, %g0 be 1f - andcc %o0, 0x40, %g0 ! HWCAP_SPARC_BLKINIT + andcc %o0, HWCAP_SPARC_BLKINIT, %g0 # ifdef SHARED sethi %gdop_hix22(__memcpy_niagara2), %o1 xor %o1, %gdop_lox10(__memcpy_niagara2), %o1 @@ -45,7 +45,7 @@ ENTRY(memcpy) ba 10f nop 1: be 1f - andcc %o0, 0x20, %g0 ! HWCAP_SPARC_ULTRA3 + andcc %o0, HWCAP_SPARC_ULTRA3, %g0 # ifdef SHARED sethi %gdop_hix22(__memcpy_niagara1), %o1 xor %o1, %gdop_lox10(__memcpy_niagara1), %o1 |