diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c70dc0abb64..ebda5b141dc 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,15 @@
+2001-01-15  Richard Earnshaw  <rearnsha@arm.com>
+
+	* arm.c (use_return_insn): Don't try to determine the function type
+	until after reload has completed.
+	(arm_output_epilogue): Don't adjust the sp value recovered from the
+	stack.
+	(emit_multi_reg_push): Don't record dwarf information for the pc.
+	* arm.md (eh_epilogue): The function type may have changed, so it
+	needs to be recalculated.
+	* arm/netbsd.h (DWARF2_UNWIND_INFO): Delete.  Can now use dwarf2 
+	unwind tables on arm/netbsd.
+
 2001-01-15  Richard Earnshaw  <rearnsha@arm.com>
 
 	* arm.md (cbranchsi4): Correct calculation of branch ranges.
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index 30335db2b19..0605d5feee0 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -820,12 +820,14 @@ use_return_insn (iscond)
      int iscond;
 {
   int regno;
-  unsigned int func_type = arm_current_func_type ();
+  unsigned int func_type;
 
   /* Never use a return instruction before reload has run.  */
   if (!reload_completed)
     return 0;
       
+  func_type = arm_current_func_type ();
+
   /* Naked functions, volatile functiond and interrupt
      functions all need special consideration.  */
   if (func_type & (ARM_FT_INTERRUPT | ARM_FT_VOLATILE | ARM_FT_NAKED))
@@ -7492,10 +7494,12 @@ arm_output_epilogue (really_return)
 	}
     }
 
+#if 0
   if (ARM_FUNC_TYPE (func_type) == ARM_FT_EXCEPTION_HANDLER)
     /* Adjust the stack to remove the exception handler stuff.  */
     asm_fprintf (f, "\tadd\t%r, %r, %r\n", SP_REGNUM, SP_REGNUM,
 		 REGNO (eh_ofs));
+#endif
 
   if (! really_return)
     return "";
@@ -7579,6 +7583,7 @@ emit_multi_reg_push (mask)
      int mask;
 {
   int num_regs = 0;
+  int num_dwarf_regs;
   int i, j;
   rtx par;
   rtx dwarf;
@@ -7592,6 +7597,11 @@ emit_multi_reg_push (mask)
   if (num_regs == 0 || num_regs > 16)
     abort ();
 
+  /* We don't record the PC in the dwarf frame information.  */
+  num_dwarf_regs = num_regs;
+  if (mask & (1 << PC_REGNUM))
+    num_dwarf_regs--;
+
   /* For the body of the insn we are going to generate an UNSPEC in
      parallel with several USEs.  This allows the insn to be recognised
      by the push_multi pattern in the arm.md file.  The insn looks
@@ -7619,14 +7629,13 @@ emit_multi_reg_push (mask)
            (set (mem:SI (plus:SI (reg:SI sp) (const_int 4))) (reg:SI fp))
            (set (mem:SI (plus:SI (reg:SI sp) (const_int 8))) (reg:SI ip))
            (set (mem:SI (plus:SI (reg:SI sp) (const_int 12))) (reg:SI lr))
-           (set (mem:SI (plus:SI (reg:SI sp) (const_int 16))) (reg:SI pc))
         ])
 
       This sequence is used both by the code to support stack unwinding for
       exceptions handlers and the code to generate dwarf2 frame debugging.  */
   
   par = gen_rtx_PARALLEL (VOIDmode, rtvec_alloc (num_regs));
-  dwarf = gen_rtx_SEQUENCE (VOIDmode, rtvec_alloc (num_regs + 1));
+  dwarf = gen_rtx_SEQUENCE (VOIDmode, rtvec_alloc (num_dwarf_regs + 1));
   RTX_FRAME_RELATED_P (dwarf) = 1;
   dwarf_par_index = 1;
 
@@ -7643,14 +7652,17 @@ emit_multi_reg_push (mask)
 							 stack_pointer_rtx)),
 			   gen_rtx_UNSPEC (BLKmode,
 					   gen_rtvec (1, reg),
-					   2));
+					   UNSPEC_PUSH_MULT));
 
-	  tmp = gen_rtx_SET (VOIDmode,
-			     gen_rtx_MEM (SImode, stack_pointer_rtx),
-			     reg);
-	  RTX_FRAME_RELATED_P (tmp) = 1;
-	  XVECEXP (dwarf, 0, dwarf_par_index) = tmp;
-	  dwarf_par_index ++;
+	  if (i != PC_REGNUM)
+	    {
+	      tmp = gen_rtx_SET (VOIDmode,
+				 gen_rtx_MEM (SImode, stack_pointer_rtx),
+				 reg);
+	      RTX_FRAME_RELATED_P (tmp) = 1;
+	      XVECEXP (dwarf, 0, dwarf_par_index) = tmp;
+	      dwarf_par_index++;
+	    }
 
 	  break;
 	}
@@ -7664,15 +7676,17 @@ emit_multi_reg_push (mask)
 
 	  XVECEXP (par, 0, j) = gen_rtx_USE (VOIDmode, reg);
 
-	  tmp = gen_rtx_SET (VOIDmode,
-			     gen_rtx_MEM (SImode,
-					  gen_rtx_PLUS (SImode,
-							stack_pointer_rtx,
-							GEN_INT (4 * j))),
-			     reg);
-	  RTX_FRAME_RELATED_P (tmp) = 1;
-	  XVECEXP (dwarf, 0, dwarf_par_index ++) = tmp;
-			   
+	  if (i != PC_REGNUM)
+	    {
+	      tmp = gen_rtx_SET (VOIDmode,
+				 gen_rtx_MEM (SImode,
+					      plus_constant (stack_pointer_rtx,
+							     4 * j)),
+				 reg);
+	      RTX_FRAME_RELATED_P (tmp) = 1;
+	      XVECEXP (dwarf, 0, dwarf_par_index++) = tmp;
+	    }
+
 	  j++;
 	}
     }
diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md
index 103d5ad7ecd..205dc3794c0 100644
--- a/gcc/config/arm/arm.md
+++ b/gcc/config/arm/arm.md
@@ -8802,6 +8802,9 @@
 	emit_move_insn (ra, operands[2]);
 	operands[2] = ra;
       }
+    /* This is a hack -- we may have crystalized the function type too
+       early.  */
+    cfun->machine->func_type = 0;
   }"
 )
 
diff --git a/gcc/config/arm/netbsd.h b/gcc/config/arm/netbsd.h
index 5b64912b0c4..057c7cf08a4 100644
--- a/gcc/config/arm/netbsd.h
+++ b/gcc/config/arm/netbsd.h
@@ -46,10 +46,6 @@ Boston, MA 02111-1307, USA.  */
 
 #include <netbsd.h>
 
-/* Until they use ELF or something that handles dwarf2 unwinds
-   and initialization stuff better.  */
-#undef DWARF2_UNWIND_INFO
-
 /* Some defines for CPP.
    arm32 is the NetBSD port name, so we always define arm32 and __arm32__.  */
 #undef CPP_PREDEFINES