From: Magnus Kessler <Magnus.Kessler@gmx.net>
Date: Thu, 28 May 2009 11:09:07 +0000 (+0100)
Subject: pixman: define pixman_have_{mmx,sse2} on 64-bit Linux
X-Git-Tag: pixman-0.15.8~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d6dfafd9584c37d0d382c5ca974eab04209ad834;p=platform%2Fupstream%2Fpixman.git

pixman: define pixman_have_{mmx,sse2} on 64-bit Linux

The refactoring of pixman removed pixman-sse2.h and pixman-mmx.h in commit
41a9a17e0308f2075bb1bd59c4411e43a67d49ec
(http://cgit.freedesktop.org/pixman/commit/?id=41a9a17e0308f2075bb1bd59c4411e43a67d49ec).
On 64-bit Linux this breaks linking of new programs as well as execution of
existing programs with the following errors:

../pixman/.libs/libpixman-1.so: undefined reference to `pixman_have_mmx'
../pixman/.libs/libpixman-1.so: undefined reference to `pixman_have_sse2'

This patch fixes the issue for me by re-introducing the definitions for these
functions. It might be preferable, though, to create proper trivial static
inline functions instead.

Signed-off-by: Magnus Kessler <Magnus.Kessler@gmx.net>
---

diff --git a/pixman/pixman-cpu.c b/pixman/pixman-cpu.c
index e8f749a..61a93a5 100644
--- a/pixman/pixman-cpu.c
+++ b/pixman/pixman-cpu.c
@@ -494,6 +494,13 @@ pixman_have_sse2 (void)
 }
 #endif
 
+#else /* __amd64__ */
+#ifdef USE_MMX
+#define pixman_have_mmx() TRUE
+#endif
+#ifdef USE_SSE2
+#define pixman_have_sse2() TRUE
+#endif
 #endif /* __amd64__ */
 #endif