From d837e19ce836254a4e544de6cfac4c53fa01723e Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Mon, 1 Sep 2008 17:54:39 +0000 Subject: Don't allow to specify an ABI for ARM EABI builds: the ABI is implied by the fact we're building for EABI. /trunk/arch/arm/functions | 19 3 16 0 +++---------------- /trunk/arch/arm/config.in | 9 6 3 0 ++++++--- 2 files changed, 9 insertions(+), 19 deletions(-) --- arch/arm/functions | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'arch/arm/functions') diff --git a/arch/arm/functions b/arch/arm/functions index 5eb4977f..9959277a 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}" } -- cgit v1.2.3