--- configure.ac.old	2009-12-26 03:03:27.116068708 +0000
+++ configure.ac	2009-12-26 03:06:42.876068440 +0000
@@ -363,18 +363,13 @@
 
 dnl ===========================================================================
 dnl Check for ARM SIMD instructions
-ARM_SIMD_CFLAGS="-mcpu=arm1136j-s"
-
 have_arm_simd=no
 AC_MSG_CHECKING(whether to use ARM SIMD assembler)
-xserver_save_CFLAGS=$CFLAGS
-CFLAGS="$ARM_SIMD_CFLAGS $CFLAGS"
 AC_COMPILE_IFELSE([
 int main () {
     asm("uqadd8 r1, r1, r2");
     return 0;
 }], have_arm_simd=yes)
-CFLAGS=$xserver_save_CFLAGS
 
 AC_ARG_ENABLE(arm-simd,
    [AC_HELP_STRING([--disable-arm-simd],
@@ -404,18 +399,15 @@
 dnl Check if assembler is gas compatible and supports NEON instructions
 have_arm_neon=no
 AC_MSG_CHECKING(whether to use ARM NEON assembler)
-xserver_save_CFLAGS=$CFLAGS
-CFLAGS="-x assembler-with-cpp"
-AC_COMPILE_IFELSE([[
-.text
-.fpu neon
-.altmacro
+AC_COMPILE_IFELSE([
 #ifndef __ARM_EABI__
 #error EABI is required (to be sure that calling conventions are compatible)
 #endif
-pld [r0]
-vmovn.u16 d0, q0]], have_arm_neon=yes)
-CFLAGS=$xserver_save_CFLAGS
+int main () {
+    asm("pld r0");
+    asm("vmovn.u16 d0, q0");
+    return 0;
+}], have_arm_neon=yes)
 
 AC_ARG_ENABLE(arm-neon,
    [AC_HELP_STRING([--disable-arm-neon],