diff -r 2761b358f9e6 -r d43c250051c7 arch/arm/config.in
--- a/arch/arm/config.in	Fri Jun 27 15:08:43 2008 +0000
+++ b/arch/arm/config.in	Mon Sep 01 17:54:39 2008 +0000
@@ -4,7 +4,6 @@
     select ARCH_SUPPORTS_BOTH_ENDIAN
     select ARCH_DEFAULT_LE
     select ARCH_SUPPORT_ARCH
-    select ARCH_SUPPORT_ABI
     select ARCH_SUPPORT_CPU
     select ARCH_SUPPORT_TUNE
     select ARCH_SUPPORT_FPU
@@ -20,5 +19,9 @@
     help
       Set up the toolchain so that it generates EABI-compliant binaries.
 
-config ARCH_ABI
-    default "aapcs" if ARCH_ARM_EABI
+config ARCH_ARM_ABI_OK
+    bool
+    default y
+    depends on ! ARCH_ARM_EABI
+    select ARCH_SUPPORT_ABI
+