dwarf2out.h (dwarf2out_frame_finish): Conditionalize outputting eh frame info.

	* dwarf2out.h (dwarf2out_frame_finish): Conditionalize outputting eh
	frame info.
	* doc/tm.texi: Document interaction between TARGET_UNWIND_INFO and
	DWARF2_UNWIND_INFO.

From-SVN: r85871

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8b19e9fd90552bfdcde1b7b02295a285fcdbc940..2dfd3359022a7e202f102cbb56ba74753efc64f3 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2004-08-12  Paul Brook  <paul@codesourcery.com>
+
+       * dwarf2out.h (dwarf2out_frame_finish): Conditionalize outputting eh
+       frame info.
+       * doc/tm.texi: Document interaction between TARGET_UNWIND_INFO and
+       DWARF2_UNWIND_INFO.
+
 2004-08-12  Ben Elliston  <bje@au.ibm.com>
 
        PR target/16286

diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi
index 2910730879397d1eace17101e5857e464d6c9773..26b49142785121e48fa8e9661e313b9239944109 100644 (file)
--- a/gcc/doc/tm.texi
+++ b/gcc/doc/tm.texi
@@ -7558,12 +7558,13 @@ Otherwise, if your target supports this information (if it defines
 or @samp{OBJECT_FORMAT_ELF}), GCC will provide a default definition of
 1.
 
-If this macro is defined to 1, the DWARF 2 unwinder will be the default
-exception handling mechanism; otherwise, @code{setjmp}/@code{longjmp} will be used by
-default.
+If @code{TARGET_UNWIND_INFO} is defined, the target specific unwinder
+will be used in all cases.  Defining this macro will enable the generation
+of DWARF 2 frame debugging information.
 
-If this macro is defined to anything, the DWARF 2 unwinder will be used
-instead of inline unwinders and @code{__unwind_function} in the non-@code{setjmp} case.
+If @code{TARGET_UNWIND_INFO} is not defined, and this macro is defined to 1,
+the DWARF 2 unwinder will be the default exception handling mechanism;
+otherwise, @code{setjmp}/@code{longjmp} will be used by default.
 @end defmac
 
 @defmac TARGET_UNWIND_INFO

diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 242a653b278bcba7c7ebb7a680d6271aba7539d7..4d9a1b2b25e9f1597c46c8abfafeb8f9dd6948d7 100644 (file)
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -2458,8 +2458,11 @@ dwarf2out_frame_finish (void)
   if (write_symbols == DWARF2_DEBUG || write_symbols == VMS_AND_DWARF2_DEBUG)
     output_call_frame_info (0);
 
+#ifndef TARGET_UNWIND_INFO
+  /* Output another copy for the unwinder.  */
   if (! USING_SJLJ_EXCEPTIONS && (flag_unwind_tables || flag_exceptions))
     output_call_frame_info (1);
+#endif
 }
 #endif
 \f