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, 17 insertions, 17 deletions

diff --git a/conform/data/signal.h-data b/conform/data/signal.h-data
index 1443215e40..3651e86ae1 100644
--- a/conform/data/signal.h-data
+++ b/conform/data/signal.h-data
@@ -81,18 +81,18 @@ macro-int-constant SIGSTOP {int} > 0
 macro-int-constant SIGTSTP {int} > 0
 macro-int-constant SIGTTIN {int} > 0
 macro-int-constant SIGTTOU {int} > 0
-# ifndef XPG3
+# ifndef XPG4
 macro-int-constant SIGBUS {int} > 0
 # endif
-# if !defined POSIX && !defined XPG3
+# if !defined POSIX && !defined XPG4
 macro-int-constant SIGPOLL {int} > 0
 macro-int-constant SIGPROF {int} > 0
 macro-int-constant SIGSYS {int} > 0
 # endif
-# if !defined POSIX && !defined XPG3 && !defined POSIX2008
+# if !defined POSIX && !defined XPG4 && !defined POSIX2008
 macro-int-constant SIGTRAP {int} > 0
 # endif
-# if !defined POSIX && !defined XPG3
+# if !defined POSIX && !defined XPG4
 macro-int-constant SIGURG {int} > 0
 macro-int-constant SIGVTALRM {int} > 0
 macro-int-constant SIGXCPU {int} > 0
@@ -147,7 +147,7 @@ element {struct sigstack} int ss_onstack
 element {struct sigstack} {void*} ss_sp
 # endif
 
-# ifndef XPG3
+# ifndef XPG4
 type siginfo_t
 
 element siginfo_t int si_signo
@@ -162,12 +162,12 @@ element siginfo_t {void*} si_addr
 element siginfo_t int si_status
 element siginfo_t long si_band
 #  endif
-#  ifndef XPG4
+#  ifndef XPG42
 element siginfo_t {union sigval} si_value
 #  endif
 # endif
 
-# if !defined POSIX && !defined XPG3
+# if !defined POSIX && !defined XPG4
 constant ILL_ILLOPC
 constant ILL_ILLOPN
 constant ILL_ILLADR
@@ -202,7 +202,7 @@ constant POLL_ERR
 constant POLL_PRI
 constant POLL_HUP
 # endif
-# if !defined POSIX && !defined XPG3 && !defined POSIX2008
+# if !defined POSIX && !defined XPG4 && !defined POSIX2008
 constant TRAP_BRKPT
 constant TRAP_TRACE
 # endif
@@ -219,7 +219,7 @@ function int kill (pid_t, int)
 # if !defined POSIX && !defined POSIX2008
 function int killpg (pid_t, int)
 # endif
-# if !defined XPG3 && !defined XPG4
+# if !defined XPG4 && !defined XPG42
 function int pthread_kill (pthread_t, int)
 function int pthread_sigmask (int, const sigset_t*, sigset_t*)
 # endif
@@ -242,7 +242,7 @@ function int sigpause (int)
 # endif
 function int sigpending (sigset_t*)
 function int sigprocmask (int, const sigset_t*, sigset_t*)
-# if !defined XPG3 && !defined XPG4
+# if !defined XPG4 && !defined XPG42
 function int sigqueue (pid_t, int, const union sigval)
 # endif
 # if !defined POSIX && !defined POSIX2008
@@ -253,11 +253,11 @@ function void (*sigset (int, void(*)(int)))(int)
 function int sigstack (struct sigstack*, struct sigstack*)
 # endif
 function int sigsuspend (const sigset_t*)
-# if !defined XPG3 && !defined XPG4
+# if !defined XPG4 && !defined XPG42
 function int sigtimedwait (const sigset_t*, siginfo_t*, const struct timespec*)
 # endif
 function int sigwait (const sigset_t*, int*)
-# if !defined XPG3 && !defined XPG4
+# if !defined XPG4 && !defined XPG42
 function int sigwaitinfo (const sigset_t*, siginfo_t*)
 # endif
 # if defined XOPEN2K8 || defined POSIX2008
@@ -269,19 +269,19 @@ function void psignal (int, const char*)
 // poorfnmatch implementation doesn't grok the right form.
 allow sa_*
 allow SA_*
-# ifndef XPG3
+# ifndef XPG4
 allow si_*
 allow SI_*
 # endif
-# if !defined XPG3 && !defined XPG4
+# if !defined XPG4 && !defined XPG42
 allow sigev_*
 allow SIGEV_*
 allow sival_*
 # endif
-# if !defined POSIX && !defined XPG3 && !defined XPG4
+# if !defined POSIX && !defined XPG4 && !defined XPG42
 allow uc_*
 # endif
-# if !defined POSIX && !defined XPG3
+# if !defined POSIX && !defined XPG4
 allow BUS_*
 allow CLD_*
 allow FPE_*
@@ -289,7 +289,7 @@ allow ILL_*
 allow POLL_*
 allow SEGV_*
 # endif
-# if !defined POSIX && !defined XPG3 && !defined POSIX2008
+# if !defined POSIX && !defined XPG4 && !defined POSIX2008
 allow SS_*
 allow SV_*
 allow TRAP_*