From deeaaff8d2dc3199269774f2cc7011083211d776 Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Wed, 16 Mar 2005 17:27:17 +0000 Subject: [PATCH] * configure.tgt: Set emulation for arm-*-eabi*. * config/tc-arm.c (meabi_flags): Check EABI_DEFAULT. * config/te-armeabi.h: New file. * config/te-armlinuxeabi.h (EABI_DEFAULT): Define. * config/te-symbian.h: Include "te-armeabi.h". --- gas/ChangeLog | 8 ++++++++ gas/config/tc-arm.c | 4 ++++ gas/config/te-armeabi.h | 8 ++++++++ gas/config/te-armlinuxeabi.h | 1 + gas/config/te-symbian.h | 2 +- gas/configure.tgt | 4 ++-- 6 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 gas/config/te-armeabi.h diff --git a/gas/ChangeLog b/gas/ChangeLog index fb1206957ec..1891d85d3d9 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,11 @@ +2005-03-16 Daniel Jacobowitz + + * configure.tgt: Set emulation for arm-*-eabi*. + * config/tc-arm.c (meabi_flags): Check EABI_DEFAULT. + * config/te-armeabi.h: New file. + * config/te-armlinuxeabi.h (EABI_DEFAULT): Define. + * config/te-symbian.h: Include "te-armeabi.h". + 2005-03-16 Nick Clifton Ben Elliston diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c index 5cce0a9a3b6..17a605d543f 100644 --- a/gas/config/tc-arm.c +++ b/gas/config/tc-arm.c @@ -159,7 +159,11 @@ static int march_fpu_opt = -1; static int mfpu_opt = -1; static int mfloat_abi_opt = -1; #ifdef OBJ_ELF +# ifdef EABI_DEFAULT +static int meabi_flags = EABI_DEFAULT; +# else static int meabi_flags = EF_ARM_EABI_UNKNOWN; +# endif #endif /* This array holds the chars that always start a comment. If the diff --git a/gas/config/te-armeabi.h b/gas/config/te-armeabi.h new file mode 100644 index 00000000000..74535931982 --- /dev/null +++ b/gas/config/te-armeabi.h @@ -0,0 +1,8 @@ +/* The EABI requires the use of VFP. */ +#define FPU_DEFAULT FPU_ARCH_VFP_V2 +#define EABI_DEFAULT EF_ARM_EABI_VER4 + +#define LOCAL_LABELS_DOLLAR 1 +#define LOCAL_LABELS_FB 1 + +#include "obj-format.h" diff --git a/gas/config/te-armlinuxeabi.h b/gas/config/te-armlinuxeabi.h index e6abf01cac3..b3f5f1e78c5 100644 --- a/gas/config/te-armlinuxeabi.h +++ b/gas/config/te-armlinuxeabi.h @@ -2,3 +2,4 @@ /* The EABI requires the use of VFP. */ #define FPU_DEFAULT FPU_ARCH_VFP_V2 +#define EABI_DEFAULT EF_ARM_EABI_VER4 diff --git a/gas/config/te-symbian.h b/gas/config/te-symbian.h index 0522486b20a..e6090494aac 100644 --- a/gas/config/te-symbian.h +++ b/gas/config/te-symbian.h @@ -1,3 +1,3 @@ #define TE_SYMBIAN 1 -#include "obj-elf.h" +#include "te-armeabi.h" diff --git a/gas/configure.tgt b/gas/configure.tgt index 576e14e9530..f180b5230b5 100644 --- a/gas/configure.tgt +++ b/gas/configure.tgt @@ -110,12 +110,12 @@ case ${generic_target} in arm-*-coff | thumb-*-coff) fmt=coff ;; arm-*-rtems* | thumb-*-rtems*) fmt=elf ;; arm-*-elf | thumb-*-elf) fmt=elf ;; - arm-*-eabi*) fmt=elf ;; + arm-*-eabi*) fmt=elf em=armeabi ;; arm-*-symbianelf*) fmt=elf em=symbian ;; arm-*-kaos*) fmt=elf ;; arm-*-conix*) fmt=elf ;; arm-*-linux*aout*) fmt=aout em=linux ;; - arm-*-linux-gnueabi*) fmt=elf em=armlinuxeabi ;; + arm-*-linux-gnueabi*) fmt=elf em=armlinuxeabi ;; arm-*-linux-gnu*) fmt=elf em=linux ;; arm-*-uclinux*) fmt=elf em=linux ;; arm-*-netbsdelf*) fmt=elf em=nbsd ;; -- 2.30.2