pixman: Branch 'master' - 2 commits

[Søren Sandmann Pedersen]

 configure.ac        |    8 --------
 pixman/pixman-sse.c |    4 ++++
 2 files changed, 4 insertions(+), 8 deletions(-)

New commits:
commit cb9d5750582ea93ef1902a5185164088cdaa0140
Merge: daf1745... dfe1f63...
Author: Søren Sandmann Pedersen <sandmann at daimi.au.dk>
Date:   Thu Jul 31 13:32:59 2008 -0400

    Merge branch 'master' of sandmann at git.freedesktop.org:/git/pixman

commit daf17450607e533dc590b4673c88241862b6b138
Author: Søren Sandmann Pedersen <sandmann at daimi.au.dk>
Date:   Thu Jul 31 13:32:38 2008 -0400

    Bug 16921. MMX and SSE2 intrinsics not enabled when compiling with Intel's icc
    
    Remove GCC specific inline-growth flags, and use __force_inline__ in
    pixman-sse2 instead. Based on patch by Matt Turner.

diff --git a/configure.ac b/configure.ac
index 13563ed..702bed0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -128,10 +128,6 @@ dnl Check for MMX
 
 MMX_CFLAGS="-mmmx -Winline"
 
-if test "x$GCC" = "xyes"; then
-    MMX_CFLAGS="$MMX_CFLAGS --param inline-unit-growth=10000 --param large-function-growth=10000"
-fi
-
 have_mmx_intrinsics=no
 AC_MSG_CHECKING(whether to use MMX intrinsics)
 xserver_save_CFLAGS=$CFLAGS
@@ -213,10 +209,6 @@ dnl Check for SSE2
 
 SSE_CFLAGS="-mmmx -msse2 -Winline"
 
-if test "x$GCC" = "xyes"; then
-    SSE_CFLAGS="$SSE_CFLAGS --param inline-unit-growth=10000 --param large-function-growth=10000 --param  max-inline-insns-single=6000"
-fi
-
 have_sse2_intrinsics=no
 AC_MSG_CHECKING(whether to use SSE2 intrinsics)
 xserver_save_CFLAGS=$CFLAGS
diff --git a/pixman/pixman-sse.c b/pixman/pixman-sse.c
index 7c4d952..bfe0b8a 100644
--- a/pixman/pixman-sse.c
+++ b/pixman/pixman-sse.c
@@ -43,6 +43,10 @@
 #define inline __forceinline
 #endif
 
+#ifdef __GNUC__
+#    define inline __inline__ __attribute__ ((__always_inline__))
+#endif
+
 /* -------------------------------------------------------------------------------------------------
  * Locals
  */