diff options
| author | Uros Bizjak <ubizjak@gmail.com> | 2015-11-28 16:39:29 +0000 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2015-11-28 16:39:29 +0000 |
| commit | aaae08a7e4ac526975403ebb5f93b7f24ea16b90 (patch) | |
| tree | 81c701db21565ddc9ef14036996af73a9c027296 /libiberty | |
| parent | e3e3b08c81fec50ab1623a64bae164856ce215cf (diff) | |
| download | binutils-aaae08a7e4ac526975403ebb5f93b7f24ea16b90.zip binutils-aaae08a7e4ac526975403ebb5f93b7f24ea16b90.tar.gz binutils-aaae08a7e4ac526975403ebb5f93b7f24ea16b90.tar.bz2 | |
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
Diffstat (limited to 'libiberty')
| -rw-r--r-- | libiberty/ChangeLog | 5 | ||||
| -rw-r--r-- | libiberty/getruntime.c | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 3b360a5..1341206 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -52,6 +52,11 @@ * 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 diff --git a/libiberty/getruntime.c b/libiberty/getruntime.c index 82f3d2e..9d5eed1 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 */ |