* ira-color.c (print_hard_regs_subforest): Use

	HOST_WIDEST_INT_PRINT_DEC instead of %lld.
	(allocno_hard_regs): Change type of cost member
	to HOST_WIDEST_INT.
	(add_allocno_hard_regs): Change type of argument cost
	to HOST_WIDEST_INT.
	* ira-conflict.c (build_conflict_bit_table): Replace use
	of long-long by HOST_WIDEST_INT.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 75fae33482a08e43b67ffc9032c727d654215124..a5e4afeb8d7e15145fa019637028b50c36d9e357 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2011-12-09  Kai Tietz  <ktietz@redhat.com>
+
+       * ira-color.c (print_hard_regs_subforest): Use
+       HOST_WIDEST_INT_PRINT_DEC instead of %lld.
+       (allocno_hard_regs): Change type of cost member
+       to HOST_WIDEST_INT.
+       (add_allocno_hard_regs): Change type of argument cost
+       to HOST_WIDEST_INT.
+       * ira-conflict.c (build_conflict_bit_table): Replace use
+       of long-long by HOST_WIDEST_INT.
+
 2011-12-09  Georg-Johann Lay  <avr@gjlay.de>
 
        PR target/51425

diff --git a/gcc/ira-color.c b/gcc/ira-color.c
index c7a7033ebc145c246dedeecda4c199484c1fe20c..1c03a4ae565654db83869f568276babfbbced91e 100644 (file)
--- a/gcc/ira-color.c
+++ b/gcc/ira-color.c
@@ -53,7 +53,7 @@ struct allocno_hard_regs
   HARD_REG_SET set;
   /* Overall (spilling) cost of all allocnos with given register
      set.  */
-  long long int cost;
+  HOST_WIDEST_INT cost;
 };
 
 typedef struct allocno_hard_regs_node *allocno_hard_regs_node_t;
@@ -229,7 +229,7 @@ init_allocno_hard_regs (void)
 /* Add (or update info about) allocno hard registers with SET and
    COST.  */
 static allocno_hard_regs_t
-add_allocno_hard_regs (HARD_REG_SET set, long long int cost)
+add_allocno_hard_regs (HARD_REG_SET set, HOST_WIDEST_INT cost)
 {
   struct allocno_hard_regs temp;
   allocno_hard_regs_t hv;
@@ -498,7 +498,7 @@ print_hard_regs_subforest (FILE *f, allocno_hard_regs_node_t roots,
        fprintf (f, " ");
       fprintf (f, "%d:(", node->preorder_num);
       print_hard_reg_set (f, node->hard_regs->set, false);
-      fprintf (f, ")@%lld\n", node->hard_regs->cost);
+      fprintf (f, ")@" HOST_WIDEST_INT_PRINT_DEC "\n", node->hard_regs->cost);
       print_hard_regs_subforest (f, node->first, level + 1);
     }
 }

diff --git a/gcc/ira-conflicts.c b/gcc/ira-conflicts.c
index 225a3ab17f2652f94d4af0499bae5928d6140c84..f2f13114f387ba2cd88b82f0ec26137262742486 100644 (file)
--- a/gcc/ira-conflicts.c
+++ b/gcc/ira-conflicts.c
@@ -116,8 +116,8 @@ build_conflict_bit_table (void)
          = ((OBJECT_MAX (obj) - OBJECT_MIN (obj) + IRA_INT_BITS)
             / IRA_INT_BITS);
        allocated_words_num += conflict_bit_vec_words_num;
-       if ((unsigned long long) allocated_words_num * sizeof (IRA_INT_TYPE)
-           > (unsigned long long) IRA_MAX_CONFLICT_TABLE_SIZE * 1024 * 1024)
+       if ((unsigned HOST_WIDEST_INT) allocated_words_num * sizeof (IRA_INT_TYPE)
+           > (unsigned HOST_WIDEST_INT) IRA_MAX_CONFLICT_TABLE_SIZE * 1024 * 1024)
          {
            if (internal_flag_ira_verbose > 0 && ira_dump_file != NULL)
              fprintf