From 514c97d3e0e09f75366b973f214441d8cd019c8f Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Wed, 28 Sep 2011 20:01:45 +0000 Subject: [PATCH] merge from gcc --- include/ChangeLog | 6 +++ include/libiberty.h | 4 ++ include/timeval-utils.h | 40 ++++++++++++++++++ libiberty/ChangeLog | 10 +++++ libiberty/argv.c | 23 +++++++++++ libiberty/timeval-utils.c | 87 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 170 insertions(+) create mode 100644 include/timeval-utils.h create mode 100644 libiberty/timeval-utils.c diff --git a/include/ChangeLog b/include/ChangeLog index cef3f201d56..e2d1be1ee87 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,9 @@ +2011-09-28 Doug Evans + + * timeval-utils.h: New file. + + * libiberty.h (countargv): Declare. + 2011-09-26 Cary Coutant gcc PR lto/47247 diff --git a/include/libiberty.h b/include/libiberty.h index 32eb83a049e..cacde800ea3 100644 --- a/include/libiberty.h +++ b/include/libiberty.h @@ -91,6 +91,10 @@ extern void expandargv PARAMS ((int *, char ***)); extern int writeargv PARAMS ((char **, FILE *)); +/* Return the number of elements in argv. */ + +extern int countargv (char**); + /* Return the last component of a path name. Note that we can't use a prototype here because the parameter is declared inconsistently across different systems, sometimes as "char *" and sometimes as diff --git a/include/timeval-utils.h b/include/timeval-utils.h new file mode 100644 index 00000000000..1caf9b36d15 --- /dev/null +++ b/include/timeval-utils.h @@ -0,0 +1,40 @@ +/* Basic struct timeval utilities. + Copyright (C) 2011 Free Software Foundation, Inc. + +This file is part of the libiberty library. +Libiberty is free software; you can redistribute it and/or +modify it under the terms of the GNU Library General Public +License as published by the Free Software Foundation; either +version 2 of the License, or (at your option) any later version. + +Libiberty is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with libiberty; see the file COPYING.LIB. If not, +write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, +Boston, MA 02110-1301, USA. */ + +#ifndef TIMEVAL_UTILS_H +#define TIMEVAL_UTILS_H + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +/* forward decl */ +struct timeval; + +extern void timeval_add (struct timeval *result, + const struct timeval *a, const struct timeval *b); + +extern void timeval_sub (struct timeval *result, + const struct timeval *a, const struct timeval *b); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* TIMEVAL_UTILS_H */ diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 0547f9b08ed..59460e43f09 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,13 @@ +2011-09-28 Doug Evans + + * timeval-utils.c: New file. + * Makefile.in (CFILES): Add it. + (REQUIRED_OFILES): Add timeval-utils.$(objext). + (INSTALLED_HEADERS): Add timeval-utils.h. + (timeval-utils.$(objext)): Add rule. + + * argv.c (countargv): New function. + 2011-09-23 Cary Coutant PR 40831 diff --git a/libiberty/argv.c b/libiberty/argv.c index 8476c8fda9e..ca53f91493d 100644 --- a/libiberty/argv.c +++ b/libiberty/argv.c @@ -492,6 +492,29 @@ expandargv (int *argcp, char ***argvp) } } +/* + +@deftypefn Extension int countargv (char **@var{argv}) + +Return the number of elements in @var{argv}. +Returns zero if @var{argv} is NULL. + +@end deftypefn + +*/ + +int +countargv (char **argv) +{ + int argc; + + if (argv == NULL) + return 0; + for (argc = 0; argv[argc] != NULL; argc++) + continue; + return argc; +} + #ifdef MAIN /* Simple little test driver. */ diff --git a/libiberty/timeval-utils.c b/libiberty/timeval-utils.c new file mode 100644 index 00000000000..4c9f6a85ee2 --- /dev/null +++ b/libiberty/timeval-utils.c @@ -0,0 +1,87 @@ +/* Basic struct timeval utilities. + Copyright (C) 2011 Free Software Foundation, Inc. + +This file is part of the libiberty library. +Libiberty is free software; you can redistribute it and/or +modify it under the terms of the GNU Library General Public +License as published by the Free Software Foundation; either +version 2 of the License, or (at your option) any later version. + +Libiberty is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with libiberty; see the file COPYING.LIB. If not, +write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, +Boston, MA 02110-1301, USA. */ + +#include "config.h" + +/* On some systems (such as WindISS), you must include + to get the definition of "time_t" before you include . */ +#include + +#ifdef TIME_WITH_SYS_TIME +# include +# include +#else +# if HAVE_SYS_TIME_H +# include +# else +# ifdef HAVE_TIME_H +# include +# endif +# endif +#endif + +#include "timeval-utils.h" + +/* + +@deftypefn Extension void timeval_add (struct timeval *@var{a}, @ + struct timeval *@var{b}, struct timeval *@var{result}) + +Adds @var{a} to @var{b} and stores the result in @var{result}. + +@end deftypefn + +*/ + +void +timeval_add (struct timeval *result, + const struct timeval *a, const struct timeval *b) +{ + result->tv_sec = a->tv_sec + b->tv_sec; + result->tv_usec = a->tv_usec + b->tv_usec; + if (result->tv_usec >= 1000000) + { + ++result->tv_sec; + result->tv_usec -= 1000000; + } +} + +/* + +@deftypefn Extension void timeval_sub (struct timeval *@var{a}, @ + struct timeval *@var{b}, struct timeval *@var{result}) + +Subtracts @var{b} from @var{a} and stores the result in @var{result}. + +@end deftypefn + +*/ + +void +timeval_sub (struct timeval *result, + const struct timeval *a, const struct timeval *b) +{ + result->tv_sec = a->tv_sec - b->tv_sec; + result->tv_usec = a->tv_usec - b->tv_usec; + if (result->tv_usec < 0) + { + --result->tv_sec; + result->tv_usec += 1000000; + } +} -- 2.30.2