[kexec-tools/f16] drop ppc lshrdi3 assembler code, already defined

[Karsten Hopp]

commit 59e28cf4104c2468a7cce73280e004c9e43a33d8
Author: Karsten Hopp <karsten at redhat.com>
Date:   Fri Nov 4 17:42:29 2011 +0100

    drop ppc lshrdi3 assembler code, already defined

 kexec-tools-2.0.2-lshrdi3.patch |   19 +++++++++++++++++++
 kexec-tools.spec                |    8 +++++++-
 2 files changed, 26 insertions(+), 1 deletions(-)
---
diff --git a/kexec-tools-2.0.2-lshrdi3.patch b/kexec-tools-2.0.2-lshrdi3.patch
new file mode 100644
index 0000000..566f4af
--- /dev/null
+++ b/kexec-tools-2.0.2-lshrdi3.patch
@@ -0,0 +1,19 @@
+diff -up kexec-tools-2.0.2/purgatory/arch/ppc/misc.S.lshrdi3 kexec-tools-2.0.2/purgatory/arch/ppc/misc.S
+--- kexec-tools-2.0.2/purgatory/arch/ppc/misc.S.lshrdi3	2011-11-04 17:28:00.000000000 +0100
++++ kexec-tools-2.0.2/purgatory/arch/ppc/misc.S	2011-11-04 17:28:09.000000000 +0100
+@@ -58,15 +58,3 @@ __ashldi3:	
+ 	or	r3,r3,r7	# MSW |= t2
+ 	blr
+ 
+-	.globl __lshrdi3
+-__lshrdi3:	
+-	subfic	r6,r5,32
+-	srw	r4,r4,r5	# LSW = count > 31 ? 0 : LSW >> count
+-	addi	r7,r5,32	# could be xori, or addi with -32
+-	slw	r6,r3,r6	# t1 = count > 31 ? 0 : MSW << (32-count)
+-	srw	r7,r3,r7	# t2 = count < 32 ? 0 : MSW >> (count-32)
+-	or	r4,r4,r6	# LSW |= t1
+-	srw	r3,r3,r5	# MSW = MSW >> count
+-	or	r4,r4,r7	# LSW |= t2
+-	blr
+-
diff --git a/kexec-tools.spec b/kexec-tools.spec
index 6e855e7..46ec81b 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 2.0.2
-Release: 29%{?dist}
+Release: 29.1%{?dist}
 License: GPLv2
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -79,6 +79,8 @@ Patch604: kexec-tools-2.0.0-makedumpfile-boption.patch
 Patch605: kexec-tools-2.0.0-makedumpfile-2.6.32-sparsemem.patch
 Patch606: kexec-tools-2.0.2-purgatory-makefile.patch
 
+Patch607: kexec-tools-2.0.2-lshrdi3.patch
+
 %description
 kexec-tools provides /sbin/kexec binary that facilitates a new
 kernel to boot using the kernel's kexec feature either on a
@@ -99,6 +101,7 @@ tar -z -x -v -f %{SOURCE9}
 %patch604 -p1
 %patch605 -p1
 %patch606 -p1
+%patch607 -p1
 
 tar -z -x -v -f %{SOURCE13}
 
@@ -297,6 +300,9 @@ done
 
 
 %changelog
+* Fri Nov 04 2011 Karsten Hopp <karsten at redhat.com> 2.0.2-29.1
+- drop lshrdi3 assembler code, already defined
+
 * Fri Sep 9 2011 Tom Callaway <spot at fedoraproject.org> - 2.0.2-29
 - fix systemd scriptlets