diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2012-06-20 02:28:31 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2012-06-20 02:28:31 +0200 |
| commit | 0138137f1ccea480fe31cea3b63a81f96daeeaa7 (patch) | |
| tree | ffd88f1e805cd98152828c1598fc3255b3d22a9e /rt | |
| parent | 27fbc2008d4df23885d10f0877caf62ae2c22bb4 (diff) | |
| parent | dc665715841aea049480d9f75ace426419db1f8e (diff) | |
Merge branch 'baseline' into refs/top-bases/tschwinge/Roger_Whittaker
Conflicts:
configure
configure.in
hurd/Makefile
nptl/sysdeps/pthread/bits/libc-lock.h
sysdeps/i386/configure
sysdeps/powerpc/powerpc32/configure
sysdeps/powerpc/powerpc64/configure
sysdeps/unix/sysv/linux/configure
sysdeps/unix/sysv/linux/configure.in
Diffstat (limited to 'rt')
| -rw-r--r-- | rt/Makefile | 7 | ||||
| -rw-r--r-- | rt/aio.h | 7 | ||||
| -rw-r--r-- | rt/tst-aio.c | 3 | ||||
| -rw-r--r-- | rt/tst-aio64.c | 3 | ||||
| -rw-r--r-- | rt/tst-aio7.c | 3 | ||||
| -rw-r--r-- | rt/tst-cpuclock2.c | 2 |
6 files changed, 11 insertions, 14 deletions
diff --git a/rt/Makefile b/rt/Makefile index 14a2df3903..941c471688 100644 --- a/rt/Makefile +++ b/rt/Makefile @@ -53,8 +53,6 @@ tests := tst-shm tst-clock tst-clock_nanosleep tst-timer tst-timer2 \ extra-libs := librt extra-libs-others := $(extra-libs) -distribute := aio_misc.h - include ../Rules CFLAGS-aio_suspend.c = -fexceptions @@ -80,8 +78,3 @@ $(tests:%=$(objpfx)%-bp): $(objpfx)librt_b.a $(bounded-thread-library) endif tst-mqueue7-ARGS = -- $(built-program-cmd) - -ifeq (yes,$(build-static-nss)) -otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \ - $(resolvobjdir)/libresolv.a -endif @@ -23,10 +23,11 @@ #define _AIO_H 1 #include <features.h> -#include <fcntl.h> -#include <signal.h> -#include <time.h> #include <sys/types.h> +#define __need_sigevent_t +#include <bits/siginfo.h> +#define __need_timespec +#include <time.h> __BEGIN_DECLS diff --git a/rt/tst-aio.c b/rt/tst-aio.c index 30b45672d0..1697cc28af 100644 --- a/rt/tst-aio.c +++ b/rt/tst-aio.c @@ -1,5 +1,5 @@ /* Tests for AIO in librt. - Copyright (C) 1998,2000,02 Free Software Foundation, Inc. + Copyright (C) 1998-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -20,6 +20,7 @@ #include <aio.h> #include <errno.h> #include <error.h> +#include <fcntl.h> #include <stdlib.h> #include <string.h> #include <unistd.h> diff --git a/rt/tst-aio64.c b/rt/tst-aio64.c index 4eeda5b15b..7648da46fd 100644 --- a/rt/tst-aio64.c +++ b/rt/tst-aio64.c @@ -1,5 +1,5 @@ /* Tests for 64bit AIO in librt. - Copyright (C) 1998,99,2000,02 Free Software Foundation, Inc. + Copyright (C) 1998-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -21,6 +21,7 @@ #include <aio.h> #include <errno.h> #include <error.h> +#include <fcntl.h> #include <stdlib.h> #include <string.h> #include <unistd.h> diff --git a/rt/tst-aio7.c b/rt/tst-aio7.c index 327d28f1bf..0de6088cc0 100644 --- a/rt/tst-aio7.c +++ b/rt/tst-aio7.c @@ -1,5 +1,5 @@ /* Test for AIO POSIX compliance. - Copyright (C) 2001,02, 03 Free Software Foundation, Inc. + Copyright (C) 2001-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -19,6 +19,7 @@ #include <aio.h> #include <error.h> #include <errno.h> +#include <fcntl.h> #include <stdio.h> #include <stdlib.h> #include <unistd.h> diff --git a/rt/tst-cpuclock2.c b/rt/tst-cpuclock2.c index e3545f2e3c..9a74eb014b 100644 --- a/rt/tst-cpuclock2.c +++ b/rt/tst-cpuclock2.c @@ -110,7 +110,7 @@ test_nanosleep (clockid_t clock, const char *which, struct timespec sleeptimeabs = sleeptime; sleeptimeabs.tv_sec += after.tv_sec; sleeptimeabs.tv_nsec += after.tv_nsec; - while (sleeptimeabs.tv_nsec > 1000000000) + while (sleeptimeabs.tv_nsec >= 1000000000) { ++sleeptimeabs.tv_sec; sleeptimeabs.tv_nsec -= 1000000000; |