diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 098a39d248d..6317830cd78 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+Fri Apr  4 15:58:52 2003  J"orn Rennecke <joern.rennecke@superh.com>
+
+	* sh.h (ACTUAL_NORMAL_MODE): New macro, broken out of
+	(NORMAL_MODE).
+	* sh.c (fpscr_set_from_mem): Use ACTUAL_NORMAL_MODE.
+
 2003-04-04  Gerald Pfeifer  <pfeifer@dbai.tuwien.ac.at>
 	
 	* doc/contrib.texi (Contributors): Add entries for Wolfgang
diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c
index e4a55de1acc..54ad2cfba00 100644
--- a/gcc/config/sh/sh.c
+++ b/gcc/config/sh/sh.c
@@ -7180,7 +7180,7 @@ fpscr_set_from_mem (mode, regs_live)
   enum attr_fp_mode fp_mode = mode;
   rtx addr_reg = get_free_reg (regs_live);
 
-  if (fp_mode == (enum attr_fp_mode) NORMAL_MODE (FP_MODE))
+  if (fp_mode == (enum attr_fp_mode) ACTUAL_NORMAL_MODE (FP_MODE))
     emit_insn (gen_fpu_switch1 (addr_reg));
   else
     emit_insn (gen_fpu_switch0 (addr_reg));
diff --git a/gcc/config/sh/sh.h b/gcc/config/sh/sh.h
index c2f3160dfc5..1b2f3816e1c 100644
--- a/gcc/config/sh/sh.h
+++ b/gcc/config/sh/sh.h
@@ -3288,10 +3288,12 @@ extern int rtx_equal_function_value_matters;
 
 #define OPTIMIZE_MODE_SWITCHING(ENTITY) TARGET_SH4
 
+#define ACTUAL_NORMAL_MODE(ENTITY) \
+  (TARGET_FPU_SINGLE ? FP_MODE_SINGLE : FP_MODE_DOUBLE)
+
 #define NORMAL_MODE(ENTITY) \
   (sh_cfun_interrupt_handler_p () ? FP_MODE_NONE \
-   : TARGET_FPU_SINGLE ? FP_MODE_SINGLE \
-   : FP_MODE_DOUBLE)
+   : ACTUAL_NORMAL_MODE (ENTITY))
 
 #define EPILOGUE_USES(REGNO)       ((TARGET_SH2E || TARGET_SH4)		\
 				    && (REGNO) == FPSCR_REG)