From b161b155c8edf4ed88df68c4fe4a41597f0d2b4d Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Wed, 11 Mar 2015 15:38:54 +0100 Subject: [PATCH] Add and use latest from FreeBSD * libc/include/sys/_timespec.h: Import from FreeBSD. * libc/include/sys/timespec.h: Likewise. * libc/include/time.h: Include . * libc/include/sys/types.h (timespec): Delete. (itimerspec): Likewise. * libc/include/machine/time.h: Include . * libc/include/sys/sched.h: Likewise. * libc/include/sys/signal.h: Likewise. * libc/include/sys/stat.h: Likewise. Signed-off-by: Corinna Vinschen --- newlib/ChangeLog | 12 ++++++ newlib/libc/include/machine/time.h | 2 +- newlib/libc/include/sys/_timespec.h | 49 ++++++++++++++++++++++ newlib/libc/include/sys/sched.h | 2 + newlib/libc/include/sys/signal.h | 1 + newlib/libc/include/sys/stat.h | 1 + newlib/libc/include/sys/timespec.h | 63 +++++++++++++++++++++++++++++ newlib/libc/include/sys/types.h | 15 ------- newlib/libc/include/time.h | 1 + 9 files changed, 130 insertions(+), 16 deletions(-) create mode 100644 newlib/libc/include/sys/_timespec.h create mode 100644 newlib/libc/include/sys/timespec.h diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 2d97be0e7..1e4bc62d8 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,15 @@ +2015-03-11 Sebastian Huber + + * libc/include/sys/_timespec.h: Import from FreeBSD. + * libc/include/sys/timespec.h: Likewise. + * libc/include/time.h: Include . + * libc/include/sys/types.h (timespec): Delete. + (itimerspec): Likewise. + * libc/include/machine/time.h: Include . + * libc/include/sys/sched.h: Likewise. + * libc/include/sys/signal.h: Likewise. + * libc/include/sys/stat.h: Likewise. + 2015-03-11 Nick Clifton * testsuite/newlib.stdio/swprintf.c (main): Change size of value diff --git a/newlib/libc/include/machine/time.h b/newlib/libc/include/machine/time.h index 9b44941d6..6f9a35cc5 100644 --- a/newlib/libc/include/machine/time.h +++ b/newlib/libc/include/machine/time.h @@ -8,7 +8,7 @@ #endif #ifdef __SPU__ -#include +#include int nanosleep (const struct timespec *, struct timespec *); #endif diff --git a/newlib/libc/include/sys/_timespec.h b/newlib/libc/include/sys/_timespec.h new file mode 100644 index 000000000..bd66dfc71 --- /dev/null +++ b/newlib/libc/include/sys/_timespec.h @@ -0,0 +1,49 @@ +/*- + * Copyright (c) 1982, 1986, 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * @(#)time.h 8.5 (Berkeley) 5/4/95 + * from: FreeBSD: src/sys/sys/time.h,v 1.43 2000/03/20 14:09:05 phk Exp + * $FreeBSD$ + */ + +#ifndef _SYS__TIMESPEC_H_ +#define _SYS__TIMESPEC_H_ + +#include + +#ifndef __time_t_defined +typedef _TIME_T_ time_t; +#define __time_t_defined +#endif + +struct timespec { + time_t tv_sec; /* seconds */ + long tv_nsec; /* and nanoseconds */ +}; + +#endif /* !_SYS__TIMESPEC_H_ */ diff --git a/newlib/libc/include/sys/sched.h b/newlib/libc/include/sys/sched.h index 58f99d682..4adb6e2d6 100644 --- a/newlib/libc/include/sys/sched.h +++ b/newlib/libc/include/sys/sched.h @@ -21,6 +21,8 @@ #ifndef _SYS_SCHED_H_ #define _SYS_SCHED_H_ +#include + #ifdef __cplusplus extern "C" { #endif diff --git a/newlib/libc/include/sys/signal.h b/newlib/libc/include/sys/signal.h index a29f525c1..7fc30a777 100644 --- a/newlib/libc/include/sys/signal.h +++ b/newlib/libc/include/sys/signal.h @@ -9,6 +9,7 @@ extern "C" { #include "_ansi.h" #include #include +#include /* #ifndef __STRICT_ANSI__*/ diff --git a/newlib/libc/include/sys/stat.h b/newlib/libc/include/sys/stat.h index 11b9d8080..47caf1cd0 100644 --- a/newlib/libc/include/sys/stat.h +++ b/newlib/libc/include/sys/stat.h @@ -9,6 +9,7 @@ extern "C" { #include #include #include +#include /* dj's stat defines _STAT_H_ */ #ifndef _STAT_H_ diff --git a/newlib/libc/include/sys/timespec.h b/newlib/libc/include/sys/timespec.h new file mode 100644 index 000000000..2505cef89 --- /dev/null +++ b/newlib/libc/include/sys/timespec.h @@ -0,0 +1,63 @@ +/*- + * Copyright (c) 1982, 1986, 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * @(#)time.h 8.5 (Berkeley) 5/4/95 + * from: FreeBSD: src/sys/sys/time.h,v 1.43 2000/03/20 14:09:05 phk Exp + * $FreeBSD$ + */ + +#ifndef _SYS_TIMESPEC_H_ +#define _SYS_TIMESPEC_H_ + +#include +#include + +#if __BSD_VISIBLE +#define TIMEVAL_TO_TIMESPEC(tv, ts) \ + do { \ + (ts)->tv_sec = (tv)->tv_sec; \ + (ts)->tv_nsec = (tv)->tv_usec * 1000; \ + } while (0) +#define TIMESPEC_TO_TIMEVAL(tv, ts) \ + do { \ + (tv)->tv_sec = (ts)->tv_sec; \ + (tv)->tv_usec = (ts)->tv_nsec / 1000; \ + } while (0) + +#endif /* __BSD_VISIBLE */ + +/* + * Structure defined by POSIX.1b to be like a itimerval, but with + * timespecs. Used in the timer_*() system calls. + */ +struct itimerspec { + struct timespec it_interval; + struct timespec it_value; +}; + +#endif /* _SYS_TIMESPEC_H_ */ diff --git a/newlib/libc/include/sys/types.h b/newlib/libc/include/sys/types.h index ed33e0a61..f20ef111e 100644 --- a/newlib/libc/include/sys/types.h +++ b/newlib/libc/include/sys/types.h @@ -123,21 +123,6 @@ typedef _TIME_T_ time_t; #define __time_t_defined #endif -#ifndef __timespec_defined -#define __timespec_defined -/* Time Value Specification Structures, P1003.1b-1993, p. 261 */ - -struct timespec { - time_t tv_sec; /* Seconds */ - long tv_nsec; /* Nanoseconds */ -}; -#endif - -struct itimerspec { - struct timespec it_interval; /* Timer period */ - struct timespec it_value; /* Timer expiration */ -}; - #ifndef __daddr_t_defined typedef long daddr_t; #define __daddr_t_defined diff --git a/newlib/libc/include/time.h b/newlib/libc/include/time.h index d7b6612db..b9d1f20aa 100644 --- a/newlib/libc/include/time.h +++ b/newlib/libc/include/time.h @@ -25,6 +25,7 @@ #define CLK_TCK CLOCKS_PER_SEC #include +#include _BEGIN_STD_C