diff -r 1161ea79915b -r 069f43a215cc config/arch/arm.in.2
--- a/config/arch/arm.in.2	Thu Jan 10 00:11:17 2013 +0100
+++ b/config/arch/arm.in.2	Wed Jun 25 23:33:01 2014 +0200
@@ -39,12 +39,27 @@
       NOTE: Interworking in crosstool-NG is not sell-tested. Use at your
             own risks, and report success and/or failure.
 
+# Until we only support EABI:
+config ARCH_ARM_ABI_OK
+    def_bool y
+    depends on ! ARCH_ARM_EABI
+    select ARCH_SUPPORTS_WITH_ABI
+
+# Little trick to force EABI *and* always show the prompt
+config ARCH_ARM_EABI_FORCE
+    bool
+    default y if ! OBSOLETE
+    select ARCH_ARM_EABI
+
 config ARCH_ARM_EABI
     bool
     prompt "Use EABI"
     default y
     help
       Set up the toolchain so that it generates EABI-compliant binaries.
+      
+      If you say 'n' here, then the toolchain will generate OABI binaries.
+      OABI has long been deprecated, and is now considered legacy.
 
 config ARCH_ARM_TUPLE_USE_EABIHF
     bool
@@ -76,9 +91,3 @@
 
       Say 'n', unless you are trying to fix gcc to properly recognise
       the *eabihf tuples.
-
-config ARCH_ARM_ABI_OK
-    bool
-    default y
-    depends on ! ARCH_ARM_EABI
-    select ARCH_SUPPORTS_WITH_ABI