- attempt to fix mmx asm (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44237)

Changed files:
    avidemux.spec -> 1.89
    mmx-asm.patch -> 1.1

diff --git a/avidemux.spec b/avidemux.spec
index e54c6546f090b187c53d1cc868304775ebb99d1a..155e421e0164d4c83ca5d65e30174c7355e5a422 100644 (file)
--- a/avidemux.spec
+++ b/avidemux.spec
@@ -19,7 +19,7 @@ Summary:      A small audio/video editing software for Linux
 Summary(pl.UTF-8):     Mały edytor audio/wideo dla Linuksa
 Name:          avidemux
 Version:       2.5.2
-Release:       4
+Release:       4.1
 License:       GPL v2+
 Group:         X11/Applications/Multimedia
 Source0:       http://downloads.sourceforge.net/avidemux/%{name}_%{version}.tar.gz
@@ -29,7 +29,7 @@ Source2:      %{name}-qt4.desktop
 Patch0:                gcc44.patch
 Patch1:                types.patch
 Patch2:                qtlocale.patch
-Patch3:                %{name}-gcc-bug-mmx-x86.patch
+Patch3:                mmx-asm.patch
 #Patch1:       %{name}-dts_internal.patch
 #Patch2:       %{name}-sparc64.patch
 URL:           http://fixounet.free.fr/avidemux/

diff --git a/mmx-asm.patch b/mmx-asm.patch
new file mode 100644 (file)
index 0000000..1728671
--- /dev/null
+++ b/mmx-asm.patch
@@ -0,0 +1,55 @@
+--- avidemux_2.5.2-asm/avidemux/ADM_coreImage/include/ADM_mmxMacros.h~ 2010-05-22 10:32:09.000000000 +0200
++++ avidemux_2.5.2-asm/avidemux/ADM_coreImage/include/ADM_mmxMacros.h  2010-05-22 10:38:24.837977894 +0200
+@@ -348,16 +348,16 @@
+ #define       mmx_i2r(op, imm, reg) \
+       __asm__ __volatile__ (#op " %0, %%" #reg \
+                             : /* nothing */ \
+-                            : "X" (imm) )
++                            : "ym" (imm) )
+ 
+ #define       mmx_m2r(op, mem, reg) \
+       __asm__ __volatile__ (#op " %0, %%" #reg \
+                             : /* nothing */ \
+-                            : "X" (mem))
++                            : "ym" (mem))
+ 
+ #define       mmx_r2m(op, reg, mem) \
+       __asm__ __volatile__ (#op " %%" #reg ", %0" \
+-                            : "=X" (mem) \
++                            : "=ym" (mem) \
+                             : /* nothing */ )
+ 
+ #define       mmx_r2r(op, regs, regd) \
+@@ -367,8 +367,8 @@
+       __asm__ __volatile__ ("movq %0, %%mm0\n\t" \
+                             #op " %1, %%mm0\n\t" \
+                             "movq %%mm0, %0" \
+-                            : "=X" (memd) \
+-                            : "X" (mems))
++                            : "=ym" (memd) \
++                            : "ym" (mems))
+ 
+ #endif
+ 
+@@ -383,8 +383,8 @@
+ #define       movq(vars, vard) \
+       __asm__ __volatile__ ("movq %1, %%mm0\n\t" \
+                             "movq %%mm0, %0" \
+-                            : "=X" (vard) \
+-                            : "X" (vars))
++                            : "=ym" (vard) \
++                            : "ym" (vars))
+ 
+ 
+ /*    1x32 MOVe Doubleword
+@@ -398,8 +398,8 @@
+ #define       movd(vars, vard) \
+       __asm__ __volatile__ ("movd %1, %%mm0\n\t" \
+                             "movd %%mm0, %0" \
+-                            : "=X" (vard) \
+-                            : "X" (vars))
++                            : "=ym" (vard) \
++                            : "ym" (vars))
+ 
+ 
+ /*    2x32, 4x16, and 8x8 Parallel ADDs