aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Earnshaw <rearnsha@arm.com>2005-01-05 16:56:49 +0000
committerPaul Brook <paul@codesourcery.com>2005-01-05 16:56:49 +0000
commitd014edcb7bcb56bdfdba14654a1fc4be93fda0ef (patch)
tree6ce68af6260642a38545b201a7321b6449311188
parent9ae793df4972d8c7e1a0cac03889e4cbd09d2a23 (diff)
2004-01-05 Richard Earnshaw <rearnsha@arm.com>
Backport form mainline. * arm.h (TARGET_OPTIONS): Correctly record -mhard-float and -msoft-float in target_float_switch. * arm.c (arm_override_options): Fix processing of target_float_switch. git-svn-id: https://gcc.gnu.org/svn/gcc/branches/csl-arm-2004-q3-branch@92955 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog.csl-arm7
-rw-r--r--gcc/config/arm/arm.c2
-rw-r--r--gcc/config/arm/arm.h4
3 files changed, 10 insertions, 3 deletions
diff --git a/gcc/ChangeLog.csl-arm b/gcc/ChangeLog.csl-arm
index b8c70027dba..79b2c7c345a 100644
--- a/gcc/ChangeLog.csl-arm
+++ b/gcc/ChangeLog.csl-arm
@@ -1,3 +1,10 @@
+2004-01-05 Richard Earnshaw <rearnsha@arm.com>
+
+ Backport form mainline.
+ * arm.h (TARGET_OPTIONS): Correctly record -mhard-float and
+ -msoft-float in target_float_switch.
+ * arm.c (arm_override_options): Fix processing of target_float_switch.
+
2004-12-08 Paul Brook <paul@codesourcery.com>
* config/arm/unwind-arm.c (selfrel_offset): remove.
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index 4feca593f86..8a0441d6717 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -1073,7 +1073,7 @@ arm_override_options (void)
else if (target_float_switch)
{
/* This is a bit of a hack to avoid needing target flags for these. */
- if (target_float_switch[1] == 'h')
+ if (target_float_switch[0] == 'h')
arm_float_abi = ARM_FLOAT_ABI_HARD;
else
arm_float_abi = ARM_FLOAT_ABI_SOFT;
diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h
index 10cfb9ad1c6..1354afa5f4f 100644
--- a/gcc/config/arm/arm.h
+++ b/gcc/config/arm/arm.h
@@ -394,9 +394,9 @@ extern GTY(()) rtx aof_pic_label;
N_("Specify the register to be used for PIC addressing"), 0}, \
{"abi=", &target_abi_name, N_("Specify an ABI"), 0}, \
{"soft-float", &target_float_switch, \
- N_("Alias for -mfloat-abi=soft"), 0}, \
+ N_("Alias for -mfloat-abi=soft"), "s"}, \
{"hard-float", &target_float_switch, \
- N_("Alias for -mfloat-abi=hard"), 0} \
+ N_("Alias for -mfloat-abi=hard"), "h"} \
}
/* Support for a compile-time default CPU, et cetera. The rules are: