rpms/liboil/devel liboil-0.3.12-altivec-sigill-2.patch, NONE, 1.1 liboil-0.3.12-altivec-sigill.patch, 1.1, 1.2 liboil.spec, 1.17, 1.18

[Bastien Nocera (hadess)]

Author: hadess

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

Modified Files:
	liboil-0.3.12-altivec-sigill.patch liboil.spec 
Added Files:
	liboil-0.3.12-altivec-sigill-2.patch 
Log Message:
* Thu Aug 16 2007 - Bastien Nocera <bnocera at redhat.com> - 0.3.12-8
- And another go at fixing #252179


liboil-0.3.12-altivec-sigill-2.patch:

--- NEW FILE liboil-0.3.12-altivec-sigill-2.patch ---
--- liboilcpu.c	2007/08/14 17:49:29	1.43
+++ liboilcpu.c	2007/08/15 21:22:50	1.44
@@ -146,10 +146,14 @@
 illegal_instruction_handler (int num)
 {
   if (in_try_block) {
+#if 0
+    /* alternate method of siglongjmp() */
     sigset_t set;
     sigemptyset (&set);
     sigaddset (&set, SIGILL);
     sigprocmask (SIG_UNBLOCK, &set, NULL);
+    longjmp (jump_env, 1);
+#endif
     siglongjmp (jump_env, 1);
   } else {
     abort ();
@@ -204,7 +208,7 @@
   int ret;
 
   in_try_block = 1;
-  ret = sigsetjmp (jump_env);
+  ret = sigsetjmp (jump_env, 1);
   if (!ret) {
     func (priv);
   }

liboil-0.3.12-altivec-sigill.patch:

Index: liboil-0.3.12-altivec-sigill.patch
===================================================================
RCS file: /cvs/pkgs/rpms/liboil/devel/liboil-0.3.12-altivec-sigill.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- liboil-0.3.12-altivec-sigill.patch	15 Aug 2007 08:37:42 -0000	1.1
+++ liboil-0.3.12-altivec-sigill.patch	16 Aug 2007 08:57:24 -0000	1.2
@@ -14,7 +14,7 @@
  
    in_try_block = 1;
 -  ret = setjmp (jump_env);
-+  ret = sigsetjmp (jump_env, 1);
++  ret = sigsetjmp (jump_env);
    if (!ret) {
      func (priv);
    }


Index: liboil.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liboil/devel/liboil.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- liboil.spec	15 Aug 2007 08:37:42 -0000	1.17
+++ liboil.spec	16 Aug 2007 08:57:24 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Library of Optimized Inner Loops, CPU optimized functions
 Name: liboil
 Version: 0.3.12
-Release: 7%{?dist}
+Release: 8%{?dist}
 # See COPYING which details everything, various BSD licenses apply
 License: BSD
 Group: System Environment/Libraries
@@ -12,6 +12,7 @@
 Patch2: liboil-0.3.12-ppc64-configure.patch
 # 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
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: glib2-devel
 
@@ -44,6 +45,7 @@
 %patch2 -p0 -b .ppc64
 pushd liboil
 %patch3 -p0 -b .altivec
+%patch4 -p0 -b .altivec2
 popd
 
 %build
@@ -88,6 +90,9 @@
 
 
 %changelog
+* Thu Aug 16 2007 - Bastien Nocera <bnocera at redhat.com> - 0.3.12-8
+- And another go at fixing #252179
+
 * Wed Aug 15 2007 - Bastien Nocera <bnocera at redhat.com> - 0.3.12-7
 - Add upstream patch to not crash on PPC machines without Altivec
   (hopefully this time the right one) (#252179)