aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gold/ChangeLog5
-rw-r--r--gold/main.cc2
-rw-r--r--gold/workqueue.cc2
3 files changed, 7 insertions, 2 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog
index f2ef711..0af6d8f 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-29 Rafael Espindola <espindola@google.com>
+
+ * main.cc (main): Fix the sys time reporting.
+ * workqueue.cc (Workqueue::find_and_run_task): Fix the sys time reporting.
+
2009-12-29 Sriraman Tallam <tmsriram@google.com>
* options.cc (General_options::parse_version): Allow -v to exit
diff --git a/gold/main.cc b/gold/main.cc
index c9d0d79..5d6cbd5 100644
--- a/gold/main.cc
+++ b/gold/main.cc
@@ -254,7 +254,7 @@ main(int argc, char** argv)
"(user: %ld.%06ld sys: %ld.%06ld wall: %ld.%06ld)\n"),
program_name,
elapsed.user / 1000, (elapsed.user % 1000) * 1000,
- elapsed.sys / 1000, (elapsed.user % 1000) * 1000,
+ elapsed.sys / 1000, (elapsed.sys % 1000) * 1000,
elapsed.wall / 1000, (elapsed.wall % 1000) * 1000);
#ifdef HAVE_MALLINFO
diff --git a/gold/workqueue.cc b/gold/workqueue.cc
index c713dca..6449bba 100644
--- a/gold/workqueue.cc
+++ b/gold/workqueue.cc
@@ -327,7 +327,7 @@ Workqueue::find_and_run_task(int thread_number)
"(user: %ld.%06ld sys: %ld.%06ld wall: %ld.%06ld)",
thread_number, t->name().c_str(),
elapsed.user / 1000, (elapsed.user % 1000) * 1000,
- elapsed.sys / 1000, (elapsed.user % 1000) * 1000,
+ elapsed.sys / 1000, (elapsed.sys % 1000) * 1000,
elapsed.wall / 1000, (elapsed.wall % 1000) * 1000);
}