Index: compiler-rt/trunk/test/builtins/Unit/arm/aeabi_idivmod_test.c
===================================================================
--- compiler-rt/trunk/test/builtins/Unit/arm/aeabi_idivmod_test.c
+++ compiler-rt/trunk/test/builtins/Unit/arm/aeabi_idivmod_test.c
@@ -14,6 +14,7 @@
 #include "int_lib.h"
 #include <stdio.h>
 
+#if __arm__
 // Based on divmodsi4_test.c
 
 extern du_int __aeabi_idivmod(si_int a, si_int b);
@@ -38,10 +39,12 @@
 
     return 0;
 }
+#endif
 
 
 int main()
 {
+#if __arm__
     if (test__aeabi_idivmod(0, 1, 0, 0))
         return 1;
     if (test__aeabi_idivmod(0, -1, 0, 0))
@@ -69,6 +72,9 @@
         return 1;
 	if (test__aeabi_idivmod(0x80000007, 8, 0xf0000001, -1))
         return 1;
+#else
+    printf("skipped\n");
+#endif
 
     return 0;
 }
Index: compiler-rt/trunk/test/builtins/Unit/arm/aeabi_uidivmod_test.c
===================================================================
--- compiler-rt/trunk/test/builtins/Unit/arm/aeabi_uidivmod_test.c
+++ compiler-rt/trunk/test/builtins/Unit/arm/aeabi_uidivmod_test.c
@@ -14,6 +14,7 @@
 #include "int_lib.h"
 #include <stdio.h>
 
+#if __arm__
 // Based on udivmodsi4_test.c
 
 extern du_int __aeabi_uidivmod(su_int a, su_int b);
@@ -38,10 +39,12 @@
 
     return 0;
 }
+#endif
 
 
 int main()
 {
+#if __arm__
     if (test__aeabi_uidivmod(0, 1, 0, 0))
         return 1;
 
@@ -56,6 +59,9 @@
  
  	if (test__aeabi_uidivmod(0x80000003, 8, 0x10000000, 3))
         return 1;
+#else
+    printf("skipped\n");
+#endif
 
 	return 0;
 }
Index: compiler-rt/trunk/test/builtins/Unit/arm/aeabi_uldivmod_test.c
===================================================================
--- compiler-rt/trunk/test/builtins/Unit/arm/aeabi_uldivmod_test.c
+++ compiler-rt/trunk/test/builtins/Unit/arm/aeabi_uldivmod_test.c
@@ -14,6 +14,7 @@
 #include "int_lib.h"
 #include <stdio.h>
 
+#if __arm__
 // Based on udivmoddi4_test.c
 
 COMPILER_RT_ABI void /* __value_in_regs */ __aeabi_uldivmod(du_int a, du_int b);
@@ -20637,14 +20638,19 @@
 {0xFFFFFFFFFFFFFFFFuLL, 0xFFFFFFFFFFFFFFFEuLL, 0x0000000000000001uLL, 0x0000000000000001uLL},
 {0xFFFFFFFFFFFFFFFFuLL, 0xFFFFFFFFFFFFFFFFuLL, 0x0000000000000001uLL, 0x0000000000000000uLL}
 };
+#endif
 
 int main()
 {
+#if __arm__
     const unsigned N = sizeof(tests) / sizeof(tests[0]);
     unsigned i;
     for (i = 0; i < N; ++i)
         if (test_aeabi_uldivmod(tests[i][0], tests[i][1], tests[i][2], tests[i][3]))
             return 1;
+#else
+    printf("skipped\n");
+#endif
 
     return 0;
 }