Avoid "enum conversion when passing argument 1 of 'getrusage' is invalid in C++"...

	* getruntime.c (RUSAGE_SELF): Define if not already defined.
	(get_runtime): Use RUSAGE_SELF as argument 1 of getrusage call.

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

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 1341206d5a55f462dff60d699e2c672f1ec935f3..65abd1147bbf3bc5e63da6d6bfcda0c81b70768f 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -52,10 +52,10 @@
 
        * configure: Regenerated.
 
-2015-07-08  Uros Bizjak  <ubizjak@gmail.com>
+2015-07-09  Uros Bizjak  <ubizjak@gmail.com>
 
-       * getruntime.c (get_run_time) [__USE_GNU]: Use RUSAGE_SELF as
-       argument 1 of getrusage call.
+       * getruntime.c (RUSAGE_SELF): Define if not already defined.
+       (get_runtime): Use RUSAGE_SELF as argument 1 of getrusage call.
 
 2015-06-01  Jason Merrill  <jason@redhat.com>
 

diff --git a/libiberty/getruntime.c b/libiberty/getruntime.c
index 9d5eed191165107306441d1b07d9cf9c150b40f8..1e0daad19ac0e4bdebbe4b2ed15dc50b6fa40e0d 100644 (file)
--- a/libiberty/getruntime.c
+++ b/libiberty/getruntime.c
@@ -65,6 +65,10 @@ Boston, MA 02110-1301, USA.  */
 #define CLOCKS_PER_SEC 1
 #endif
 
+#ifndef RUSAGE_SELF
+#define RUSAGE_SELF 0
+#endif
+
 #ifdef _SC_CLK_TCK
 #define GNU_HZ  sysconf(_SC_CLK_TCK)
 #else
@@ -95,11 +99,7 @@ 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 */