diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 192d16ffcec6..0af8e976e923 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2010-12-07  Joern Rennecke  <amylaar@spamcop.net>
+	    Richard Guenther  <rguenther@suse.de>
+
+	PR target/46737
+	* config/bfin/bfin.c (BB_AUX_INDEX): Cast to intptr_t.
+	(bfin_reorder_loops): Change type of index to intptr_t.
+
 2010-12-07  Richard Guenther  <rguenther@suse.de>
 
 	PR tree-optimization/46726
diff --git a/gcc/config/bfin/bfin.c b/gcc/config/bfin/bfin.c
index 93edc88b558b..a6f2a38a06ec 100644
--- a/gcc/config/bfin/bfin.c
+++ b/gcc/config/bfin/bfin.c
@@ -4662,7 +4662,7 @@ free_loops (loop_info loops)
     }
 }
 
-#define BB_AUX_INDEX(BB) ((unsigned)(BB)->aux)
+#define BB_AUX_INDEX(BB) ((intptr_t)(BB)->aux)
 
 /* The taken-branch edge from the loop end can actually go forward.  Since the
    Blackfin's LSETUP instruction requires that the loop end be after the loop
@@ -4679,7 +4679,7 @@ bfin_reorder_loops (loop_info loops, FILE *dump_file)
 
   for (loop = loops; loop; loop = loop->next)
     {
-      unsigned index;
+      intptr_t index;
       basic_block bb;
       edge e;
       edge_iterator ei;