pixman: Branch 'master' - 2 commits
Matt Turner
mattst88 at kemper.freedesktop.org
Thu Oct 6 14:57:02 PDT 2011
configure.ac | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 741eb8462c3ff72cbf2d9acfeb1e97208a414fcd
Author: Matt Turner <mattst88 at gmail.com>
Date: Thu Oct 6 17:56:09 2011 -0400
Correct the minimum gcc version needed for iwmmxt
Spotted by Søren Sandmann.
Signed-off-by: Matt Turner <mattst88 at gmail.com>
diff --git a/configure.ac b/configure.ac
index 471a127..6f5aef5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -555,7 +555,7 @@ AC_COMPILE_IFELSE([
#ifndef __arm__
#error "IWMMXT is only available on ARM"
#endif
-#if defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 3 && __GNUC_MINOR__ < 6))
+#if defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6))
#error "Need GCC >= 4.6 for IWMMXT intrinsics"
#endif
#include <mmintrin.h>
commit 0a34277180d29f471a2554afc2e2b682fee33c79
Author: Matt Turner <mattst88 at gmail.com>
Date: Wed Oct 5 22:54:36 2011 -0400
Make sure iwMMXt is only detected on ARM
iwMMXt is incorrectly detected on x86 and amd64. This happens because
the test uses standard _mm_* intrinsic functions which it compiles with
-march=iwmmxt, but when the user has set CFLAGS=-march=k8 for instance,
no error is generated from -march=iwmmxt, even though it's not a valid
flag on x86/amd64. Passing CFLAGS=-march=native does not override the
-march=iwmmxt flag though, which is why it wasn't noticed before.
So, just #error out in the test if the __arm__ preprocessor directive
isn't defined.
Fixes https://bugs.gentoo.org/show_bug.cgi?id=385179
Signed-off-by: Matt Turner <mattst88 at gmail.com>
diff --git a/configure.ac b/configure.ac
index 481d0bb..471a127 100644
--- a/configure.ac
+++ b/configure.ac
@@ -552,6 +552,9 @@ AC_MSG_CHECKING(whether to use ARM IWMMXT intrinsics)
xserver_save_CFLAGS=$CFLAGS
CFLAGS="$IWMMXT_CFLAGS $CFLAGS"
AC_COMPILE_IFELSE([
+#ifndef __arm__
+#error "IWMMXT is only available on ARM"
+#endif
#if defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 3 && __GNUC_MINOR__ < 6))
#error "Need GCC >= 4.6 for IWMMXT intrinsics"
#endif
More information about the xorg-commit
mailing list