diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0aad8c8..ed343cd 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,4 +1,9 @@
 2002-09-24  Adam Nemet  <anemet@lnxw.com>
+
+        * config/arm/arm.c (thumb_unexpanded_epilogue): Don't generate
+        epilogue for naked functions.
+
+2002-09-24  Adam Nemet  <anemet@lnxw.com>
             Nick Clifton  <nickc@redhat.com>
 
 	* config/arm/arm.h (THUMB_FUNCTION_PROFILER): Remove.
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index 06f54c0..5eb1fc0 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -9977,6 +9977,9 @@ thumb_unexpanded_epilogue ()
   if (return_used_this_function)
     return "";
 
+  if (IS_NAKED (arm_current_func_type ()))
+    return "";
+
   for (regno = 0; regno <= LAST_LO_REGNUM; regno++)
     if (THUMB_REG_PUSHED_P (regno))
       live_regs_mask |= 1 << regno;