arm.c (output_return_instruction): Correctly handle interworking and interrupt functions.

2001-05-24  Philip Blundell  <philb@gnu.org>

	* config/arm/arm.c (output_return_instruction): Correctly handle
	interworking and interrupt functions.

From-SVN: r42543

gcc/ChangeLog

 2001-05-24  Philip Blundell  <philb@gnu.org>
 
+	* config/arm/arm.c (output_return_instruction): Correctly handle
+	interworking and interrupt functions.
+
+2001-05-24  Philip Blundell  <philb@gnu.org>
+
 	* config/arm/arm.h (TARGET_SWITCHES): Correct misleading help for
 	-m{no-}sched-prolog.  Fix typos and improve formatting.
 

gcc/config/arm/arm.c

@@ -7037,6 +7037,8 @@ output_return_instruction (operand, really_return, reverse)
      load a single register.  On other architectures, the cost is the same.
      In 26 bit mode we have to use LDM in order to be able to restore the CPSR.  */
   if ((live_regs_mask  == (1 << LR_REGNUM))
+      && ! TARGET_INTERWORK
+      && ! IS_INTERRUPT (func_type)
       && (! really_return || TARGET_APCS_32))
     {
       if (! really_return)