From aaae08a7e4ac526975403ebb5f93b7f24ea16b90 Mon Sep 17 00:00:00 2001 From: Uros Bizjak Date: Sat, 28 Nov 2015 16:39:29 +0000 Subject: [PATCH] Avoid "enum conversion when passing argument 1 of 'getrusage' is invalid in C++" warning * 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 | 5 +++++ libiberty/getruntime.c | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 3b360a5c72f..1341206d5a5 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -52,6 +52,11 @@ * configure: Regenerated. +2015-07-08 Uros Bizjak + + * getruntime.c (get_run_time) [__USE_GNU]: Use RUSAGE_SELF as + argument 1 of getrusage call. + 2015-06-01 Jason Merrill * cp-demangle.c (cplus_demangle_type): Handle arguments to vendor diff --git a/libiberty/getruntime.c b/libiberty/getruntime.c index 82f3d2e4185..9d5eed19116 100644 --- a/libiberty/getruntime.c +++ b/libiberty/getruntime.c @@ -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 */ -- 2.39.5