- fix register usage in asm code on x32

diff --git a/DirectFB.spec b/DirectFB.spec
index 005a905ad5b8568942b859648166cd25f79e20eb..c65bf4fcef481e7896e533f14da456bc11f4ce69 100644 (file)
--- a/DirectFB.spec
+++ b/DirectFB.spec
@@ -25,7 +25,7 @@ Summary:      DirectFB - Hardware graphics acceleration
 Summary(pl.UTF-8):     DirectFB - Wspomaganie grafiki
 Name:          DirectFB
 Version:       1.7.6
-Release:       3
+Release:       3.1
 Epoch:         1
 License:       LGPL v2+
 Group:         Libraries
@@ -45,6 +45,7 @@ Patch8:               %{name}-missing.patch
 Patch9:                %{name}-ffmpeg.patch
 Patch10:       %{name}-libmpeg3.patch
 Patch11:       %{name}-format.patch
+Patch12:       x32-asm.patch
 URL:           http://www.directfb.org/
 BuildRequires: Mesa-libEGL-devel
 BuildRequires: Mesa-libGLES-devel
@@ -937,6 +938,7 @@ Statyczna biblioteka sawman.
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 
 # video drivers
 %{__sed} -i -e 's/checkfor_\(cle266\|cyber5k\|radeon\|savage\|unichrome\|vmware\)=no/checkfor_\1=yes/' configure.in

diff --git a/x32-asm.patch b/x32-asm.patch
new file mode 100644 (file)
index 0000000..8f2d63e
--- /dev/null
+++ b/x32-asm.patch
@@ -0,0 +1,29 @@
+--- /home/users/baggins/devel/PLD/rpm/BUILD/DirectFB-1.7.6/lib/dvc/dvc_mmx.h~  2013-12-19 01:16:24.000000000 +0100
++++ /home/users/baggins/devel/PLD/rpm/BUILD/DirectFB-1.7.6/lib/dvc/dvc_mmx.h   2015-03-09 18:30:30.315841777 +0100
+@@ -323,7 +323,7 @@
+           "movd          %2, %%mm4\n\t"
+           "shr          $16, %%eax\n\t"
+           "punpcklwd  %%mm4, %%mm4\n\t"
+-#ifdef ARCH_X86_64
++#if defined(ARCH_X86_64) && !defined(__ILP32__)
+           "movq (%3,%%rax,4), %%mm0\n\t"
+ #else
+           "movq (%3,%%eax,4), %%mm0\n\t"
+@@ -336,7 +336,7 @@
+           "movd          %2, %%mm5\n\t"
+           "shr          $16, %%eax\n\t"
+           "punpcklwd  %%mm5, %%mm5\n\t"
+-#ifdef ARCH_X86_64
++#if defined(ARCH_X86_64) && !defined(__ILP32__)
+           "movq (%3,%%rax,4), %%mm2\n\t"
+ #else
+           "movq (%3,%%eax,4), %%mm2\n\t"
+@@ -369,7 +369,7 @@
+           "movd          %2, %%mm4\n\t"
+           "shr          $16,    %2\n\t"
+           "punpcklwd  %%mm4, %%mm4\n\t"
+-#ifdef ARCH_X86_64
++#if defined(ARCH_X86_64) && !defined(__ILP32__)
+           "movq   (%3,%q2,4), %%mm0\n\t"
+ #else
+           "movq   (%3,%2,4), %%mm0\n\t"