diff -Naur gcc-3.4.4-orig/gcc/config/arm/coff.h gcc-3.4.4/gcc/config/arm/coff.h --- gcc-3.4.4-orig/gcc/config/arm/coff.h 2004-02-24 07:25:22 -0700 +++ gcc-3.4.4/gcc/config/arm/coff.h 2005-06-28 12:45:35 -0600 @@ -31,11 +31,16 @@ #define TARGET_VERSION fputs (" (ARM/coff)", stderr) #undef TARGET_DEFAULT -#define TARGET_DEFAULT (ARM_FLAG_SOFT_FLOAT | ARM_FLAG_APCS_32 | ARM_FLAG_APCS_FRAME | ARM_FLAG_MMU_TRAPS) +#define TARGET_DEFAULT \ + ( ARM_FLAG_SOFT_FLOAT \ + | ARM_FLAG_VFP \ + | ARM_FLAG_APCS_32 \ + | ARM_FLAG_APCS_FRAME \ + | ARM_FLAG_MMU_TRAPS ) #ifndef MULTILIB_DEFAULTS #define MULTILIB_DEFAULTS \ - { "marm", "mlittle-endian", "msoft-float", "mapcs-32", "mno-thumb-interwork" } + { "marm", "mlittle-endian", "mapcs-32", "mno-thumb-interwork" } #endif /* This is COFF, but prefer stabs. */ diff -Naur gcc-3.4.4-orig/gcc/config/arm/elf.h gcc-3.4.4/gcc/config/arm/elf.h --- gcc-3.4.4-orig/gcc/config/arm/elf.h 2004-02-24 07:25:22 -0700 +++ gcc-3.4.4/gcc/config/arm/elf.h 2005-06-28 12:45:44 -0600 @@ -46,7 +46,9 @@ #ifndef SUBTARGET_ASM_FLOAT_SPEC #define SUBTARGET_ASM_FLOAT_SPEC "\ -%{mapcs-float:-mfloat} %{msoft-float:-mfpu=softfpa}" +%{mapcs-float:-mfloat} \ +%{mhard-float:-mfpu=fpa} \ +%{!mhard-float: %{msoft-float:-mfpu=softvfp} %{!msoft-float:-mfpu=softvfp}}" #endif #ifndef ASM_SPEC @@ -106,12 +108,17 @@ #endif #ifndef TARGET_DEFAULT -#define TARGET_DEFAULT (ARM_FLAG_SOFT_FLOAT | ARM_FLAG_APCS_32 | ARM_FLAG_APCS_FRAME | ARM_FLAG_MMU_TRAPS) +#define TARGET_DEFAULT \ + (ARM_FLAG_SOFT_FLOAT \ + | ARM_FLAG_VFP \ + | ARM_FLAG_APCS_32 \ + | ARM_FLAG_APCS_FRAME \ + | ARM_FLAG_MMU_TRAPS ) #endif #ifndef MULTILIB_DEFAULTS #define MULTILIB_DEFAULTS \ - { "marm", "mlittle-endian", "msoft-float", "mapcs-32", "mno-thumb-interwork", "fno-leading-underscore" } + { "marm", "mlittle-endian", "mapcs-32", "mno-thumb-interwork", "fno-leading-underscore" } #endif #define TARGET_ASM_FILE_START_APP_OFF true diff -Naur gcc-3.4.4-orig/gcc/config/arm/linux-elf.h gcc-3.4.4/gcc/config/arm/linux-elf.h --- gcc-3.4.4-orig/gcc/config/arm/linux-elf.h 2005-06-28 09:47:52 -0600 +++ gcc-3.4.4/gcc/config/arm/linux-elf.h 2005-06-28 13:08:36 -0600 @@ -44,20 +44,33 @@ #define TARGET_LINKER_EMULATION "armelf_linux" #endif -/* Default is to use APCS-32 mode. */ +/* + * Default is to use APCS-32 mode with soft-vfp. + * The old Linux default for floats can be achieved with -mhard-float + * or with the configure --with-float=hard option. + * If -msoft-float or --with-float=soft is used then software float + * support will be used just like the default but with the legacy + * big endian word ordering for double float representation instead. + */ #undef TARGET_DEFAULT #define TARGET_DEFAULT \ ( ARM_FLAG_APCS_32 | \ + ARM_FLAG_SOFT_FLOAT | \ + ARM_FLAG_VFP | \ ARM_FLAG_MMU_TRAPS | \ TARGET_ENDIAN_DEFAULT ) +#undef SUBTARGET_EXTRA_ASM_SPEC +#define SUBTARGET_EXTRA_ASM_SPEC "%{mhard-float:-mfpu=fpa} \ +%{!mhard-float: %{msoft-float:-mfpu=softvfp} %{!msoft-float:-mfpu=softvfp}}" + #define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm6 #define SUBTARGET_EXTRA_LINK_SPEC " -m " TARGET_LINKER_EMULATION " -p" #undef MULTILIB_DEFAULTS #define MULTILIB_DEFAULTS \ - { "marm", TARGET_ENDIAN_OPTION, "mhard-float", "mapcs-32", "mno-thumb-interwork" } + { "marm", TARGET_ENDIAN_OPTION, "mapcs-32", "mno-thumb-interwork" } #define CPP_APCS_PC_DEFAULT_SPEC "-D__APCS_32__" @@ -72,7 +85,7 @@ %{shared:-lc} \ %{!shared:%{profile:-lc_p}%{!profile:-lc}}" -#define LIBGCC_SPEC "%{msoft-float:-lfloat} -lgcc" +#define LIBGCC_SPEC "-lgcc" /* Provide a STARTFILE_SPEC appropriate for GNU/Linux. Here we add the GNU/Linux magical crtbegin.o file (see crtstuff.c) which diff -Naur gcc-3.4.4-orig/gcc/config/arm/t-linux gcc-3.4.4/gcc/config/arm/t-linux --- gcc-3.4.4-orig/gcc/config/arm/t-linux 2003-09-20 15:09:07 -0600 +++ gcc-3.4.4/gcc/config/arm/t-linux 2005-06-28 13:09:46 -0600 @@ -4,7 +4,10 @@ LIBGCC2_DEBUG_CFLAGS = -g0 LIB1ASMSRC = arm/lib1funcs.asm -LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx +LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx \ + _negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \ + _truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \ + _fixsfsi _fixunssfsi # MULTILIB_OPTIONS = mhard-float/msoft-float # MULTILIB_DIRNAMES = hard-float soft-float diff -Naur gcc-3.4.4-orig/gcc/config/arm/unknown-elf.h gcc-3.4.4/gcc/config/arm/unknown-elf.h --- gcc-3.4.4-orig/gcc/config/arm/unknown-elf.h 2004-02-24 07:25:22 -0700 +++ gcc-3.4.4/gcc/config/arm/unknown-elf.h 2005-06-28 13:13:09 -0600 @@ -30,7 +30,12 @@ /* Default to using APCS-32 and software floating point. */ #ifndef TARGET_DEFAULT -#define TARGET_DEFAULT (ARM_FLAG_SOFT_FLOAT | ARM_FLAG_APCS_32 | ARM_FLAG_APCS_FRAME | ARM_FLAG_MMU_TRAPS) +#define TARGET_DEFAULT \ + ( ARM_FLAG_SOFT_FLOAT \ + | ARM_FLAG_VFP \ + | ARM_FLAG_APCS_32 \ + | ARM_FLAG_APCS_FRAME \ + | ARM_FLAG_MMU_TRAPS ) #endif /* Now we define the strings used to build the spec file. */ diff -Naur gcc-3.4.4-orig/gcc/config/arm/xscale-elf.h gcc-3.4.4/gcc/config/arm/xscale-elf.h --- gcc-3.4.4-orig/gcc/config/arm/xscale-elf.h 2003-07-01 17:26:43 -0600 +++ gcc-3.4.4/gcc/config/arm/xscale-elf.h 2005-06-28 13:15:15 -0600 @@ -51,9 +51,9 @@ #define SUBTARGET_EXTRA_ASM_SPEC "%{!mcpu=*:-mcpu=xscale} \ %{mhard-float:-mfpu=fpa} \ - %{!mhard-float: %{msoft-float:-mfpu=softfpa;:-mfpu=softvfp}}" + %{!mhard-float: %{msoft-float:-mfpu=softvfp} %{!msoft-float:-mfpu=softvfp}}" #ifndef MULTILIB_DEFAULTS #define MULTILIB_DEFAULTS \ - { "mlittle-endian", "mno-thumb-interwork", "marm", "msoft-float" } + { "mlittle-endian", "mno-thumb-interwork", "marm" } #endif