From 367b78fd5c57ee05298eb11370b68d01613961e5 Mon Sep 17 00:00:00 2001
From: Matt Turner <mattst88@gmail.com>
Date: Wed, 30 May 2012 16:44:04 -0400
Subject: [PATCH] configure.ac: add iwmmxt2 configure flag

The flag allows the user to select whether pixman-mmx.c is compiled with
-march=iwmmxt or -march=iwmmxt2.

gcc has scheduling support for the Marvell CPU in the XO 1.75 when
building with -march=iwmmxt2.
---
 configure.ac | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index a544e19..2b9d1ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -607,8 +607,21 @@ fi
 dnl ===========================================================================
 dnl Check for IWMMXT
 
+AC_ARG_ENABLE(arm-iwmmxt,
+   [AC_HELP_STRING([--disable-arm-iwmmxt],
+                   [disable ARM IWMMXT fast paths])],
+   [enable_iwmmxt=$enableval], [enable_iwmmxt=auto])
+
+AC_ARG_ENABLE(arm-iwmmxt2,
+   [AC_HELP_STRING([--disable-arm-iwmmxt2],
+                   [build ARM IWMMXT fast paths with -march=iwmmxt instead of -march=iwmmxt2])],
+   [enable_iwmmxt2=$enableval], [enable_iwmmxt2=auto])
+
 if test "x$IWMMXT_CFLAGS" = "x" ; then
-   IWMMXT_CFLAGS="-march=iwmmxt -flax-vector-conversions -Winline"
+   IWMMXT_CFLAGS="-flax-vector-conversions -Winline -march=iwmmxt"
+   if test $enable_iwmmxt2 != no ; then
+      IWMMXT_CFLAGS+="2"
+   fi
 fi
 
 have_iwmmxt_intrinsics=no
@@ -636,11 +649,6 @@ int main () {
 }]])], have_iwmmxt_intrinsics=yes)
 CFLAGS=$xserver_save_CFLAGS
 
-AC_ARG_ENABLE(arm-iwmmxt,
-   [AC_HELP_STRING([--disable-arm-iwmmxt],
-                   [disable ARM IWMMXT fast paths])],
-   [enable_iwmmxt=$enableval], [enable_iwmmxt=auto])
-
 if test $enable_iwmmxt = no ; then
    have_iwmmxt_intrinsics=disabled
 fi
-- 
2.7.4