1.1 --- a/config/arch/arm.in.2	Thu Jan 10 00:11:17 2013 +0100
     1.2 +++ b/config/arch/arm.in.2	Thu Jan 10 00:27:13 2013 +0100
     1.3 @@ -39,12 +39,27 @@
     1.4        NOTE: Interworking in crosstool-NG is not sell-tested. Use at your
     1.5              own risks, and report success and/or failure.
     1.6  
     1.7 +# Until we only support EABI:
     1.8 +config ARCH_ARM_ABI_OK
     1.9 +    def_bool y
    1.10 +    depends on ! ARCH_ARM_EABI
    1.11 +    select ARCH_SUPPORTS_WITH_ABI
    1.12 +
    1.13 +# Little trick to force EABI *and* always show the prompt
    1.14 +config ARCH_ARM_EABI_FORCE
    1.15 +    bool
    1.16 +    default y if ! OBSOLETE
    1.17 +    select ARCH_ARM_EABI
    1.18 +
    1.19  config ARCH_ARM_EABI
    1.20      bool
    1.21      prompt "Use EABI"
    1.22      default y
    1.23      help
    1.24        Set up the toolchain so that it generates EABI-compliant binaries.
    1.25 +      
    1.26 +      If you say 'n' here, then the toolchain will generate OABI binaries.
    1.27 +      OABI has long been deprecated, and is now considered legacy.
    1.28  
    1.29  config ARCH_ARM_TUPLE_USE_EABIHF
    1.30      bool
    1.31 @@ -76,9 +91,3 @@
    1.32  
    1.33        Say 'n', unless you are trying to fix gcc to properly recognise
    1.34        the *eabihf tuples.
    1.35 -
    1.36 -config ARCH_ARM_ABI_OK
    1.37 -    bool
    1.38 -    default y
    1.39 -    depends on ! ARCH_ARM_EABI
    1.40 -    select ARCH_SUPPORTS_WITH_ABI