rpms/rpm/FC-6 rpm-4.4.2-no-ppc-asm.patch, NONE, 1.1 rpm.spec, 1.214, 1.215

[fedora-cvs-commits at redhat.com]

Author: pnasrat

Update of /cvs/dist/rpms/rpm/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv32016

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.4.2-no-ppc-asm.patch 
Log Message:
Fix for builders


rpm-4.4.2-no-ppc-asm.patch:
 rpmrc.c |   21 ---------------------
 1 files changed, 21 deletions(-)

--- NEW FILE rpm-4.4.2-no-ppc-asm.patch ---
--- rpm-4.3.3/lib/rpmrc.c.asm	2005-09-19 13:17:02.000000000 -0400
+++ rpm-4.3.3/lib/rpmrc.c	2005-09-19 13:17:23.000000000 -0400
@@ -1278,27 +1278,6 @@
 	}
 #	endif
 
-#	if defined(__linux__) && defined(__powerpc__)
-	{
-	    unsigned pvr = 0;
-	    __sighandler_t oldh = signal(SIGILL, mfspr_ill);
-	    if (setjmp(mfspr_jmpbuf) == 0) {
-		__asm__ __volatile__ ("mfspr %0, 287" : "=r" (pvr));
-	    }
-	    signal(SIGILL, oldh);
-
-	    if ( pvr ) {
-		pvr >>= 16;
-		if ( pvr >= 0x40)
-		    strcpy(un.machine, "ppcpseries");
-		else if ( (pvr == 0x36) || (pvr == 0x37) )
-		    strcpy(un.machine, "ppciseries");
-		else
-		    strcpy(un.machine, "ppc");
-	    }
-	}
-#	endif
-
 	/* the uname() result goes through the arch_canon table */
 	canon = lookupInCanonTable(un.machine,
 				   tables[RPM_MACHTABLE_INSTARCH].canons,


Index: rpm.spec
===================================================================
RCS file: /cvs/dist/rpms/rpm/FC-6/rpm.spec,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- rpm.spec	7 Sep 2006 10:37:45 -0000	1.214
+++ rpm.spec	27 Apr 2007 14:29:01 -0000	1.215
@@ -20,7 +20,7 @@
 %define version 4.4.2
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 32
+Release: 33%{?dist}
 Group: System Environment/Base
 Source: ftp://wraptastic.org/pub/rpm-4.4.x/rpm-%{rpm_version}.tar.gz
 Source1: mono-find-provides
@@ -58,6 +58,7 @@
 Patch30: rpm-4.4.2-gnuhash.patch
 Patch31: rpm-4.4.2-debugedit-ppc-reloc.patch
 Patch32: rpm-4.4.2-debugpaths.patch
+Patch33: rpm-4.4.2-no-ppc-asm.patch
 License: GPL
 Conflicts: patch < 2.5
 %ifos linux
@@ -203,6 +204,7 @@
 %patch30 -p1 -b .gnuhash
 %patch31 -p0 -b .dbgppc
 %patch32 -p1 -b .dbgpaths
+%patch33 -p1 -b .noppcasm
 
 # rebuild configure for ipv6
 autoconf
@@ -599,6 +601,9 @@
 %{__includedir}/popt.h
 
 %changelog
+* Fri Apr 27 2007 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-33
+- Remove ppc64 inline asm (#233145)
+
 * Thu Sep 07 2006 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-32
 - Various debuginfo fixes (#165434, #165418, #149113, #205339)