about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoshua W. Boyer <jwboyer@linux.vnet.ibm.com>2009-09-01 15:35:35 -0700
committerPetr Baudis <pasky@suse.cz>2009-09-18 20:01:01 +0200
commitf603960ee089375f669788c30375aefc1f5f40b6 (patch)
tree103548a8ae2d130405ba73006ff11d0f58fb1e5d
parentccdf9fd82b5b4588d1c9d7ee479fd991d72e371d (diff)
downloadglibc-f603960ee089375f669788c30375aefc1f5f40b6.tar.gz
glibc-f603960ee089375f669788c30375aefc1f5f40b6.tar.xz
glibc-f603960ee089375f669788c30375aefc1f5f40b6.zip
Fix use of 64-bit insn in 32-bit memcpy for POWER6.
(cherry picked from commit a050d2a5e722876623a70d501c3cdfedfce8b5ce)
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/powerpc/powerpc32/power6/memcpy.S2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 31a9035dd0..d4e0555e38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-31  Joshua W. Boyer  <jwboyer@linux.vnet.ibm.com>
+
+	* sysdeps/powerpc/powerpc32/power6/memcpy.S: Change srdi instruction
+	to srwi in 32-bit memcpy for power6.
+
 2009-08-31  Ulrich Drepper  <drepper@redhat.com>
 
 	[BZ #10560]
diff --git a/sysdeps/powerpc/powerpc32/power6/memcpy.S b/sysdeps/powerpc/powerpc32/power6/memcpy.S
index 156b0bd8cc..cafe9174fd 100644
--- a/sysdeps/powerpc/powerpc32/power6/memcpy.S
+++ b/sysdeps/powerpc/powerpc32/power6/memcpy.S
@@ -220,7 +220,7 @@ L(word_unaligned_short):
     subf  10,0,5
     add   12,4,0
     blt   cr6,5f
-    srdi  7,6,16
+    srwi  7,6,16
     bgt	  cr6,3f
     sth   6,0(3)
     b     7f