rpms/liboil/devel liboil-0.3.12-disable-altivec.patch, NONE, 1.1 liboil.spec, 1.18, 1.19 liboil-0.3.8-s390.patch, 1.1, NONE

[Bastien Nocera (hadess)]

Author: hadess

Update of /cvs/pkgs/rpms/liboil/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv693

Modified Files:
	liboil.spec 
Added Files:
	liboil-0.3.12-disable-altivec.patch 
Removed Files:
	liboil-0.3.8-s390.patch 
Log Message:
* Thu Aug 23 2007 - Bastien Nocera <bnocera at redhat.com> - 0.3.12-9
- Disable Altivec so we don't crash on non-Altivec PPCs, see
  https://bugzilla.redhat.com/bugzilla/process_bug.cgi#c16


liboil-0.3.12-disable-altivec.patch:

--- NEW FILE liboil-0.3.12-disable-altivec.patch ---
--- configure~  2007-05-29 07:13:44.000000000 +0100
+++ configure   2007-06-04 12:52:00.000000000 +0100
@@ -10317,7 +10317,7 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
       ;;
-    xpowerpc|xppc)
+    xfoobar)
       HAVE_POWERPC=yes
 
 cat >>confdefs.h <<\_ACEOF
--- liboil/liboilcpu.c.old	2007-08-23 13:02:54.000000000 +0200
+++ liboil/liboilcpu.c	2007-08-23 13:03:23.000000000 +0200
@@ -636,7 +636,7 @@ oil_cpu_detect_i386(void)
 
 /***** powerpc *****/
 
-#if defined(__powerpc__) || defined(__PPC__) || defined(__ppc__)
+#if 0
 static unsigned long
 oil_profile_stamp_tb(void)
 {
@@ -800,7 +800,7 @@ oil_cpu_detect_arch(void)
 #if defined(__i386__) || defined(__amd64__)
   oil_cpu_detect_i386();
 #endif
-#if defined(__powerpc__) || defined(__PPC__) || defined(__ppc__)
+#if 0
   oil_cpu_detect_powerpc();
 #endif
 #ifdef __arm__


Index: liboil.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liboil/devel/liboil.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- liboil.spec	16 Aug 2007 08:57:24 -0000	1.18
+++ liboil.spec	23 Aug 2007 11:21:36 -0000	1.19
@@ -1,15 +1,24 @@
 Summary: Library of Optimized Inner Loops, CPU optimized functions
 Name: liboil
 Version: 0.3.12
-Release: 8%{?dist}
+Release: 9%{?dist}
 # See COPYING which details everything, various BSD licenses apply
 License: BSD
 Group: System Environment/Libraries
 URL: http://liboil.freedesktop.org/
 Source: http://liboil.freedesktop.org/download/liboil-%{version}.tar.gz
+
 Patch1: liboil-0.3.9-s390.patch
+# PPC64 isn't being detected properly
 # http://bugzilla.redhat.com/242418
-Patch2: liboil-0.3.12-ppc64-configure.patch
+# Patch2: liboil-0.3.12-ppc64-configure.patch
+
+# Disable PPC altogether, as oil_prototype_from_string() crashes in malloc
+# otherwise
+# https://bugzilla.redhat.com/bugzilla/process_bug.cgi#c16
+Patch2: liboil-0.3.12-disable-altivec.patch
+
+# Fix SIGILL handling for CPU tests
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=252179
 Patch3: liboil-0.3.12-altivec-sigill.patch
 Patch4: liboil-0.3.12-altivec-sigill-2.patch
@@ -38,7 +47,6 @@
 significant optimization using various techniques, especially by using
 extended instructions provided by modern CPUs (Altivec, MMX, SSE, etc.).
 
-
 %prep
 %setup -q
 %patch1 -p1 -b .s390
@@ -48,6 +56,11 @@
 %patch4 -p0 -b .altivec2
 popd
 
+# Disable Altivec, so that liboil doesn't SIGILL on non-Altivec PPCs
+# See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=252179#c15
+sed -i 's/CFLAGS="$CFLAGS "-maltivec""/CFLAGS="$CFLAGS "-fno-tree-vectorize -Wa,-maltivec""/' configure
+sed -i 's/LIBOIL_CFLAGS -maltivec/LIBOIL_CFLAGS -fno-tree-vectorize -Wa,-maltivec/' configure
+
 %build
 %configure
 # Remove standard rpath from oil-bugreport
@@ -90,6 +103,10 @@
 
 
 %changelog
+* Thu Aug 23 2007 - Bastien Nocera <bnocera at redhat.com> - 0.3.12-9
+- Disable Altivec so we don't crash on non-Altivec PPCs, see
+  https://bugzilla.redhat.com/bugzilla/process_bug.cgi#c16
+
 * Thu Aug 16 2007 - Bastien Nocera <bnocera at redhat.com> - 0.3.12-8
 - And another go at fixing #252179
 


--- liboil-0.3.8-s390.patch DELETED ---