From: bwilson <bwilson@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 13 Jun 2007 18:27:50 +0000 (+0000)
Subject:         * df-scan.c (df_get_entry_block_def_set): Check if STATIC_CHAIN_REGNUM
X-Git-Tag: upstream/4.9.2~48048
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fdfd360bf2a9c2469c4b0da918864318bf6e3d4d;p=platform%2Fupstream%2Flinaro-gcc.git

    * df-scan.c (df_get_entry_block_def_set): Check if STATIC_CHAIN_REGNUM
        is defined.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@125682 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 411f28a..8a8e2f0 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 010488e..6c95c27 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
     }
 }