From 45eb4c1b77d62e66daf78a5dddf43fd8413d68df Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Fri, 1 May 2009 14:44:17 +0000 Subject: [PATCH] * config/tc-armlinux-eabi.h (FPU_DEFAULT): Default to plain VFP. * config/tc-armeabi.h (FPU_DEFAULT): Likewise. * config/tc-arm.c (md_begin): If FPU_DEFAULT is set, don't infer the default FPU from the processor. testsuite/ * gas/arm/attr-mcpu.d: Add -mfpu=neon. * gas/arm/mapmisc.d: Correct expected output for .double and .dcb.d. --- gas/ChangeLog | 7 +++++++ gas/config/tc-arm.c | 3 ++- gas/config/te-armeabi.h | 2 +- gas/config/te-armlinuxeabi.h | 2 +- gas/testsuite/ChangeLog | 7 +++++++ gas/testsuite/gas/arm/attr-mcpu.d | 2 +- gas/testsuite/gas/arm/mapmisc.d | 10 +++++----- 7 files changed, 24 insertions(+), 9 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 7ac1bf5f21..b5c8270164 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,10 @@ +2009-05-01 Nathan Sidwell + + * config/tc-armlinux-eabi.h (FPU_DEFAULT): Default to plain VFP. + * config/tc-armeabi.h (FPU_DEFAULT): Likewise. + * config/tc-arm.c (md_begin): If FPU_DEFAULT is set, don't infer + the default FPU from the processor. + 2009-05-01 Julian Brown * config/tc-arm.c (do_t_blx): Always use BFD_RELOC_THUMB_PCREL_BLX. diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c index 6615acafde..21de2b3329 100644 --- a/gas/config/tc-arm.c +++ b/gas/config/tc-arm.c @@ -20274,7 +20274,8 @@ md_begin (void) } else if (!mfpu_opt) { -#if !(defined (TE_LINUX) || defined (TE_NetBSD) || defined (TE_VXWORKS)) +#if !(defined (EABI_DEFAULT) || defined (TE_LINUX) \ + || defined (TE_NetBSD) || defined (TE_VXWORKS)) /* Some environments specify a default FPU. If they don't, infer it from the processor. */ if (mcpu_fpu_opt) diff --git a/gas/config/te-armeabi.h b/gas/config/te-armeabi.h index c553bed798..6a76304add 100644 --- a/gas/config/te-armeabi.h +++ b/gas/config/te-armeabi.h @@ -18,7 +18,7 @@ 02110-1301, USA. */ /* The EABI requires the use of VFP. */ -#define FPU_DEFAULT FPU_ARCH_VFP_V2 +#define FPU_DEFAULT FPU_ARCH_VFP #define EABI_DEFAULT EF_ARM_EABI_VER5 #define LOCAL_LABELS_DOLLAR 1 diff --git a/gas/config/te-armlinuxeabi.h b/gas/config/te-armlinuxeabi.h index 3b596ace94..ac2b2ad04f 100644 --- a/gas/config/te-armlinuxeabi.h +++ b/gas/config/te-armlinuxeabi.h @@ -20,5 +20,5 @@ #include "te-linux.h" /* The EABI requires the use of VFP. */ -#define FPU_DEFAULT FPU_ARCH_VFP_V2 +#define FPU_DEFAULT FPU_ARCH_VFP #define EABI_DEFAULT EF_ARM_EABI_VER5 diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index ad97bc95cb..e7a526c744 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2009-05-01 Nathan Sidwell + Daniel Jacobowitz + + * gas/arm/attr-mcpu.d: Add -mfpu=neon. + * gas/arm/mapmisc.d: Correct expected output for .double and + .dcb.d. + 2009-04-20 Jan Beulich * gas/i386/equ.s: Adjust. diff --git a/gas/testsuite/gas/arm/attr-mcpu.d b/gas/testsuite/gas/arm/attr-mcpu.d index 484353fea9..80cb168cff 100644 --- a/gas/testsuite/gas/arm/attr-mcpu.d +++ b/gas/testsuite/gas/arm/attr-mcpu.d @@ -1,6 +1,6 @@ # name: EABI attributes from command line # source: blank.s -# as: -mcpu=cortex-a8 +# as: -mcpu=cortex-a8 -mfpu=neon # readelf: -A # This test is only valid on EABI based ports. # target: *-*-*eabi diff --git a/gas/testsuite/gas/arm/mapmisc.d b/gas/testsuite/gas/arm/mapmisc.d index 0d8527c15b..b2954b72eb 100644 --- a/gas/testsuite/gas/arm/mapmisc.d +++ b/gas/testsuite/gas/arm/mapmisc.d @@ -1,4 +1,4 @@ -#as: -EL -I$srcdir/$subdir +#as: -EL -I$srcdir/$subdir -mfpu=neon #objdump: --syms --special-syms -d #name: ARM Mapping Symbols for miscellaneous directives # This test is only valid on EABI based ports. @@ -74,11 +74,11 @@ Disassembly of section .text: 50: e1a00000 nop \(mov r0,r0\) 54: 40200000 .word 0x40200000 58: e1a00000 nop \(mov r0,r0\) - 5c: 400c0000 .word 0x400c0000 - 60: 00000000 .word 0x00000000 + 5c: 00000000 .word 0x00000000 + 60: 400c0000 .word 0x400c0000 64: e1a00000 nop \(mov r0,r0\) - 68: 40120000 .word 0x40120000 - 6c: 00000000 .word 0x00000000 + 68: 00000000 .word 0x00000000 + 6c: 40120000 .word 0x40120000 70: e1a00000 nop \(mov r0,r0\) 74: 00000004 .word 0x00000004 78: 00000004 .word 0x00000004 -- 2.34.1