1.1 --- a/arch/arm/functions	Mon Aug 11 12:22:47 2008 +0000
     1.2 +++ b/arch/arm/functions	Mon Sep 01 17:54:39 2008 +0000
     1.3 @@ -12,20 +12,7 @@
     1.4          uClibc,y)   CT_TARGET_SYS=uclibcgnueabi;;
     1.5      esac
     1.6  
     1.7 -    case "${CT_ARCH_ABI},${CT_ARCH_ARM_EABI}" in
     1.8 -        *,) ;;
     1.9 -        aapcs,y)
    1.10 -            CT_DoLog DEBUG "'--with-abi=aapcs' is in fact '-mabi=aapcs-linux' when used in CFLAGS."
    1.11 -            CT_ARCH_ABI_CFLAGS="-mabi=aapcs-linux"
    1.12 -            ;;
    1.13 -        ,y)
    1.14 -            CT_DoLog WARN "Forcing ABI to 'aapcs-linux' for use with EABI."
    1.15 -            CT_ARCH_WITH_ABI="--with-abi=aapcs"
    1.16 -            CT_ARCH_ABI_CFLAGS="-mabi=aapcs-linux"
    1.17 -            ;;
    1.18 -        *,y)
    1.19 -            CT_DoLog ERROR "ABI='${CT_ARCH_ABI}' not supported for EABI."
    1.20 -            CT_Abort "If you know you are right, please edit 'arch/arm/functions' in crosstool-NG sources."
    1.21 -            ;;
    1.22 -    esac
    1.23 +    # In case we're EABI, do *not* specify any ABI!
    1.24 +    # which means, either we do not have an ABI specified, or we're not EABI.
    1.25 +    CT_TestOrAbort "Internal error: CT_ARCH_ABI should not be set for EABI build." -z "${CT_ARCH_ABI}" -o -z "${CT_ARCH_ARM_EABI}"
    1.26  }