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.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index f2ef71146952b41bcdd87a6da7c84b6a370493de..0af6d8f24f70f3a747bb6abf3484e6a06a75fb40 100644 (file)
--- 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 c9d0d7966c411ad9c2fa8f0733c4cb0c7d90dad9..5d6cbd5a0f5f3c075afa26953d795667aa479b2c 100644 (file)
--- 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 c713dca1dc28f4363f9b7a2ff84b868e825c31ec..6449bbad8462489d18f0ee63db4a4e1aeb97482d 100644 (file)
--- 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);
         }