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 

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

6
libiberty/ChangeLog
View File

@ -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>

8
libiberty/getruntime.c
View File

@ -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 */