(output_return_instruction): Do not create the conditional part of the return instruc...

(output_return_instruction): Do not create the conditional part of the return
instruction, if there is no condition to be used.

From-SVN: r51750

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3cb11a0e53512cda4bebc8890299182ee29b7632..f04f0640134ac011610a62d8ba32df1f1a7f3444 100644 (file)
--- 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 53633dcbdfff9fdcdf23e54394d6c312949963c7..75dd8b2543a060b1af8d99eb9fe9b530c9892259 100644 (file)
--- 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;