aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/config/arm/arm.c5
2 files changed, 10 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3cb11a0..f04f064 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2002-04-02 Nick Clifton <nickc@cambridge.redhat.com>
+
+ * config/arm/arm.c (output_return_instruction): Do not create the
+ conditional part of the return instruction, if there is no
+ condition to be used.
+
Tue Apr 2 06:47:40 2002 Richard Kenner <kenner@vlsi1.ultra.nyu.edu>
* stor-layout.c (layout_type, case ARRAY_TYPE): Give one-element array
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index 53633dc..75dd8b2 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -7210,7 +7210,10 @@ output_return_instruction (operand, really_return, reverse)
abort ();
/* Construct the conditional part of the instruction(s) to be emitted. */
- sprintf (conditional, "%%?%%%c0", reverse ? 'D' : 'd');
+ if (operand)
+ sprintf (conditional, "%%?%%%c0", reverse ? 'D' : 'd');
+ else
+ * conditional = 0;
return_used_this_function = 1;