aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/dwarf2out.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a4ec3cb..97a0487 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-06 Eric Botcazou <ebotcazou@libertysurf.fr>
+ Nathan Froyd <froydnj@codesourcery.com>
+
+ * dwarf2out.c (dwarf2out_frame_init): Check for DWARF2_FRAME_INFO
+ when determining whether to record INCOMING_RETURN_ADDR_RTX.
+
2007-10-06 Eric Botcazou <ebotcazou@adacore.com>
Revert:
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 05fd445..d17226e 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -2662,7 +2662,7 @@ dwarf2out_frame_init (void)
dwarf2out_def_cfa (NULL, STACK_POINTER_REGNUM, INCOMING_FRAME_SP_OFFSET);
#ifdef DWARF2_UNWIND_INFO
- if (DWARF2_UNWIND_INFO)
+ if (DWARF2_UNWIND_INFO || DWARF2_FRAME_INFO)
initial_return_save (INCOMING_RETURN_ADDR_RTX);
#endif
}