Avoid "enum conversion when passing argument 1 of 'getrusage' is invalid in C++"...
authorUros Bizjak <ubizjak@gmail.com>
Sat, 28 Nov 2015 16:39:29 +0000 (16:39 +0000)
committerPedro Alves <palves@redhat.com>
Sat, 28 Nov 2015 16:39:29 +0000 (16:39 +0000)
  * getruntime.c (get_run_time) [__USE_GNU]: Use RUSAGE_SELF as
  argument 1 of getrusage call.

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

libiberty/ChangeLog
libiberty/getruntime.c

index 3b360a5c72f53da8816c23d509ba18ebc1273830..1341206d5a55f462dff60d699e2c672f1ec935f3 100644 (file)
 
        * configure: Regenerated.
 
+2015-07-08  Uros Bizjak  <ubizjak@gmail.com>
+
+       * getruntime.c (get_run_time) [__USE_GNU]: Use RUSAGE_SELF as
+       argument 1 of getrusage call.
+
 2015-06-01  Jason Merrill  <jason@redhat.com>
 
        * cp-demangle.c (cplus_demangle_type): Handle arguments to vendor
index 82f3d2e41858852e19ec3ab9215a55c66fa103ad..9d5eed191165107306441d1b07d9cf9c150b40f8 100644 (file)
@@ -95,7 +95,11 @@ get_run_time (void)
 #if defined (HAVE_GETRUSAGE) && defined (HAVE_SYS_RESOURCE_H)
   struct rusage rusage;
 
+#if defined __USE_GNU && !defined __cplusplus
+  getrusage (RUSAGE_SELF, &rusage);
+#else
   getrusage (0, &rusage);
+#endif
   return (rusage.ru_utime.tv_sec * 1000000 + rusage.ru_utime.tv_usec
          + rusage.ru_stime.tv_sec * 1000000 + rusage.ru_stime.tv_usec);
 #else /* ! HAVE_GETRUSAGE */