From c820d41869a60c8b043d4cfe104b0df39d1eb650 Mon Sep 17 00:00:00 2001 From: Mark Mitchell Date: Fri, 3 Dec 2004 01:22:15 +0000 Subject: [PATCH] * Makefile.am (TARG_ENV_HFILES): Add te-armlinuxeabi.h. * configure.in: Use it for arm*-*-linux-gnueabi*. * config/tc-arm.c: Allow emulation file to set FPU_DEFAULT. * config/te-armlinuxeabi.h: New file. * Makefile.in: Regenerated. * aclocal.m4: Likewise. * configure: Likewise. * doc/Makefile.in: Regenerated. --- gas/ChangeLog | 11 +++++++++++ gas/Makefile.am | 1 + gas/Makefile.in | 3 ++- gas/aclocal.m4 | 4 ++-- gas/config/tc-arm.c | 30 ++++++++++++++---------------- gas/config/te-armlinuxeabi.h | 4 ++++ gas/configure | 1 + gas/configure.in | 1 + gas/doc/Makefile.in | 2 +- 9 files changed, 37 insertions(+), 20 deletions(-) create mode 100644 gas/config/te-armlinuxeabi.h diff --git a/gas/ChangeLog b/gas/ChangeLog index 17247a172b..5603ae8a06 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,14 @@ +2004-12-01 Mark Mitchell + + * Makefile.am (TARG_ENV_HFILES): Add te-armlinuxeabi.h. + * configure.in: Use it for arm*-*-linux-gnueabi*. + * config/tc-arm.c: Allow emulation file to set FPU_DEFAULT. + * config/te-armlinuxeabi.h: New file. + * Makefile.in: Regenerated. + * aclocal.m4: Likewise. + * configure: Likewise. + * doc/Makefile.in: Regenerated. + 2004-12-02 Bob Wilson * config/tc-xtensa.c (xtensa_switch_section_emit_state): Use subseg_set. diff --git a/gas/Makefile.am b/gas/Makefile.am index f9bd1f6188..f91d15a4a4 100644 --- a/gas/Makefile.am +++ b/gas/Makefile.am @@ -372,6 +372,7 @@ OBJ_FORMAT_HFILES = \ TARG_ENV_HFILES = \ config/te-386bsd.h \ + config/te-armlinuxeabi.h \ config/te-aux.h \ config/te-delta.h \ config/te-delt88.h \ diff --git a/gas/Makefile.in b/gas/Makefile.in index fe24efeb03..4f1612a4b6 100644 --- a/gas/Makefile.in +++ b/gas/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.2 from Makefile.am. +# Makefile.in generated by automake 1.9.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -599,6 +599,7 @@ OBJ_FORMAT_HFILES = \ # Emulation header files in config TARG_ENV_HFILES = \ config/te-386bsd.h \ + config/te-armlinuxeabi.h \ config/te-aux.h \ config/te-delta.h \ config/te-delt88.h \ diff --git a/gas/aclocal.m4 b/gas/aclocal.m4 index eeef70b529..bc4905ed98 100644 --- a/gas/aclocal.m4 +++ b/gas/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.9.2 -*- Autoconf -*- +# generated automatically by aclocal 1.9.3 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 # Free Software Foundation, Inc. @@ -40,7 +40,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.9.2])]) + [AM_AUTOMAKE_VERSION([1.9.3])]) # AM_AUX_DIR_EXPAND diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c index 6c136375b9..ff2e4aafcd 100644 --- a/gas/config/tc-arm.c +++ b/gas/config/tc-arm.c @@ -115,23 +115,21 @@ enum arm_float_abi #endif #endif -#ifdef TE_LINUX -#define FPU_DEFAULT FPU_ARCH_FPA -#endif - -#ifdef TE_NetBSD -#ifdef OBJ_ELF -#define FPU_DEFAULT FPU_ARCH_VFP /* Soft-float, but VFP order. */ -#else -/* Legacy a.out format. */ -#define FPU_DEFAULT FPU_ARCH_FPA /* Soft-float, but FPA order. */ -#endif -#endif - -/* For backwards compatibility we default to the FPA. */ #ifndef FPU_DEFAULT -#define FPU_DEFAULT FPU_ARCH_FPA -#endif +# ifdef TE_LINUX +# define FPU_DEFAULT FPU_ARCH_FPA +# elif defined (TE_NetBSD) +# ifdef OBJ_ELF +# define FPU_DEFAULT FPU_ARCH_VFP /* Soft-float, but VFP order. */ +# else + /* Legacy a.out format. */ +# define FPU_DEFAULT FPU_ARCH_FPA /* Soft-float, but FPA order. */ +# endif +# else + /* For backwards compatibility, default to FPA. */ +# define FPU_DEFAULT FPU_ARCH_FPA +# endif +#endif /* ifndef FPU_DEFAULT */ #define streq(a, b) (strcmp (a, b) == 0) #define skip_whitespace(str) while (*(str) == ' ') ++(str) diff --git a/gas/config/te-armlinuxeabi.h b/gas/config/te-armlinuxeabi.h new file mode 100644 index 0000000000..e6abf01cac --- /dev/null +++ b/gas/config/te-armlinuxeabi.h @@ -0,0 +1,4 @@ +#include "te-linux.h" + +/* The EABI requires the use of VFP. */ +#define FPU_DEFAULT FPU_ARCH_VFP_V2 diff --git a/gas/configure b/gas/configure index e076a38d06..829692be92 100755 --- a/gas/configure +++ b/gas/configure @@ -4270,6 +4270,7 @@ _ACEOF arm-*-kaos*) fmt=elf ;; arm*-*-conix*) fmt=elf ;; arm-*-linux*aout*) fmt=aout em=linux ;; + 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 ;; diff --git a/gas/configure.in b/gas/configure.in index b79617af2b..b2afeae5c8 100644 --- a/gas/configure.in +++ b/gas/configure.in @@ -216,6 +216,7 @@ changequote([,])dnl arm-*-kaos*) fmt=elf ;; arm*-*-conix*) fmt=elf ;; arm-*-linux*aout*) fmt=aout em=linux ;; + 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 ;; diff --git a/gas/doc/Makefile.in b/gas/doc/Makefile.in index 244cb17a39..0fcee224fc 100644 --- a/gas/doc/Makefile.in +++ b/gas/doc/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.2 from Makefile.am. +# Makefile.in generated by automake 1.9.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,