summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/df-scan.c9
2 files changed, 10 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 411f28a08b8..8a8e2f063a5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-13 Bob Wilson <bob.wilson@acm.org>
+
+ * df-scan.c (df_get_entry_block_def_set): Check if STATIC_CHAIN_REGNUM
+ is defined.
+
2007-06-13 Bernd Schmidt <bernd.schmidt@analog.com>
* config/bfin/bfin.h (EH_RETURN_HANDLER_RTX): Use gen_frame_mem.
diff --git a/gcc/df-scan.c b/gcc/df-scan.c
index 010488efc00..6c95c272df1 100644
--- a/gcc/df-scan.c
+++ b/gcc/df-scan.c
@@ -3587,11 +3587,12 @@ df_get_entry_block_def_set (bitmap entry_block_defs)
it has to show up in the entry def set. */
if (df_need_static_chain_reg (cfun))
{
-#if !defined (STATIC_CHAIN_INCOMING_REGNUM) \
- || STATIC_CHAIN_REGNUM == STATIC_CHAIN_INCOMING_REGNUM
- bitmap_set_bit (entry_block_defs, STATIC_CHAIN_REGNUM);
-#else
+#ifdef STATIC_CHAIN_INCOMING_REGNUM
bitmap_set_bit (entry_block_defs, STATIC_CHAIN_INCOMING_REGNUM);
+#else
+#ifdef STATIC_CHAIN_REGNUM
+ bitmap_set_bit (entry_block_defs, STATIC_CHAIN_REGNUM);
+#endif
#endif
}
}