merge upstream HEAD

[ghc-hetmet.git] / rts / Ticky.c

diff --git a/rts/Ticky.c b/rts/Ticky.c
index ff700df..140a705 100644 (file)
--- a/rts/Ticky.c
+++ b/rts/Ticky.c
@@ -307,9 +307,6 @@ PrintTickyInfo(void)
              PC(INTAVG(tot_old_updates,tot_gengc_updates)));
   }
 
-  fprintf(tf,"\nTotal bytes copied during GC: %ld\n",
-         GC_WORDS_COPIED_ctr * sizeof(W_));
-
   printRegisteredCounterInfo(tf);
 
   fprintf(tf,"\n**************************************************\n");
@@ -567,7 +564,6 @@ PrintTickyInfo(void)
   PR_CTR(GC_SEL_MINOR_ctr);
   PR_CTR(GC_SEL_MAJOR_ctr);
   PR_CTR(GC_FAILED_PROMOTION_ctr);
-  PR_CTR(GC_WORDS_COPIED_ctr);
 }
 
 /* To print out all the registered-counter info: */
@@ -586,11 +582,11 @@ printRegisteredCounterInfo (FILE *tf)
     /* Function name at the end so it doesn't mess up the tabulation */
 
     for (p = ticky_entry_ctrs; p != NULL; p = p->link) {
-       fprintf(tf, "%11ld%11ld %6zu%6zu    %-11s%-30s",
+       fprintf(tf, "%11ld%11ld %6lu%6lu    %-11s%-30s",
                p->entry_count,
                p->allocs,
-               p->arity,
-               p->stk_args,
+               (unsigned long)p->arity,
+               (unsigned long)p->stk_args,
                p->arg_kinds,
                p->str);