conformtest: Correct XOPEN2K stdarg.h expectations.

The conform/ test expectations for stdarg.h were wrongly missing an
expectation of va_copy for XOPEN2K (based on C99, so including that
macro).  This patch fixes this.

Tested for x86_64 and x86.

	* conform/data/stdarg.h-data [XOPEN2K] (va_copy): Require macro.
	* conform/Makefile (test-xfail-XOPEN2K/stdarg.h/conform): Remove
	variable.

diff --git a/ChangeLog b/ChangeLog
index 8cbc1b1a2f44b26637d7590432439d6b7736aea4..b281c54a7d8ca9dc0eadf0519032a61766323329 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2016-04-26  Joseph Myers  <joseph@codesourcery.com>
 
+       * conform/data/stdarg.h-data [XOPEN2K] (va_copy): Require macro.
+       * conform/Makefile (test-xfail-XOPEN2K/stdarg.h/conform): Remove
+       variable.
+
        * libio/stdio.h (off_t): Define if [__USE_XOPEN2K], not
        [__USE_XOPEN2K8].
        [__USE_LARGEFILE64] (off64_t): Likewise.

diff --git a/conform/Makefile b/conform/Makefile
index 7af4b2fee891b87469fe8523e03661299f6ea13b..a1759c929a880240a80625ed114efa90e8c62938 100644 (file)
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -215,7 +215,6 @@ test-xfail-XOPEN2K/langinfo.h/conform = yes
 test-xfail-XOPEN2K/mqueue.h/conform = yes
 test-xfail-XOPEN2K/semaphore.h/conform = yes
 test-xfail-XOPEN2K/signal.h/conform = yes
-test-xfail-XOPEN2K/stdarg.h/conform = yes
 test-xfail-XOPEN2K/sys/wait.h/conform = yes
 test-xfail-XOPEN2K/ucontext.h/conform = yes
 test-xfail-POSIX2008/arpa/inet.h/conform = yes

diff --git a/conform/data/stdarg.h-data b/conform/data/stdarg.h-data
index 2c87a3b56df643f6b99116098619dab8e8000318..53addb91fa91bb1de32d9ed1c1972086f2b96b63 100644 (file)
--- a/conform/data/stdarg.h-data
+++ b/conform/data/stdarg.h-data
@@ -5,7 +5,7 @@ macro va_start
 macro va_arg
 macro va_end
 
-#if defined ISO99 || defined ISO11 || defined POSIX2008 || defined XOPEN2K8
+#if defined ISO99 || defined ISO11 || defined XOPEN2K || defined POSIX2008 || defined XOPEN2K8
 macro va_copy
 #endif