diff options
27 files changed, 54 insertions, 26 deletions
diff --git a/ChangeLog b/ChangeLog index 05bed06e44..ce0e9a367f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,33 @@ 2014-03-06 Joseph Myers <joseph@codesourcery.com> + * conform/data/aio.h-data [XPG3 || XPG4]: Disable whole file. + * conform/data/arpa/inet.h-data [XPG3]: Likewise. + * conform/data/dlfcn.h-data [XPG3 || XPG4]: Likewise. + * conform/data/fmtmsg.h-data [XPG3]: Likewise. + * conform/data/libgen.h-data [XPG3]: Likewise. + * conform/data/mqueue.h-data [XPG3 || XPG4]: Likewise. + * conform/data/ndbm.h-data [XPG3]: Likewise. + * conform/data/net/if.h-data [XPG3 || XPG4 || UNIX98]: Likewise. + * conform/data/netdb.h-data [XPG3]: Likewise. + * conform/data/netinet/in.h-data [XPG3]: Likewise. + * conform/data/poll.h-data [XPG3]: Likewise. + * conform/data/spawn.h-data [XPG3 || XPG4 || UNIX98]: Likewise. + * conform/data/strings.h-data [XPG3]: Likewise. + * conform/data/stropts.h-data [XPG3]: Likewise. + * conform/data/sys/mman.h-data [XPG3]: Likewise. + * conform/data/sys/resource.h-data [XPG3]: Likewise. + * conform/data/sys/select.h-data [XPG3 || XPG4 || UNIX98]: + Likewise. + * conform/data/sys/statvfs.h-data [XPG3]: Likewise. + * conform/data/sys/time.h-data [XPG3]: Likewise. + * conform/data/sys/timeb.h-data [XPG3]: Likewise. + * conform/data/sys/uio.h-data [XPG3]: Likewise. + * conform/data/sys/un.h-data [XPG3]: Likewise. + * conform/data/syslog.h-data [XPG3]: Likewise. + * conform/data/ucontext.h-data [XPG3]: Likewise. + * conform/data/utmpx.h-data [XPG3]: Likewise. + * conform/data/varargs.h-data [UNIX98]: Enable file. + * manual/Makefile (INSTALL_INFO): Remove variable setting. * math/libm-test.inc (struct test_f_f_data): Move expected results diff --git a/conform/data/aio.h-data b/conform/data/aio.h-data index d6d0acbbe6..e87923ed70 100644 --- a/conform/data/aio.h-data +++ b/conform/data/aio.h-data @@ -1,4 +1,4 @@ -#if !defined ISO && !defined ISO99 && !defined ISO11 +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined XPG3 && !defined XPG4 type {struct aiocb} // Test elements of the AIO control struct. diff --git a/conform/data/arpa/inet.h-data b/conform/data/arpa/inet.h-data index becee2fd1e..2bd3aeea0a 100644 --- a/conform/data/arpa/inet.h-data +++ b/conform/data/arpa/inet.h-data @@ -1,4 +1,4 @@ -#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3 // in_port_t should have exactly 16 bits type in_port_t // in_addr_t should have exactly 32 bits diff --git a/conform/data/dlfcn.h-data b/conform/data/dlfcn.h-data index 59dd028911..a954c9db46 100644 --- a/conform/data/dlfcn.h-data +++ b/conform/data/dlfcn.h-data @@ -1,4 +1,4 @@ -#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3 && !defined XPG4 macro RTLD_LAZY macro RTLD_NOW macro RTLD_GLOBAL diff --git a/conform/data/fmtmsg.h-data b/conform/data/fmtmsg.h-data index b6ddf27721..e64d87ce40 100644 --- a/conform/data/fmtmsg.h-data +++ b/conform/data/fmtmsg.h-data @@ -1,4 +1,4 @@ -#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008 +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008 && !defined XPG3 macro MM_HARD constant MM_HARD diff --git a/conform/data/libgen.h-data b/conform/data/libgen.h-data index f59bbb0007..443cd0bd22 100644 --- a/conform/data/libgen.h-data +++ b/conform/data/libgen.h-data @@ -1,4 +1,4 @@ -#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008 +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008 && !defined XPG3 function {char*} basename (char*) function {char*} dirname (char*) diff --git a/conform/data/mqueue.h-data b/conform/data/mqueue.h-data index 2ff27480e6..76652ce661 100644 --- a/conform/data/mqueue.h-data +++ b/conform/data/mqueue.h-data @@ -1,4 +1,4 @@ -#if !defined ISO && !defined ISO99 && !defined ISO11 +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined XPG3 && !defined XPG4 // should test for not an array type. type mqd_t diff --git a/conform/data/ndbm.h-data b/conform/data/ndbm.h-data index 5d1fc6a3c1..43c6a38d79 100644 --- a/conform/data/ndbm.h-data +++ b/conform/data/ndbm.h-data @@ -1,4 +1,4 @@ -#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008 +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008 && !defined XPG3 type datum element datum {void*} dptr element datum size_t dsize diff --git a/conform/data/net/if.h-data b/conform/data/net/if.h-data index 2c3eb4d9d5..fd8509567f 100644 --- a/conform/data/net/if.h-data +++ b/conform/data/net/if.h-data @@ -1,4 +1,4 @@ -#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98 type {struct if_nameindex} element {struct if_nameindex} {unsigned int} if_index diff --git a/conform/data/netdb.h-data b/conform/data/netdb.h-data index a73004c615..c5fd25756d 100644 --- a/conform/data/netdb.h-data +++ b/conform/data/netdb.h-data @@ -1,4 +1,4 @@ -#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3 optional-type in_port_t optional-type in_addr_t diff --git a/conform/data/netinet/in.h-data b/conform/data/netinet/in.h-data index be0236b490..928432651b 100644 --- a/conform/data/netinet/in.h-data +++ b/conform/data/netinet/in.h-data @@ -1,4 +1,4 @@ -#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3 type in_port_t type in_addr_t diff --git a/conform/data/poll.h-data b/conform/data/poll.h-data index 395e4b5011..84777dffa1 100644 --- a/conform/data/poll.h-data +++ b/conform/data/poll.h-data @@ -1,4 +1,4 @@ -#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3 type {struct pollfd} element {struct pollfd} int fd element {struct pollfd} {short int} events diff --git a/conform/data/spawn.h-data b/conform/data/spawn.h-data index 637f2bf0d0..fb206f7ecf 100644 --- a/conform/data/spawn.h-data +++ b/conform/data/spawn.h-data @@ -1,4 +1,4 @@ -#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98 type posix_spawnattr_t type posix_spawn_file_actions_t # if defined XOPEN2K8 || defined POSIX2008 diff --git a/conform/data/strings.h-data b/conform/data/strings.h-data index b61ac50e6f..d22609a0f8 100644 --- a/conform/data/strings.h-data +++ b/conform/data/strings.h-data @@ -1,4 +1,4 @@ -#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3 # if !defined XOPEN2K8 && !defined POSIX2008 function int bcmp (const void*, const void*, size_t) function void bcopy (const void*, void*, size_t) diff --git a/conform/data/stropts.h-data b/conform/data/stropts.h-data index d978a1c5e9..6849fecc87 100644 --- a/conform/data/stropts.h-data +++ b/conform/data/stropts.h-data @@ -1,4 +1,4 @@ -#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3 type {struct bandinfo} element {struct bandinfo} {unsigned char} bi_pri diff --git a/conform/data/sys/mman.h-data b/conform/data/sys/mman.h-data index 62f8f4b32d..0555fd1771 100644 --- a/conform/data/sys/mman.h-data +++ b/conform/data/sys/mman.h-data @@ -1,4 +1,4 @@ -#if !defined ISO && !defined ISO99 && !defined ISO11 +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined XPG3 constant PROT_READ constant PROT_WRITE constant PROT_EXEC diff --git a/conform/data/sys/resource.h-data b/conform/data/sys/resource.h-data index 67517adeda..5c46dea301 100644 --- a/conform/data/sys/resource.h-data +++ b/conform/data/sys/resource.h-data @@ -1,4 +1,4 @@ -#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008 +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008 && !defined XPG3 constant PRIO_PROCESS constant PRIO_PGRP constant PRIO_USER diff --git a/conform/data/sys/select.h-data b/conform/data/sys/select.h-data index 84e07e9729..00f037ac5c 100644 --- a/conform/data/sys/select.h-data +++ b/conform/data/sys/select.h-data @@ -1,4 +1,4 @@ -#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98 type time_t type suseconds_t diff --git a/conform/data/sys/statvfs.h-data b/conform/data/sys/statvfs.h-data index 750f22b4e1..fa56fbeee1 100644 --- a/conform/data/sys/statvfs.h-data +++ b/conform/data/sys/statvfs.h-data @@ -1,4 +1,4 @@ -#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3 type {struct statvfs} element {struct statvfs} {unsigned long} f_bsize diff --git a/conform/data/sys/time.h-data b/conform/data/sys/time.h-data index 98e590989c..1d07bd6380 100644 --- a/conform/data/sys/time.h-data +++ b/conform/data/sys/time.h-data @@ -1,4 +1,4 @@ -#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008 +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008 && !defined XPG3 type {struct timeval} element {struct timeval} time_t tv_sec diff --git a/conform/data/sys/timeb.h-data b/conform/data/sys/timeb.h-data index 460da6ee8c..dbae045bd5 100644 --- a/conform/data/sys/timeb.h-data +++ b/conform/data/sys/timeb.h-data @@ -1,4 +1,4 @@ -#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3 type {struct timeb} element {struct timeb} time_t time diff --git a/conform/data/sys/uio.h-data b/conform/data/sys/uio.h-data index 3352695104..da606b8f3f 100644 --- a/conform/data/sys/uio.h-data +++ b/conform/data/sys/uio.h-data @@ -1,4 +1,4 @@ -#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3 type {struct iovec} element {struct iovec} {void*} iov_base diff --git a/conform/data/sys/un.h-data b/conform/data/sys/un.h-data index ee157ed5f8..3bf7968683 100644 --- a/conform/data/sys/un.h-data +++ b/conform/data/sys/un.h-data @@ -1,4 +1,4 @@ -#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3 type {struct sockaddr_un} element {struct sockaddr_un} sa_family_t sun_family diff --git a/conform/data/syslog.h-data b/conform/data/syslog.h-data index 26fef76ac1..05619cf489 100644 --- a/conform/data/syslog.h-data +++ b/conform/data/syslog.h-data @@ -1,4 +1,4 @@ -#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008 +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008 && !defined XPG3 constant LOG_PID constant LOG_CONS constant LOG_NDELAY diff --git a/conform/data/ucontext.h-data b/conform/data/ucontext.h-data index 2b5f3b4a6f..93e9c1ed51 100644 --- a/conform/data/ucontext.h-data +++ b/conform/data/ucontext.h-data @@ -1,4 +1,4 @@ -#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3 type mcontext_t type ucontext_t diff --git a/conform/data/utmpx.h-data b/conform/data/utmpx.h-data index b9dd0d5a59..b8a0062321 100644 --- a/conform/data/utmpx.h-data +++ b/conform/data/utmpx.h-data @@ -1,4 +1,4 @@ -#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008 +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008 && !defined XPG3 type {struct utmpx} element {struct utmpx} char ut_user [] diff --git a/conform/data/varargs.h-data b/conform/data/varargs.h-data index a486b72603..48435fe387 100644 --- a/conform/data/varargs.h-data +++ b/conform/data/varargs.h-data @@ -1,4 +1,4 @@ -#if defined XPG3 || defined XPG4 +#if defined XPG3 || defined XPG4 || defined UNIX98 macro va_alist macro va_dcl type va_list |