aboutsummaryrefslogtreecommitdiff
path: root/pixman/configure.ac
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-06-11 08:22:24 +0200
committermarha <marha@users.sourceforge.net>2012-06-11 08:22:24 +0200
commit080d1527a5358dd66ac927acbe0ec61cba7aa7e1 (patch)
tree6d54a6409a4627162bddaad63186327e1ecdbad1 /pixman/configure.ac
parent990bc3f015a4f8fce2eb918375defcd44980a845 (diff)
downloadvcxsrv-080d1527a5358dd66ac927acbe0ec61cba7aa7e1.tar.gz
vcxsrv-080d1527a5358dd66ac927acbe0ec61cba7aa7e1.tar.bz2
vcxsrv-080d1527a5358dd66ac927acbe0ec61cba7aa7e1.zip
fontconfig glproto mesa pixman git update 11 Jun 2012
Diffstat (limited to 'pixman/configure.ac')
-rw-r--r--pixman/configure.ac22
1 files changed, 15 insertions, 7 deletions
diff --git a/pixman/configure.ac b/pixman/configure.ac
index 5c60b13c9..2b9d1ba20 100644
--- a/pixman/configure.ac
+++ b/pixman/configure.ac
@@ -607,14 +607,27 @@ 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
AC_MSG_CHECKING(whether to use ARM IWMMXT intrinsics)
xserver_save_CFLAGS=$CFLAGS
-CFLAGS="$IWMMXT_CFLAGS $CFLAGS"
+CFLAGS="$CFLAGS $IWMMXT_CFLAGS"
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
#ifndef __arm__
#error "IWMMXT is only available on ARM"
@@ -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