OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* 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
This commit is contained in:
Uros Bizjak 2015-11-28 16:39:29 +00:00 committed by Pedro Alves
parent e3e3b08c81
commit aaae08a7e4
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libiberty/ChangeLog
View File

@ -52,6 +52,11 @@
* configure: Regenerated. * 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> 2015-06-01 Jason Merrill <jason@redhat.com>
* cp-demangle.c (cplus_demangle_type): Handle arguments to vendor * cp-demangle.c (cplus_demangle_type): Handle arguments to vendor

4
libiberty/getruntime.c
View File

@ -95,7 +95,11 @@ get_run_time (void)
#if defined (HAVE_GETRUSAGE) && defined (HAVE_SYS_RESOURCE_H) #if defined (HAVE_GETRUSAGE) && defined (HAVE_SYS_RESOURCE_H)
struct rusage rusage; struct rusage rusage;
#if defined __USE_GNU && !defined __cplusplus
getrusage (RUSAGE_SELF, &rusage);
#else
getrusage (0, &rusage); getrusage (0, &rusage);
#endif
return (rusage.ru_utime.tv_sec * 1000000 + rusage.ru_utime.tv_usec return (rusage.ru_utime.tv_sec * 1000000 + rusage.ru_utime.tv_usec
+ rusage.ru_stime.tv_sec * 1000000 + rusage.ru_stime.tv_usec); + rusage.ru_stime.tv_sec * 1000000 + rusage.ru_stime.tv_usec);
#else /* ! HAVE_GETRUSAGE */ #else /* ! HAVE_GETRUSAGE */