diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 43d00b5fd3913b205913ebd5f1bcffbed256e5ab..ff6ff49a6c0b443bf1e97fc0a0af55054f23c441 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-28  Paul Brook  <paul@codesourcery.com>
+
+	* config/arm/symbian.h (SUBTARGET_ASM_FLOAT_SPEC): Default to
+	-mfpu=vfp -march=armv5t
+	* config/arm/t-symbian: Change multilib to mfloat-aby=softfp.
+
 2004-08-25  Richard Henderson  <rth@redhat.com>
 
 	* target-def.h (TARGET_SCALAR_MODE_SUPPORTED_P): New.
diff --git a/gcc/config/arm/symbian.h b/gcc/config/arm/symbian.h
index d048652fe01bf48bc978d07e41e58ec729fc65f5..d30e7384a2101385178d165d7b211dbd818c2648 100644
--- a/gcc/config/arm/symbian.h
+++ b/gcc/config/arm/symbian.h
@@ -59,9 +59,8 @@
 #undef SUBTARGET_CPU_DEFAULT
 #define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
 
-/* The assembler should assume the VFP FPU format when the hard-float
-   ABI is in use.  */
+/* The assembler should assume VFP FPU format, and armv5t.  */
 #undef SUBTARGET_ASM_FLOAT_SPEC
 #define SUBTARGET_ASM_FLOAT_SPEC \
-  "%{!mfpu=*:%{mfloat-abi=hard:-mfpu=vfp}}"
+  "%{!mfpu=*:-mfpu=vfp} %{!mcpu=*:%{!march=*:-march=armv5t}}"
   
diff --git a/gcc/config/arm/t-symbian b/gcc/config/arm/t-symbian
index 0c616c52da027b77c6d6d05e4600794b398cf8dd..fba534ce8ef9397b65300e53af5ac0663516f988 100644
--- a/gcc/config/arm/t-symbian
+++ b/gcc/config/arm/t-symbian
@@ -2,6 +2,6 @@
 # multilib for those without -- using the soft-float ABI in both
 # cases.  Symbian OS object should be compiled with interworking
 # enabled, so there are no separate thumb-mode libraries.
-MULTILIB_OPTIONS     = mfloat-abi=hard
-MULTILIB_DIRNAMES    = hard
+MULTILIB_OPTIONS     = mfloat-abi=softfp
+MULTILIB_DIRNAMES    = softfp