diff -r 2fa4b675a9a3 -r 07ec15b050a3 arch/arm/functions
--- a/arch/arm/functions	Fri Sep 14 21:50:30 2007 +0000
+++ b/arch/arm/functions	Wed May 14 17:59:52 2008 +0000
@@ -11,4 +11,21 @@
         uClibc,)    CT_TARGET_SYS=uclibc;;
         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
 }