Backport #973 from trunk:

  Don't allow to specify an ABI for ARM EABI builds: the ABI is implied by the fact we're building for EABI.

 /branches/1.2/arch/arm/functions |   19     3    16     0 +++----------------
 /branches/1.2/arch/arm/config.in |    9     6     3     0 ++++++---
 2 files changed, 9 insertions(+), 19 deletions(-)

1 files changed, 3 insertions, 16 deletions

diff --git a/arch/arm/functions b/arch/arm/functions
index e356524..35db559 100644
--- a/arch/arm/functions
+++ b/arch/arm/functions
@@ -12,20 +12,7 @@ CT_DoArchValues() {
         uClibc,y)   CT_TARGET_SYS=uclibcgnueabi;;
     esac
 
-    case "${CT_ARCH_ABI},${CT_ARCH_ARM_EABI}" in
-        *,) ;;
-        aapcs,y)
-            CT_DoLog DEBUG "'--with-abi=aapcs' is in fact '-mabi=aapcs-linux' when used in CFLAGS."
-            CT_ARCH_ABI_CFLAGS="-mabi=aapcs-linux"
-            ;;
-        ,y)
-            CT_DoLog WARN "Forcing ABI to 'aapcs-linux' for use with EABI."
-            CT_ARCH_WITH_ABI="--with-abi=aapcs"
-            CT_ARCH_ABI_CFLAGS="-mabi=aapcs-linux"
-            ;;
-        *,y)
-            CT_DoLog ERROR "ABI='${CT_ARCH_ABI}' not supported for EABI."
-            CT_Abort "If you know you are right, please edit 'arch/arm/functions' in crosstool-NG sources."
-            ;;
-    esac
+    # In case we're EABI, do *not* specify any ABI!
+    # which means, either we do not have an ABI specified, or we're not EABI.
+    CT_TestOrAbort "Internal error: CT_ARCH_ABI should not be set for EABI build." -z "${CT_ARCH_ABI}" -o -z "${CT_ARCH_ARM_EABI}"
 }