Imported Upstream version 4.8.1

[platform/upstream/gcc48.git] / gcc / config / pdp11 / pdp11.c

diff --git a/gcc/config/pdp11/pdp11.c b/gcc/config/pdp11/pdp11.c
index 42e3af0..a5658bf 100644 (file)
--- a/gcc/config/pdp11/pdp11.c
+++ b/gcc/config/pdp11/pdp11.c
@@ -1,6 +1,5 @@
 /* Subroutines for gcc2 for pdp11.
-   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2004, 2005,
-   2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1994-2013 Free Software Foundation, Inc.
    Contributed by Michael K. Gschwind (mike@vlsivie.tuwien.ac.at).
 
 This file is part of GCC.
@@ -337,7 +336,7 @@ pdp11_expand_epilogue (void)
     }
 
   /* If possible, restore registers via pops.  */
-  if (!frame_pointer_needed || current_function_sp_is_unchanging)
+  if (!frame_pointer_needed || crtl->sp_is_unchanging)
     {
       /* Restore registers via pops.  */
 
@@ -389,7 +388,7 @@ pdp11_expand_epilogue (void)
       for (regno = AC5_REGNUM; regno >= AC0_REGNUM; regno--)
        if (pdp11_saved_regno (regno))
          {
-           x = plus_constant (hard_frame_pointer_rtx, ofs);
+           x = plus_constant (Pmode, hard_frame_pointer_rtx, ofs);
            x = gen_frame_mem (DFmode, x);
            reg = gen_rtx_REG (DFmode, regno);
 
@@ -407,7 +406,7 @@ pdp11_expand_epilogue (void)
        if (pdp11_saved_regno (regno)
            && (regno != HARD_FRAME_POINTER_REGNUM || !frame_pointer_needed))
          {
-           x = plus_constant (hard_frame_pointer_rtx, ofs);
+           x = plus_constant (Pmode, hard_frame_pointer_rtx, ofs);
            x = gen_frame_mem (Pmode, x);
            emit_move_insn (gen_rtx_REG (Pmode, regno), x);
            ofs += 2;