defaults.h (DWARF2_UNWIND_INFO): Don't define if TARGET_UNWIND_INFO is defined.

2007-09-11  James E. Wilson  <wilson@specifix.com>

	* defaults.h (DWARF2_UNWIND_INFO): Don't define if
	TARGET_UNWIND_INFO is defined.
	* config/ia64/ia64.h (INCOMING_RETURN_ADDR_RTX): Delete undef
	after definition.

From-SVN: r128409

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bd983fb65c7e6c33737d4707384a0ce7d8d1997d..1d83d9d02c5ae6b9ac16c884b001b2e5af8bd096 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2007-09-11  James E. Wilson  <wilson@specifix.com>
+
+       * defaults.h (DWARF2_UNWIND_INFO): Don't define if
+       TARGET_UNWIND_INFO is defined.
+       * config/ia64/ia64.h (INCOMING_RETURN_ADDR_RTX): Delete undef
+       after definition.
+
 2007-09-12  Kaz Kojima  <kkojima@gcc.gnu.org>
 
        * config/sh/sh.c (calc_live_regs): Use

diff --git a/gcc/config/ia64/ia64.h b/gcc/config/ia64/ia64.h
index 941603865a77b00192c77a4ffc78f42739073ef2..5d32b702538282590f7325cfe7954492f785b98d 100644 (file)
--- a/gcc/config/ia64/ia64.h
+++ b/gcc/config/ia64/ia64.h
@@ -936,18 +936,6 @@ enum reg_class
    unwind info for C++ EH.  */
 #define INCOMING_RETURN_ADDR_RTX gen_rtx_REG (VOIDmode, BR_REG (0))
 
-/* ??? This is not defined because of three problems.
-   1) dwarf2out.c assumes that DWARF_FRAME_RETURN_COLUMN fits in one byte.
-   The default value is FIRST_PSEUDO_REGISTER which doesn't.  This can be
-   worked around by setting PC_REGNUM to FR_REG (0) which is an otherwise
-   unused register number.
-   2) dwarf2out_frame_debug core dumps while processing prologue insns.  We
-   need to refine which insns have RTX_FRAME_RELATED_P set and which don't.
-   3) It isn't possible to turn off EH frame info by defining DWARF2_UNIND_INFO
-   to zero, despite what the documentation implies, because it is tested in
-   a few places with #ifdef instead of #if.  */
-#undef INCOMING_RETURN_ADDR_RTX
-
 /* A C expression whose value is an integer giving the offset, in bytes, from
    the value of the stack pointer register to the top of the stack frame at the
    beginning of any function, before the prologue.  The top of the frame is

diff --git a/gcc/defaults.h b/gcc/defaults.h
index 698438f920d3ccdf0bc8af2739a164145d731758..a217276746c7fdb75cc710c90f63508e4bcd3ba2 100644 (file)
--- a/gcc/defaults.h
+++ b/gcc/defaults.h
@@ -321,7 +321,8 @@ along with GCC; see the file COPYING3.  If not see
 
 /* If we have a definition of INCOMING_RETURN_ADDR_RTX, assume that
    the rest of the DWARF 2 frame unwind support is also provided.  */
-#if !defined (DWARF2_UNWIND_INFO) && defined (INCOMING_RETURN_ADDR_RTX)
+#if !defined (DWARF2_UNWIND_INFO) && defined (INCOMING_RETURN_ADDR_RTX) \
+    && !defined (TARGET_UNWIND_INFO)
 #define DWARF2_UNWIND_INFO 1
 #endif