conformtest: Fix XPG standard naming.

The conform/ tests test -D_XOPEN_SOURCE under the name "XPG3", and
-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED under the name "XPG4".

That naming is misleading.  _XOPEN_SOURCE_EXTENDED actually means
XPG4.2, including UX-shaded interfaces.  _XOPEN_SOURCE actually means
XPG4, or XPG4.2 without UX-shaded interfaces.  (Prior XPG versions
also used _XOPEN_SOURCE, but without any versioning of the values of
the macro, so XPG4.2 without UX-shaded interfaces is the only sensible
set of interfaces for glibc to expose given _XOPEN_SOURCE=1 without
_XOPEN_SOURCE_EXTENDED defined.)

This patch fixes the naming in the conform/ tests, so that what is now
called XPG4 is changed to XPG42, and what is now called XPG3 is
changed to XPG4.

Tested for x86_64 (and verified the complete set of expectations is
unchanged by the patch beyond the intended renaming).

	* conform/GlibcConform.pm (XPG4): Rename standard to XPG42.
	(XPG3): Rename standard to XPG4.
	* conform/Makefile: Likewise.
	* conform/list-header-symbols.pl: Likewise.
	* conform/data/aio.h-data: Likewise.
	* conform/data/arpa/inet.h-data: Likewise.
	* conform/data/complex.h-data: Likewise.
	* conform/data/ctype.h-data: Likewise.
	* conform/data/dlfcn.h-data: Likewise.
	* conform/data/fcntl.h-data: Likewise.
	* conform/data/fenv.h-data: Likewise.
	* conform/data/float.h-data: Likewise.
	* conform/data/fmtmsg.h-data: Likewise.
	* conform/data/ftw.h-data: Likewise.
	* conform/data/grp.h-data: Likewise.
	* conform/data/inttypes.h-data: Likewise.
	* conform/data/iso646.h-data: Likewise.
	* conform/data/langinfo.h-data: Likewise.
	* conform/data/libgen.h-data: Likewise.
	* conform/data/limits.h-data: Likewise.
	* conform/data/locale.h-data: Likewise.
	* conform/data/math.h-data: Likewise.
	* conform/data/mqueue.h-data: Likewise.
	* conform/data/ndbm.h-data: Likewise.
	* conform/data/net/if.h-data: Likewise.
	* conform/data/netdb.h-data: Likewise.
	* conform/data/netinet/in.h-data: Likewise.
	* conform/data/poll.h-data: Likewise.
	* conform/data/pthread.h-data: Likewise.
	* conform/data/pwd.h-data: Likewise.
	* conform/data/sched.h-data: Likewise.
	* conform/data/search.h-data: Likewise.
	* conform/data/semaphore.h-data: Likewise.
	* conform/data/signal.h-data: Likewise.
	* conform/data/spawn.h-data: Likewise.
	* conform/data/stdbool.h-data: Likewise.
	* conform/data/stdint.h-data: Likewise.
	* conform/data/stdio.h-data: Likewise.
	* conform/data/stdlib.h-data: Likewise.
	* conform/data/string.h-data: Likewise.
	* conform/data/strings.h-data: Likewise.
	* conform/data/stropts.h-data: Likewise.
	* conform/data/sys/mman.h-data: Likewise.
	* conform/data/sys/resource.h-data: Likewise.
	* conform/data/sys/select.h-data: Likewise.
	* conform/data/sys/socket.h-data: Likewise.
	* conform/data/sys/stat.h-data: Likewise.
	* conform/data/sys/statvfs.h-data: Likewise.
	* conform/data/sys/time.h-data: Likewise.
	* conform/data/sys/timeb.h-data: Likewise.
	* conform/data/sys/types.h-data: Likewise.
	* conform/data/sys/uio.h-data: Likewise.
	* conform/data/sys/un.h-data: Likewise.
	* conform/data/sys/wait.h-data: Likewise.
	* conform/data/syslog.h-data: Likewise.
	* conform/data/termios.h-data: Likewise.
	* conform/data/tgmath.h-data: Likewise.
	* conform/data/time.h-data: Likewise.
	* conform/data/ucontext.h-data: Likewise.
	* conform/data/unistd.h-data: Likewise.
	* conform/data/utmpx.h-data: Likewise.
	* conform/data/varargs.h-data: Likewise.
	* conform/data/wchar.h-data: Likewise.
	* conform/data/wctype.h-data: Likewise.

1 files changed, 34 insertions, 34 deletions

diff --git a/conform/data/unistd.h-data b/conform/data/unistd.h-data
index 3047654eb0..ddf4f25132 100644
--- a/conform/data/unistd.h-data
+++ b/conform/data/unistd.h-data
@@ -7,7 +7,7 @@
 #endif
 
 constant _POSIX_VERSION
