diff -r 07ec15b050a3 -r 918cc0a7bd0a arch/arm/functions
--- a/arch/arm/functions	Wed May 14 17:59:52 2008 +0000
+++ b/arch/arm/functions	Fri Sep 05 11:16:26 2008 +0000
@@ -12,20 +12,7 @@
         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}"
 }