* 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".

diff --git a/gas/ChangeLog b/gas/ChangeLog
index fb1206957ec783c3a6881852c4dc5ef1ff497c89..1891d85d3d97cd1d91700fa01b55ef9e72d1725a 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,11 @@
+2005-03-16  Daniel Jacobowitz  <dan@codesourcery.com>
+
+       * 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  <nickc@redhat.com>
            Ben Elliston  <bje@au.ibm.com>
 

diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 5cce0a9a3b6b53d8f42c1e3a5820c3cfac9d8e9f..17a605d543fe684307e32fe787f4319930528d86 100644 (file)
--- 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 (file)
index 0000000..7453593
--- /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 e6abf01cac3a2c3a5ddcf694c994a5181e5ce34b..b3f5f1e78c5d289187dcf20a215555ae2c5cbfbb 100644 (file)
--- 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 0522486b20a84e59f4141fc4ed993aa09697a975..e6090494aacccd22cf8ff5b2bb753d2521176f3d 100644 (file)
--- 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 576e14e95302f42468692464aba1ea7810e32ae1..f180b5230b55a8cc18ed9a63535f39a28246a81b 100644 (file)
--- 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 ;;