-#if defined POSIX || defined XPG3 || defined XPG4 || defined UNIX98
+#if defined POSIX || defined XPG4 || defined XPG42 || defined UNIX98
 constant _POSIX2_C_VERSION
 #endif
 #ifndef POSIX
@@ -375,7 +375,7 @@ constant _SC_THREAD_ROBUST_PRIO_INHERIT
 constant _SC_THREAD_ROBUST_PRIO_PROTECT
 #endif
 
-#if !defined XPG3 && !defined POSIX && !defined POSIX2008
+#if !defined XPG4 && !defined POSIX && !defined POSIX2008
 constant F_LOCK
 constant F_ULOCK
 constant F_TEST
@@ -417,21 +417,21 @@ type off_t
 type pid_t
 #endif
 
-#if !defined POSIX && !defined XPG3
+#if !defined POSIX && !defined XPG4
 type useconds_t
 
-# ifndef XPG4
+# ifndef XPG42
 type intptr_t
 # endif
 #endif
 
 function int access (const char*, int)
 function {unsigned int} alarm (unsigned int)
-#if !defined XOPEN2K && !defined XOPEN2K8 && !defined XPG3 && !defined POSIX && !defined POSIX2008
+#if !defined XOPEN2K && !defined XOPEN2K8 && !defined XPG4 && !defined POSIX && !defined POSIX2008
 function int brk (void*)
 #endif
 function int chdir (const char*)
-#if defined XPG3 || defined XPG4 || defined UNIX98
+#if defined XPG4 || defined XPG42 || defined UNIX98
 function int chroot (const char*)
 #endif
 function int chown (const char*, uid_t, gid_t)
@@ -440,7 +440,7 @@ function size_t confstr (int, char*, size_t)
 #if !defined POSIX && !defined POSIX2008
 function {char*} crypt (const char*, const char*)
 #endif
-#if defined XPG3 || defined XPG4 || defined UNIX98
+#if defined XPG4 || defined XPG42 || defined UNIX98
 function {char*} ctermid (char*)
 function {char*} cuserid (char*)
 #endif
@@ -462,16 +462,16 @@ function void _exit (int)
 # if defined XOPEN2K8 || defined POSIX2008
 function int faccessat (int, const char*, int, int)
 # endif
-#if !defined XPG3 && !defined POSIX
+#if !defined XPG4 && !defined POSIX
 function int fchown (int, uid_t, gid_t)
 #endif
 # if defined XOPEN2K8 || defined POSIX2008
 function int fchownat (int, const char*, uid_t, gid_t, int)
 # endif
-#if !defined XPG3 && !defined POSIX
+#if !defined XPG4 && !defined POSIX
 function int fchdir (int)
 #endif
-#if !defined XPG3 && !defined XPG4
+#if !defined XPG4 && !defined XPG42
 function int fdatasync (int)
 #endif
 # if defined XOPEN2K8 || defined POSIX2008
@@ -480,56 +480,56 @@ function int fexecve (int, char *const[], char *const[])
 function pid_t fork (void)
 function {long int} fpathconf (int, int)
 function int fsync (int)
-#ifndef XPG3
+#ifndef XPG4
 function int ftruncate (int, off_t)
 #endif
 function {char*} getcwd (char*, size_t)
-#if !defined XOPEN2K && !defined XOPEN2K8 && !defined XPG3 && !defined POSIX && !defined POSIX2008
+#if !defined XOPEN2K && !defined XOPEN2K8 && !defined XPG4 && !defined POSIX && !defined POSIX2008
 function int getdtablesize (void)
 #endif
 function gid_t getegid (void)
 function uid_t geteuid (void)
 function gid_t getgid (void)
 function int getgroups (int, gid_t[])
-#if !defined XPG3 && !defined POSIX && !defined POSIX2008
+#if !defined XPG4 && !defined POSIX && !defined POSIX2008
 function long gethostid (void)
 #endif
-#if !defined POSIX && !defined XPG3
+#if !defined POSIX && !defined XPG4
 function int gethostname (char*, size_t)
 #endif
 function {char*} getlogin (void)
-#if !defined XPG3 && !defined XPG4
+#if !defined XPG4 && !defined XPG42
 function int getlogin_r (char*, size_t)
 #endif
 function int getopt (int, char*const[], const char*)
-#if defined XPG4 || defined UNIX98
+#if defined XPG42 || defined UNIX98
 function int getpagesize (void)
 #endif
-#if defined XPG3 || defined XPG4 || defined UNIX98
+#if defined XPG4 || defined XPG42 || defined UNIX98
 function {char*} getpass (const char*)
 #endif
-#if !defined XPG3 && !defined POSIX
+#if !defined XPG4 && !defined POSIX
 function pid_t getpgid (pid_t)
 #endif
 function pid_t getpgrp (void)
 function pid_t getpid (void)
 function pid_t getppid (void)
