rpms/liboil/devel clobber-ecx.patch,NONE,1.1 liboil.spec,1.27,1.28

[Matthias Clasen (mclasen)]

Author: mclasen

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

Modified Files:
	liboil.spec 
Added Files:
	clobber-ecx.patch 
Log Message:
upstream fix


clobber-ecx.patch:

--- NEW FILE clobber-ecx.patch ---
diff -up liboil-0.3.13/liboil/i386_amd64/copy.c.clobber-ecx liboil-0.3.13/liboil/i386_amd64/copy.c
--- liboil-0.3.13/liboil/i386_amd64/copy.c.clobber-ecx	2008-02-26 20:29:07.000000000 -0500
+++ liboil-0.3.13/liboil/i386_amd64/copy.c	2008-02-26 20:29:31.000000000 -0500
@@ -375,7 +375,8 @@ static void splat_u16_ns_mmx (uint16_t *
     "  emms\n"
     : [dest] "+r" (dest),
       [n] "+r" (n)
-    : [src] "r" (src));
+    : [src] "r" (src)
+    : "ecx");
 }
 OIL_DEFINE_IMPL_FULL (splat_u16_ns_mmx, splat_u16_ns, OIL_IMPL_FLAG_MMX|OIL_IMPL_FLAG_MMXEXT);
 
@@ -401,7 +402,8 @@ static void splat_u16_ns_mmx_2 (uint16_t
     "  emms\n"
     : [dest] "+r" (dest),
       [n] "+r" (n)
-    : [src] "r" (src));
+    : [src] "r" (src)
+    : "ecx");
 }
 OIL_DEFINE_IMPL_FULL (splat_u16_ns_mmx_2, splat_u16_ns, OIL_IMPL_FLAG_MMX|OIL_IMPL_FLAG_MMXEXT);
 
@@ -429,7 +431,8 @@ static void splat_u16_ns_mmx_3 (uint16_t
     "  emms\n"
     : [dest] "+r" (dest),
       [n] "+r" (n)
-    : [src] "r" (src));
+    : [src] "r" (src)
+    : "ecx");
 }
 OIL_DEFINE_IMPL_FULL (splat_u16_ns_mmx_3, splat_u16_ns, OIL_IMPL_FLAG_MMX|OIL_IMPL_FLAG_MMXEXT);
 


Index: liboil.spec
===================================================================
RCS file: /cvs/extras/rpms/liboil/devel/liboil.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- liboil.spec	25 Feb 2008 16:27:48 -0000	1.27
+++ liboil.spec	27 Feb 2008 01:35:19 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: Library of Optimized Inner Loops, CPU optimized functions
 Name: liboil
 Version: 0.3.13
-Release: 2%{?dist}
+Release: 3%{?dist}
 # See COPYING which details everything, various BSD licenses apply
 License: BSD
 Group: System Environment/Libraries
@@ -22,7 +22,9 @@
 # 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
-Patch5: segfault.patch
+# from upstream git
+Patch5: clobber-ecx.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: glib2-devel
 
@@ -56,7 +58,7 @@
 #%patch3 -p0 -b .altivec
 #%patch4 -p0 -b .altivec2
 #popd
-%patch5 -p1 -b .segfault
+%patch5 -p1 -b .clobber-ecx
 
 # Disable Altivec, so that liboil doesn't SIGILL on non-Altivec PPCs
 # See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=252179#c15
@@ -71,8 +73,7 @@
 # multi-jobbed make makes the build fail:
 # ./build_prototypes_doc >liboilfuncs-doc.h
 # /bin/sh: ./build_prototypes_doc: No such file or directory
-#make %{?_smp_mflags}
-make 
+make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -105,6 +106,9 @@
 
 
 %changelog
+* Tue Feb 26 2008 Matthias Clasen  <mclasen at redhat.com> - 0.3.13-3
+- Use the upstream fix instead
+
 * Mon Feb 25 2008 Matthias Clasen  <mclasen at redhat.com> - 0.3.13-2
 - Work around a segfault by compiling the offending file with -O0 for now