From: Nick Clifton <nickc@gcc.gnu.org>
Date: Tue, 2 Apr 2002 16:44:39 +0000 (+0000)
Subject: Remove previous delta
X-Git-Tag: releases/gcc-3.3.0~5949
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c414f8a95d95f11e2e7dfd6fa0373deb8b01519f;p=thirdparty%2Fgcc.git

Remove previous delta

From-SVN: r51757
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f04f0640134a..3cb11a0e5351 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,9 +1,3 @@
-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 75dd8b2543a0..ba5eb055e67b 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -7209,11 +7209,7 @@ output_return_instruction (operand, really_return, reverse)
   if (current_function_calls_alloca && !really_return)
     abort ();
 
-  /* Construct the conditional part of the instruction(s) to be emitted.  */
-  if (operand)
-    sprintf (conditional, "%%?%%%c0", reverse ? 'D' : 'd');
-  else
-    * conditional = 0;
+  sprintf (conditional, "%%?%%%c0", reverse ? 'D' : 'd');
 
   return_used_this_function = 1;