-#if !defined XPG3 && !defined POSIX
+#if !defined XPG4 && !defined POSIX
 function pid_t getsid (pid_t)
 #endif
 function uid_t getuid (void)
-#if defined XPG4 || defined UNIX98 || defined XOPEN2K
+#if defined XPG42 || defined UNIX98 || defined XOPEN2K
 function {char*} getwd (char*)
 #endif
 function int isatty (int)
-#if !defined XPG3 && !defined POSIX
+#if !defined XPG4 && !defined POSIX
 function int lchown (const char*, uid_t, gid_t)
 #endif
 function int link (const char*, const char*)
 # if defined XOPEN2K8 || defined POSIX2008
 function int linkat (int, const char*, int, const char*, int)
 # endif
-# if !defined XPG3 && !defined POSIX && !defined POSIX2008
+# if !defined XPG4 && !defined POSIX && !defined POSIX2008
 function int lockf (int, int, off_t)
 # endif
 function off_t lseek (int, off_t, int)
@@ -539,33 +539,33 @@ function int nice (int)
 function {long int} pathconf (const char*, int)
 function int pause (void)
 function int pipe (int[2])
-#if !defined POSIX && !defined XPG3 && !defined XPG4
+#if !defined POSIX && !defined XPG4 && !defined XPG42
 function ssize_t pread (int, void*, size_t, off_t)
 #endif
-#if !defined POSIX && !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008 && !defined XPG3 && !defined XPG4
+#if !defined POSIX && !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008 && !defined XPG4 && !defined XPG42
 function int pthread_atfork (void(*)(void), void(*)(void), void(*)(void))
 #endif
-#if !defined POSIX && !defined XPG3 && !defined XPG4
+#if !defined POSIX && !defined XPG4 && !defined XPG42
 function ssize_t pwrite (int, const void*, size_t, off_t)
 #endif
 function ssize_t read (int, void*, size_t)
-#if !defined XPG3 && !defined POSIX
+#if !defined XPG4 && !defined POSIX
 function ssize_t readlink (const char*, char*, size_t)
 #endif
 # if defined XOPEN2K8 || defined POSIX2008
 function ssize_t readlinkat (int, const char*, char*, size_t)
 # endif
 function int rmdir (const char*)
-#if !defined XOPEN2K && !defined XOPEN2K8 && !defined XPG3 && !defined POSIX && !defined POSIX2008
+#if !defined XOPEN2K && !defined XOPEN2K8 && !defined XPG4 && !defined POSIX && !defined POSIX2008
 function {void*} sbrk (intptr_t)
 #endif
-#if !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98
+#if !defined POSIX && !defined XPG4 && !defined XPG42 && !defined UNIX98
 function int setegid (gid_t)
 function int seteuid (uid_t)
 #endif
 function int setgid (gid_t)
 function int setpgid (pid_t, pid_t)
-# if !defined XPG3 && !defined POSIX && !defined POSIX2008
+# if !defined XPG4 && !defined POSIX && !defined POSIX2008
 function pid_t setpgrp (void)
 function int setregid (gid_t, gid_t)
 function int setreuid (uid_t, uid_t)
@@ -576,31 +576,31 @@ function {unsigned int} sleep (unsigned int)
 # if !defined POSIX && !defined POSIX2008
 function void swab (const void*, void*, ssize_t)
 # endif
-#if !defined XPG3 && !defined POSIX
+#if !defined XPG4 && !defined POSIX
 function int symlink (const char*, const char*)
 # endif
 # if defined XOPEN2K8 || defined POSIX2008
 function int symlinkat (const char*, int, const char*)
 # endif
-# if !defined XPG3 && !defined POSIX && !defined POSIX2008
+# if !defined XPG4 && !defined POSIX && !defined POSIX2008
 function void sync (void)
 # endif
 function {long int} sysconf (int)
 function pid_t tcgetpgrp (int)
 function int tcsetpgrp (int, pid_t)
-#if !defined XPG3 && !defined POSIX
+#if !defined XPG4 && !defined POSIX
 function int truncate (const char*, off_t)
 #endif
 function {char*} ttyname (int)
 function int ttyname_r (int, char*, size_t)
-#if defined XPG4 || defined UNIX98 || defined XOPEN2K
+#if defined XPG42 || defined UNIX98 || defined XOPEN2K
 function useconds_t ualarm (useconds_t, useconds_t)
 #endif
 function int unlink (const char*)
 # if defined XOPEN2K8 || defined POSIX2008
 function int unlinkat (int, const char*, int)
 # endif
-#if defined XPG4 || defined UNIX98 || defined XOPEN2K
+#if defined XPG42 || defined UNIX98 || defined XOPEN2K
 function int usleep (useconds_t)
 function pid_t vfork (void)
 #endif