aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/dwarf2out.c9
2 files changed, 10 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c64d259..3b0b23c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-14 Richard Henderson <rth@redhat.com>
+
+ * dwarf2out.c (dwarf2out_frame_finish): Never emit .eh_frame
+ if USING_SJLJ_EXCEPTIONS.
+
2001-08-14 Steve Ellcey <sje@cup.hp.com>
* tlink.c (scan_linker_output): Check string for unsatisfied in
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 711b1e3..5ed410a 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -2099,12 +2099,13 @@ dwarf2out_frame_finish ()
#ifdef MIPS_DEBUGGING_INFO
if (write_symbols == DWARF2_DEBUG)
output_call_frame_info (0);
- if (flag_unwind_tables || (flag_exceptions && ! USING_SJLJ_EXCEPTIONS))
+ if (! USING_SJLJ_EXCEPTIONS && (flag_unwind_tables || flag_exceptions))
output_call_frame_info (1);
#else
- if (write_symbols == DWARF2_DEBUG
- || flag_unwind_tables || (flag_exceptions && ! USING_SJLJ_EXCEPTIONS))
- output_call_frame_info (1);
+ int for_eh = (! USING_SJLJ_EXCEPTIONS
+ && (flag_unwind_tables || flag_exceptions));
+ if (write_symbols == DWARF2_DEBUG || for_eh)
+ output_call_frame_info (for_eh);
#endif
}