22 files changed, 436 insertions, 129 deletions

diff --git a/Configure b/Configure
index 429e4292a7..ac27e5f895 100755
--- a/Configure
+++ b/Configure
@@ -20,7 +20,7 @@
 
 # $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $
 #
-# Generated on Tue May 28 16:40:58 EET DST 2002 [metaconfig 3.0 PL70]
+# Generated on Tue May 28 23:03:39 EET DST 2002 [metaconfig 3.0 PL70]
 # (with additional metaconfig patches by perlbug@perl.org)
 
 cat >c1$$ <<EOF
diff --git a/NetWare/Makefile b/NetWare/Makefile
index 813fbe9295..aae82e7ce2 100644
--- a/NetWare/Makefile
+++ b/NetWare/Makefile
@@ -75,7 +75,7 @@ SECURITYBASE		= P:\apps\script\sw\nwsec
 SECURITY_IMPORTS	= $(SECURITYBASE)\imports
 
     # Here comes the CW tools - TO BE FILLED TO BUILD WITH CW -
-MODULE_DESC     = "Perl 5.7.3 for NetWare"
+MODULE_DESC     = "Perl 5.8.0 for NetWare"
 CCTYPE          = CodeWarrior
 C_COMPILER		= mwccnlm -c
 CPP_COMPILER	= mwccnlm
@@ -418,7 +418,7 @@ INST_NW_TOP2 = $(INST_NW_DRV)\perl
 # versioned installation can be obtained by setting INST_TOP above to a
 # path that includes an arbitrary version string.
 #
-INST_VER	= \5.7.2
+INST_VER	= \5.8.0
 
 #
 # Comment this out if you DON'T want your perl installation to have
diff --git a/NetWare/config_H.wc b/NetWare/config_H.wc
index 8865df0d03..93921318b8 100644
--- a/NetWare/config_H.wc
+++ b/NetWare/config_H.wc
@@ -1027,7 +1027,7 @@
  *	This symbol contains the ~name expanded version of ARCHLIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define ARCHLIB "c:\\perl\\5.7.3\\lib\\NetWare-x86-multi-thread"		/**/
+#define ARCHLIB "c:\\perl\\5.8.0\\lib\\NetWare-x86-multi-thread"		/**/
 /*#define ARCHLIB_EXP ""	/**/
 
 /* ARCHNAME:
@@ -1058,8 +1058,8 @@
  *	This symbol is the filename expanded version of the BIN symbol, for
  *	programs that do not want to deal with that at run-time.
  */
-#define BIN "c:\\perl\\5.7.3\\bin\\NetWare-x86-multi-thread"	/**/
-#define BIN_EXP "c:\\perl\\5.7.3\\bin\\NetWare-x86-multi-thread"	/**/
+#define BIN "c:\\perl\\5.8.0\\bin\\NetWare-x86-multi-thread"	/**/
+#define BIN_EXP "c:\\perl\\5.8.0\\bin\\NetWare-x86-multi-thread"	/**/
 
 /* BYTEORDER:
  *	This symbol holds the hexadecimal constant defined in byteorder,
@@ -2990,7 +2990,7 @@
  *	This symbol contains the ~name expanded version of SITEARCH, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define SITEARCH "c:\\perl\\site\\5.7.3\\lib\\NetWare-x86-multi-thread"		/**/
+#define SITEARCH "c:\\perl\\site\\5.8.0\\lib\\NetWare-x86-multi-thread"		/**/
 /*#define SITEARCH_EXP ""	/**/
 
 /* SITELIB:
@@ -3013,8 +3013,8 @@
  *	removed.  The elements in inc_version_list (inc_version_list.U) can
  *	be tacked onto this variable to generate a list of directories to search.
  */
-#define SITELIB "c:\\perl\\site\\5.7.3\\lib"		/**/
-#define SITELIB_EXP (nw_get_sitelib("5.7.3"))	/**/
+#define SITELIB "c:\\perl\\site\\5.8.0\\lib"		/**/
+#define SITELIB_EXP (nw_get_sitelib("5.8.0"))	/**/
 #define SITELIB_STEM ""		/**/
 
 /* Size_t_size:
@@ -3251,7 +3251,7 @@
 /* PERL_XS_APIVERSION:
  *	This variable contains the version of the oldest perl binary
  *	compatible with the present perl.  perl.c:incpush() and
- *	lib/lib.pm will automatically search in c:\\perl\\site\\5.7.3\\lib\\NetWare-x86-multi-thread for older
+ *	lib/lib.pm will automatically search in c:\\perl\\site\\5.8.0\\lib\\NetWare-x86-multi-thread for older
  *	directories across major versions back to xs_apiversion.
  *	This is only useful if you have a perl library directory tree
  *	structured like the default one.
@@ -3270,7 +3270,7 @@
  *	compatible with the present perl.  (That is, pure perl modules
  *	written for pm_apiversion will still work for the current
  *	version).  perl.c:incpush() and lib/lib.pm will automatically
- *	search in c:\\perl\\site\\5.7.3\\lib for older directories across major versions
+ *	search in c:\\perl\\site\\5.8.0\\lib for older directories across major versions
  *	back to pm_apiversion.  This is only useful if you have a perl
  *	library directory tree structured like the default one.  The
  *	versioned site_perl library was introduced in 5.005, so that's
@@ -3280,7 +3280,7 @@
  *	(presumably) be similar.
  *	See the INSTALL file for how this works.
  */
-#define PERL_XS_APIVERSION "5.6.0"
+#define PERL_XS_APIVERSION "5.8.0"
 #define PERL_PM_APIVERSION "5.005"
 
 /* SETUID_SCRIPTS_ARE_SECURE_NOW:
diff --git a/Porting/config.sh b/Porting/config.sh
index c874082e60..1f04fb3c10 100644
--- a/Porting/config.sh
+++ b/Porting/config.sh
@@ -8,7 +8,7 @@
 
 # Package name      : perl5
 # Source directory  : .
-# Configuration time: Mon May 20 18:22:54 EET DST 2002
+# Configuration time: Tue May 28 23:24:18 EET DST 2002
 # Configured by     : jhi
 # Target system     : osf1 alpha.hut.fi v4.0 878 alpha 
 
@@ -32,12 +32,12 @@ alignbytes='8'
 ansi2knr=''
 aphostname=''
 api_revision='5'
-api_subversion='3'
-api_version='7'
-api_versionstring='5.7.3'
+api_subversion='0'
+api_version='8'
+api_versionstring='5.8.0'
 ar='ar'
-archlib='/opt/perl/lib/5.7.3/alpha-dec_osf'
-archlibexp='/opt/perl/lib/5.7.3/alpha-dec_osf'
+archlib='/opt/perl/lib/5.8.0/alpha-dec_osf'
+archlibexp='/opt/perl/lib/5.8.0/alpha-dec_osf'
 archname64=''
 archname='alpha-dec_osf'
 archobjs=''
@@ -55,7 +55,7 @@ castflags='0'
 cat='cat'
 cc='cc'
 cccdlflags=' '
-ccdlflags='  -Wl,-rpath,/opt/perl/lib/5.7.3/alpha-dec_osf/CORE'
+ccdlflags='  -Wl,-rpath,/opt/perl/lib/5.8.0/alpha-dec_osf/CORE'
 ccflags='-std -D_INTRINSICS -fprm d -ieee -DLANGUAGE_C'
 ccflags_uselargefiles=''
 ccname='cc'
@@ -63,7 +63,7 @@ ccsymbols='__alpha=1 __LANGUAGE_C__=1 __osf__=1 __unix__=1 _LONGLONG=1 _SYSTYPE_
 ccversion='V5.6-082'
 cf_by='jhi'
 cf_email='yourname@yourhost.yourplace.com'
-cf_time='Mon May 20 18:22:54 EET DST 2002'
+cf_time='Tue May 28 23:24:18 EET DST 2002'
 charsize='1'
 chgrp=''
 chmod='chmod'
@@ -650,23 +650,23 @@ i_varargs='undef'
 i_varhdr='stdarg.h'
 i_vfork='undef'
 ignore_versioned_solibs=''
-inc_version_list=''
+inc_version_list=' '
 inc_version_list_init='0'
 incpath=''
 inews=''
-installarchlib='/opt/perl/lib/5.7.3/alpha-dec_osf'
+installarchlib='/opt/perl/lib/5.8.0/alpha-dec_osf'
 installbin='/opt/perl/bin'
 installman1dir='/opt/perl/man/man1'
 installman3dir='/opt/perl/man/man3'
 installprefix='/opt/perl'
 installprefixexp='/opt/perl'
-installprivlib='/opt/perl/lib/5.7.3'
+installprivlib='/opt/perl/lib/5.8.0'
 installscript='/opt/perl/bin'
-installsitearch='/opt/perl/lib/site_perl/5.7.3/alpha-dec_osf'
+installsitearch='/opt/perl/lib/site_perl/5.8.0/alpha-dec_osf'
 installsitebin='/opt/perl/bin'
-installsitelib='/opt/perl/lib/site_perl/5.7.3'
+installsitelib='/opt/perl/lib/site_perl/5.8.0'
 installstyle='lib'
-installusrbinperl='undef'
+installusrbinperl='define'
 installvendorarch=''
 installvendorbin=''
 installvendorlib=''
@@ -765,14 +765,14 @@ otherlibdirs=' '
 package='perl5'
 pager='/usr/local/bin/less'
 passcat='cat /etc/passwd'
-patchlevel='7'
+patchlevel='8'
 path_sep=':'
 perl5='perl'
 perl=''
-perl_patchlevel='16693'
+perl_patchlevel='16824'
 perladmin='yourname@yourhost.yourplace.com'
 perllibs='-lm -lutil'
-perlpath='/opt/perl/bin/perl5.7.3'
+perlpath='/opt/perl/bin/perl'
 pg='pg'
 phostname=''
 pidtype='pid_t'
@@ -782,8 +782,8 @@ pmake=''
 pr=''
 prefix='/opt/perl'
 prefixexp='/opt/perl'
-privlib='/opt/perl/lib/5.7.3'
-privlibexp='/opt/perl/lib/5.7.3'
+privlib='/opt/perl/lib/5.8.0'
+privlibexp='/opt/perl/lib/5.8.0'
 procselfexe=''
 prototype='define'
 ptrsize='8'
@@ -844,13 +844,13 @@ sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26
 sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 6, 6, 16, 20, 23, 23, 23, 29, 48, 0'
 sig_size='58'
 signal_t='void'
-sitearch='/opt/perl/lib/site_perl/5.7.3/alpha-dec_osf'
-sitearchexp='/opt/perl/lib/site_perl/5.7.3/alpha-dec_osf'
+sitearch='/opt/perl/lib/site_perl/5.8.0/alpha-dec_osf'
+sitearchexp='/opt/perl/lib/site_perl/5.8.0/alpha-dec_osf'
 sitebin='/opt/perl/bin'
 sitebinexp='/opt/perl/bin'
-sitelib='/opt/perl/lib/site_perl/5.7.3'
+sitelib='/opt/perl/lib/site_perl/5.8.0'
 sitelib_stem='/opt/perl/lib/site_perl'
-sitelibexp='/opt/perl/lib/site_perl/5.7.3'
+sitelibexp='/opt/perl/lib/site_perl/5.8.0'
 siteprefix='/opt/perl'
 siteprefixexp='/opt/perl'
 sizesize='8'
@@ -868,7 +868,7 @@ srand48_r_proto='0'
 srandom_r_proto='0'
 src='.'
 ssizetype='ssize_t'
-startperl='#!/opt/perl/bin/perl5.7.3'
+startperl='#!/opt/perl/bin/perl'
 startsh='#!/bin/sh'
 static_ext=' '
 stdchar='unsigned char'
@@ -881,7 +881,7 @@ stdio_stream_array='_iob'
 strerror_r_proto='0'
 strings='/usr/include/string.h'
 submit=''
-subversion='3'
+subversion='0'
 sysman='/usr/share/man/man1'
 tail=''
 tar=''
@@ -952,21 +952,21 @@ vendorlib_stem=''
 vendorlibexp=''
 vendorprefix=''
 vendorprefixexp=''
-version='5.7.3'
-version_patchlevel_string='version 7 subversion 3 patch 16693'
-versiononly='define'
+version='5.8.0'
+version_patchlevel_string='version 8 subversion 0 patch 16824'
+versiononly='undef'
 vi=''
 voidflags='15'
 xlibpth='/usr/lib/386 /lib/386'
-xs_apiversion='5.7.3'
+xs_apiversion='5.8.0'
 perl5='yacc'
 yaccflags=''
 zcat=''
 zip='zip'
 # Configure command line arguments.
 config_arg0='./Configure'
-config_args='-Dprefix=/opt/perl -Duse64bitint -Duselargefiles -Dcf_by=yourname -Dcf_email=yourname@yourhost.yourplace.com -Dperladmin=yourname@yourhost.yourplace.com -Dmydomain=.yourplace.com -Dmyhostname=yourhost -dE -Dusedevel'
-config_argc=10
+config_args='-Dprefix=/opt/perl -Duse64bitint -Duselargefiles -Dcf_by=yourname -Dcf_email=yourname@yourhost.yourplace.com -Dperladmin=yourname@yourhost.yourplace.com -Dmydomain=.yourplace.com -Dmyhostname=yourhost -dE'
+config_argc=9
 config_arg1='-Dprefix=/opt/perl'
 config_arg2='-Duse64bitint'
 config_arg3='-Duselargefiles'
@@ -976,14 +976,13 @@ config_arg6='-Dperladmin=yourname@yourhost.yourplace.com'
 config_arg7='-Dmydomain=.yourplace.com'
 config_arg8='-Dmyhostname=yourhost'
 config_arg9='-dE'
-config_arg10='-Dusedevel'
 PERL_REVISION=5
-PERL_VERSION=7
-PERL_SUBVERSION=3
+PERL_VERSION=8
+PERL_SUBVERSION=0
 PERL_API_REVISION=5
-PERL_API_VERSION=7
-PERL_API_SUBVERSION=3
-PERL_PATCHLEVEL=16693
+PERL_API_VERSION=8
+PERL_API_SUBVERSION=0
+PERL_PATCHLEVEL=16824
 PERL_CONFIG_SH=true
 # Variables propagated from previous config.sh file.
 pp_sys_cflags='ccflags="$ccflags -DNO_EFF_ONLY_OK"'
diff --git a/Porting/config_H b/Porting/config_H
index 911bd39a5c..960fc9d708 100644
--- a/Porting/config_H
+++ b/Porting/config_H
@@ -17,7 +17,7 @@
 /*
  * Package name      : perl5
  * Source directory  : .
- * Configuration time: Mon May 20 18:22:54 EET DST 2002
+ * Configuration time: Tue May 28 23:24:18 EET DST 2002
  * Configured by     : jhi
  * Target system     : osf1 alpha.hut.fi v4.0 878 alpha 
  */
@@ -984,8 +984,8 @@
  *	This symbol contains the ~name expanded version of ARCHLIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define ARCHLIB "/opt/perl/lib/5.7.3/alpha-dec_osf"		/**/
-#define ARCHLIB_EXP "/opt/perl/lib/5.7.3/alpha-dec_osf"		/**/
+#define ARCHLIB "/opt/perl/lib/5.8.0/alpha-dec_osf"		/**/
+#define ARCHLIB_EXP "/opt/perl/lib/5.8.0/alpha-dec_osf"		/**/
 
 /* ARCHNAME:
  *	This symbol holds a string representing the architecture name.
@@ -2985,7 +2985,7 @@
  *	This symbol, if defined, indicates that Perl is to be installed
  * 	also as /usr/bin/perl.
  */
-/*#define INSTALL_USR_BIN_PERL	/ **/
+#define INSTALL_USR_BIN_PERL	/**/
 
 /* PERL_PRIfldbl:
  *	This symbol, if defined, contains the string used by stdio to
@@ -3276,8 +3276,8 @@
  *	This symbol contains the ~name expanded version of PRIVLIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define PRIVLIB "/opt/perl/lib/5.7.3"		/**/
-#define PRIVLIB_EXP "/opt/perl/lib/5.7.3"		/**/
+#define PRIVLIB "/opt/perl/lib/5.8.0"		/**/
+#define PRIVLIB_EXP "/opt/perl/lib/5.8.0"		/**/
 
 /* PTRSIZE:
  *	This symbol contains the size of a pointer, so that the C preprocessor
@@ -3380,8 +3380,8 @@
  *	This symbol contains the ~name expanded version of SITEARCH, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define SITEARCH "/opt/perl/lib/site_perl/5.7.3/alpha-dec_osf"		/**/
-#define SITEARCH_EXP "/opt/perl/lib/site_perl/5.7.3/alpha-dec_osf"		/**/
+#define SITEARCH "/opt/perl/lib/site_perl/5.8.0/alpha-dec_osf"		/**/
+#define SITEARCH_EXP "/opt/perl/lib/site_perl/5.8.0/alpha-dec_osf"		/**/
 
 /* SITELIB:
  *	This symbol contains the name of the private library for this package.
@@ -3403,8 +3403,8 @@
  *	removed.  The elements in inc_version_list (inc_version_list.U) can
  *	be tacked onto this variable to generate a list of directories to search.
  */
-#define SITELIB "/opt/perl/lib/site_perl/5.7.3"		/**/
-#define SITELIB_EXP "/opt/perl/lib/site_perl/5.7.3"		/**/
+#define SITELIB "/opt/perl/lib/site_perl/5.8.0"		/**/
+#define SITELIB_EXP "/opt/perl/lib/site_perl/5.8.0"		/**/
 #define SITELIB_STEM "/opt/perl/lib/site_perl"		/**/
 
 /* Size_t_size:
@@ -3441,7 +3441,7 @@
  *	script to make sure (one hopes) that it runs with perl and not
  *	some shell.
  */
-#define STARTPERL "#!/opt/perl/bin/perl5.7.3"		/**/
+#define STARTPERL "#!/opt/perl/bin/perl"		/**/
 
 /* STDCHAR:
  *	This symbol is defined to be the type of char used in stdio.h.
@@ -3641,7 +3641,7 @@
 /* PERL_XS_APIVERSION:
  *	This variable contains the version of the oldest perl binary
  *	compatible with the present perl.  perl.c:incpush() and
- *	lib/lib.pm will automatically search in /opt/perl/lib/site_perl/5.7.3/alpha-dec_osf for older
+ *	lib/lib.pm will automatically search in /opt/perl/lib/site_perl/5.8.0/alpha-dec_osf for older
  *	directories across major versions back to xs_apiversion.
  *	This is only useful if you have a perl library directory tree
  *	structured like the default one.
@@ -3660,7 +3660,7 @@
  *	compatible with the present perl.  (That is, pure perl modules
  *	written for pm_apiversion will still work for the current
  *	version).  perl.c:incpush() and lib/lib.pm will automatically
- *	search in /opt/perl/lib/site_perl/5.7.3 for older directories across major versions
+ *	search in /opt/perl/lib/site_perl/5.8.0 for older directories across major versions
  *	back to pm_apiversion.  This is only useful if you have a perl
  *	library directory tree structured like the default one.  The
  *	versioned site_perl library was introduced in 5.005, so that's
@@ -3670,7 +3670,7 @@
  *	(presumably) be similar.
  *	See the INSTALL file for how this works.
  */
-#define PERL_XS_APIVERSION "5.7.3"
+#define PERL_XS_APIVERSION "5.8.0"
 #define PERL_PM_APIVERSION "5.005"
 
 /* HAS_CRYPT:
diff --git a/README.tru64 b/README.tru64
index f64fd9ca38..64cefa9512 100644
--- a/README.tru64
+++ b/README.tru64
@@ -105,7 +105,7 @@ not to mention the even more advanced DB_File.
 
 If you get an error like
 
-    Can't load '.../OSF1/lib/perl5/5.7.3/alpha-dec_osf/auto/IO/IO.so' for module IO: Unresolved symbol in .../lib/perl5/5.7.3/alpha-dec_osf/auto/IO/IO.so: sockatmark at .../lib/perl5/5.7.3/alpha-dec_osf/XSLoader.pm line 75.
+    Can't load '.../OSF1/lib/perl5/5.8.0/alpha-dec_osf/auto/IO/IO.so' for module IO: Unresolved symbol in .../lib/perl5/5.8.0/alpha-dec_osf/auto/IO/IO.so: sockatmark at .../lib/perl5/5.8.0/alpha-dec_osf/XSLoader.pm line 75.
 
 you need to either recompile your Perl in Tru64 4.0D or upgrade your
 Tru64 4.0D: the sockatmark() system call was added in Tru64 4.0F, and
diff --git a/epoc/config.sh b/epoc/config.sh
index 3b8862c280..a19e735a2d 100644
--- a/epoc/config.sh
+++ b/epoc/config.sh
@@ -33,8 +33,8 @@ apirevision=''
 apisubversion=''
 apiversion=''
 ar='arm-epoc-pe-ar'
-archlib='/usr/lib/perl/5.7.3/epoc'
-archlibexp='/usr/lib/perl/5.7.3/epoc'
+archlib='/usr/lib/perl/5.8.0/epoc'
+archlibexp='/usr/lib/perl/5.8.0/epoc'
 archname64=''
 archname='epoc'
 archobjs='epoc.o epocish.o epoc_stubs.o'
@@ -713,8 +713,8 @@ pmake=''
 pr=''
 prefix=''
 prefixexp=''
-privlib='/usr/lib/perl/5.7.3'
-privlibexp='/usr/lib/perl/5.7.3'
+privlib='/usr/lib/perl/5.8.0'
+privlibexp='/usr/lib/perl/5.8.0'
 procselfexe=''
 prototype='define'
 ptrsize='4'
@@ -769,11 +769,11 @@ sig_num='0'
 sig_num_init='0, 0'
 sig_size='1'
 signal_t='void'
-sitearch='/usr/lib/perl/site_perl/5.7.3/epoc'
-sitearchexp='/usr/lib/perl/site_perl/5.7.3/epoc'
-sitelib='/usr/lib/perl/site_perl/5.7.3/'
+sitearch='/usr/lib/perl/site_perl/5.8.0/epoc'
+sitearchexp='/usr/lib/perl/site_perl/5.8.0/epoc'
+sitelib='/usr/lib/perl/site_perl/5.8.0/'
 sitelib_stem='/usr/lib/perl/site_perl'
-sitelibexp='/usr/lib/perl/site_perl/5.7.3/'
+sitelibexp='/usr/lib/perl/site_perl/5.8.0/'
 siteprefix=''
 siteprefixexp=''
 sizesize='4'
@@ -850,7 +850,7 @@ vendorlib_stem=''
 vendorlibexp=''
 vendorprefix=''
 vendorprefixexp=''
-version='5.7.3'
+version='5.8.0'
 versiononly='undef'
 vi=''
 voidflags='15'
@@ -982,7 +982,7 @@ vendorlib_stem=''
 vendorlibexp=''
 vendorprefix=''
 vendorprefixexp=''
-version='5.7.3'
+version='5.8.0'
 vi=''
 voidflags='15'
 xlibpth=''
diff --git a/patchlevel.h b/patchlevel.h
index 6931a48a43..76841bc185 100644
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -13,8 +13,8 @@
  * exactly on the third column */
 
 #define PERL_REVISION	5		/* age */
-#define PERL_VERSION	7		/* epoch */
-#define PERL_SUBVERSION	3		/* generation */
+#define PERL_VERSION	8		/* epoch */
+#define PERL_SUBVERSION	0		/* generation */
 
 /* The following numbers describe the earliest compatible version of
    Perl ("compatibility" here being defined as sufficient binary/API
@@ -30,8 +30,8 @@
    to include in @INC.  See INSTALL for how this works.
 */
 #define PERL_API_REVISION	5	/* Adjust manually as needed.  */
-#define PERL_API_VERSION	7	/* Adjust manually as needed.  */
-#define PERL_API_SUBVERSION	3	/* Adjust manually as needed.  */
+#define PERL_API_VERSION	8	/* Adjust manually as needed.  */
+#define PERL_API_SUBVERSION	0	/* Adjust manually as needed.  */
 /*
    XXX Note:  The selection of non-default Configure options, such
    as -Duselonglong may invalidate these settings.  Currently, Configure
diff --git a/t/op/ver.t b/t/op/ver.t
index f1add6186b..1634cc340f 100755
--- a/t/op/ver.t
+++ b/t/op/ver.t
@@ -205,9 +205,20 @@ is(v200, eval("+v200"), 'v200 eq eval("+v200")' );
 # Tests for string/numeric value of $] itself
 my ($revision,$version,$subversion) = split '\.', sprintf("%vd",$^V);
 
+print "# revision   = '$revision'\n";
+print "# version    = '$version'\n";
+print "# subversion = '$subversion'\n";
+
 my $v = sprintf("%d.%.3d%.3d",$revision,$version,$subversion);
 
-ok( $v eq "$]", qq{"\$^V eq "\$]"});
+print "# v = '$v'\n";
+print "# ] = '$]'\n";
+
+$v =~ s/000$// if $subversion == 0;
+
+print "# v = '$v'\n";
+
+ok( $v eq "$]", qq{\$^V eq "\$]"});
 
 $v = $revision + $version/1000 + $subversion/1000000;
 
diff --git a/uconfig.h b/uconfig.h
index be68ef32c4..cffe40e1d3 100644
--- a/uconfig.h
+++ b/uconfig.h
@@ -3666,7 +3666,7 @@
  *	(presumably) be similar.
  *	See the INSTALL file for how this works.
  */
-#define PERL_XS_APIVERSION "5.005"
+#define PERL_XS_APIVERSION "5.008"
 #define PERL_PM_APIVERSION "5.005"
 
 /* HAS_CRYPT:
diff --git a/uconfig.sh b/uconfig.sh
index a87be050d3..5a06d2e417 100755
--- a/uconfig.sh
+++ b/uconfig.sh
@@ -699,4 +699,4 @@ uvuformat='"lu"'
 uvxformat='"lx"'
 versiononly='undef'
 voidflags=1
-xs_apiversion='5.005'
+xs_apiversion='5.008'
diff --git a/utils/h2xs.PL b/utils/h2xs.PL
index 1fe427d626..df89626b91 100644
--- a/utils/h2xs.PL
+++ b/utils/h2xs.PL
@@ -607,12 +607,17 @@ if( $opt_b ){
           .  "(i.e. 5.5.0)\n";
     my ($maj,$min,$sub) = split(/\./,$opt_b,3);
     if ($maj < 5 || ($maj == 5 && $min < 6)) {
-        $compat_version = sprintf("%d.%03d%02d",$maj,$min,$sub);
+        $compat_version =
+	    $sub ? sprintf("%d.%03d%02d",$maj,$min,$sub) :
+	           sprintf("%d.%03d",    $maj,$min);
     } else {
-        $compat_version = sprintf("%d.%03d%03d",$maj,$min,$sub);
+        $compat_version =
+	    $sub ? sprintf("%d.%03d%03d",$maj,$min,$sub) :
+		   sprintf("%d.%03d",    $maj,$min);
     }
 } else {
-    my ($maj,$min,$sub) = $compat_version =~ /(\d+)\.(\d\d\d)(\d\d\d?)/;
+    my ($maj,$min,$sub) = $compat_version =~ /(\d+)\.(\d\d\d)(\d*)/;
+    $sub ||= 0;
     warn sprintf <<'EOF', $maj,$min,$sub;
 Defaulting to backwards compatibility with perl %d.%d.%d
 If you intend this module to be compatible with earlier perl versions, please
diff --git a/vos/config.alpha.h b/vos/config.alpha.h
index 916e99cf17..680adfb7b0 100644
--- a/vos/config.alpha.h
+++ b/vos/config.alpha.h
@@ -1016,7 +1016,7 @@
 
 /* BYTEORDER:
  *	This symbol holds the hexadecimal constant defined in byteorder,
- *	i.e. 0x1234 or 0x4321, etc...
+ *	in a UV, i.e. 0x1234 or 0x4321 or 0x12345678, etc...
  *	If the compiler supports cross-compiling or multiple-architecture
  *	binaries (eg. on NeXT systems), use compiler-defined macros to
  *	determine the byte order.
@@ -1130,6 +1130,9 @@
  */
 /* ASCTIME_R_PROTO:
  *	This symbol encodes the prototype of asctime_r.
+ *	It is zero if d_asctime_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_asctime_r
+ *	is defined.
  */
 /*#define HAS_ASCTIME_R	   /**/
 #define ASCTIME_R_PROTO 0	   /**/
@@ -1191,6 +1194,9 @@
  */
 /* CRYPT_R_PROTO:
  *	This symbol encodes the prototype of crypt_r.
+ *	It is zero if d_crypt_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_crypt_r
+ *	is defined.
  */
 /*#define HAS_CRYPT_R	   /**/
 #define CRYPT_R_PROTO 0	   /**/
@@ -1212,6 +1218,9 @@
  */
 /* CTIME_R_PROTO:
  *	This symbol encodes the prototype of ctime_r.
+ *	It is zero if d_ctime_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_ctime_r
+ *	is defined.
  */
 /*#define HAS_CTIME_R	   /**/
 #define CTIME_R_PROTO 0	   /**/
@@ -1230,6 +1239,9 @@
  */
 /* DRAND48_R_PROTO:
  *	This symbol encodes the prototype of drand48_r.
+ *	It is zero if d_drand48_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_drand48_r
+ *	is defined.
  */
 /*#define HAS_DRAND48_R	   /**/
 #define DRAND48_R_PROTO 0	   /**/
@@ -1254,6 +1266,9 @@
  */
 /* ENDGRENT_R_PROTO:
  *	This symbol encodes the prototype of endgrent_r.
+ *	It is zero if d_endgrent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endgrent_r
+ *	is defined.
  */
 /*#define HAS_ENDGRENT_R	   /**/
 #define ENDGRENT_R_PROTO 0	   /**/
@@ -1288,6 +1303,9 @@
  */
 /* ENDPWENT_R_PROTO:
  *	This symbol encodes the prototype of endpwent_r.
+ *	It is zero if d_endpwent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endpwent_r
+ *	is defined.
  */
 /*#define HAS_ENDPWENT_R	   /**/
 #define ENDPWENT_R_PROTO 0	   /**/
@@ -1476,6 +1494,9 @@
  */
 /* GETGRENT_R_PROTO:
  *	This symbol encodes the prototype of getgrent_r.
+ *	It is zero if d_getgrent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getgrent_r
+ *	is defined.
  */
 /*#define HAS_GETGRENT_R	   /**/
 #define GETGRENT_R_PROTO 0	   /**/
@@ -1486,6 +1507,9 @@
  */
 /* GETGRGID_R_PROTO:
  *	This symbol encodes the prototype of getgrgid_r.
+ *	It is zero if d_getgrgid_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getgrgid_r
+ *	is defined.
  */
 /*#define HAS_GETGRGID_R	   /**/
 #define GETGRGID_R_PROTO 0	   /**/
@@ -1496,6 +1520,9 @@
  */
 /* GETGRNAM_R_PROTO:
  *	This symbol encodes the prototype of getgrnam_r.
+ *	It is zero if d_getgrnam_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getgrnam_r
+ *	is defined.
  */
 /*#define HAS_GETGRNAM_R	   /**/
 #define GETGRNAM_R_PROTO 0	   /**/
@@ -1567,6 +1594,9 @@
  */
 /* GETLOGIN_R_PROTO:
  *	This symbol encodes the prototype of getlogin_r.
+ *	It is zero if d_getlogin_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getlogin_r
+ *	is defined.
  */
 /*#define HAS_GETLOGIN_R	   /**/
 #define GETLOGIN_R_PROTO 0	   /**/
@@ -1671,6 +1701,9 @@
  */
 /* GETPWENT_R_PROTO:
  *	This symbol encodes the prototype of getpwent_r.
+ *	It is zero if d_getpwent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getpwent_r
+ *	is defined.
  */
 /*#define HAS_GETPWENT_R	   /**/
 #define GETPWENT_R_PROTO 0	   /**/
@@ -1681,6 +1714,9 @@
  */
 /* GETPWNAM_R_PROTO:
  *	This symbol encodes the prototype of getpwnam_r.
+ *	It is zero if d_getpwnam_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getpwnam_r
+ *	is defined.
  */
 /*#define HAS_GETPWNAM_R	   /**/
 #define GETPWNAM_R_PROTO 0	   /**/
@@ -1691,6 +1727,9 @@
  */
 /* GETPWUID_R_PROTO:
  *	This symbol encodes the prototype of getpwuid_r.
+ *	It is zero if d_getpwuid_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getpwuid_r
+ *	is defined.
  */
 /*#define HAS_GETPWUID_R	   /**/
 #define GETPWUID_R_PROTO 0	   /**/
@@ -1721,6 +1760,9 @@
  */
 /* GETSPNAM_R_PROTO:
  *	This symbol encodes the prototype of getspnam_r.
+ *	It is zero if d_getspnam_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getspnam_r
+ *	is defined.
  */
 /*#define HAS_GETSPNAM_R	   /**/
 #define GETSPNAM_R_PROTO 0	   /**/
@@ -1742,6 +1784,9 @@
  */
 /* GMTIME_R_PROTO:
  *	This symbol encodes the prototype of gmtime_r.
+ *	It is zero if d_gmtime_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_gmtime_r
+ *	is defined.
  */
 /*#define HAS_GMTIME_R	   /**/
 #define GMTIME_R_PROTO 0	   /**/
@@ -1843,6 +1888,9 @@
  */
 /* LOCALTIME_R_PROTO:
  *	This symbol encodes the prototype of localtime_r.
+ *	It is zero if d_localtime_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_localtime_r
+ *	is defined.
  */
 /*#define HAS_LOCALTIME_R	   /**/
 #define LOCALTIME_R_PROTO 0	   /**/
@@ -2005,6 +2053,9 @@
  */
 /* RANDOM_R_PROTO:
  *	This symbol encodes the prototype of random_r.
+ *	It is zero if d_random_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_random_r
+ *	is defined.
  */
 /*#define HAS_RANDOM_R	   /**/
 #define RANDOM_R_PROTO 0	   /**/
@@ -2015,6 +2066,9 @@
  */
 /* READDIR_R_PROTO:
  *	This symbol encodes the prototype of readdir_r.
+ *	It is zero if d_readdir_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_readdir_r
+ *	is defined.
  */
 /*#define HAS_READDIR_R	   /**/
 #define READDIR_R_PROTO 0	   /**/
@@ -2088,6 +2142,9 @@
  */
 /* SETGRENT_R_PROTO:
  *	This symbol encodes the prototype of setgrent_r.
+ *	It is zero if d_setgrent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setgrent_r
+ *	is defined.
  */
 /*#define HAS_SETGRENT_R	   /**/
 #define SETGRENT_R_PROTO 0	   /**/
@@ -2153,6 +2210,9 @@
  */
 /* SETPWENT_R_PROTO:
  *	This symbol encodes the prototype of setpwent_r.
+ *	It is zero if d_setpwent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setpwent_r
+ *	is defined.
  */
 /*#define HAS_SETPWENT_R	   /**/
 #define SETPWENT_R_PROTO 0	   /**/
@@ -2284,6 +2344,9 @@
  */
 /* SRAND48_R_PROTO:
  *	This symbol encodes the prototype of srand48_r.
+ *	It is zero if d_srand48_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_srand48_r
+ *	is defined.
  */
 /*#define HAS_SRAND48_R	   /**/
 #define SRAND48_R_PROTO 0	   /**/
@@ -2294,6 +2357,9 @@
  */
 /* SRANDOM_R_PROTO:
  *	This symbol encodes the prototype of srandom_r.
+ *	It is zero if d_srandom_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_srandom_r
+ *	is defined.
  */
 /*#define HAS_SRANDOM_R	   /**/
 #define SRANDOM_R_PROTO 0	   /**/
@@ -2424,6 +2490,9 @@
  */
 /* STRERROR_R_PROTO:
  *	This symbol encodes the prototype of strerror_r.
+ *	It is zero if d_strerror_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_strerror_r
+ *	is defined.
  */
 /*#define HAS_STRERROR_R	   /**/
 #define STRERROR_R_PROTO 0	   /**/
@@ -2496,6 +2565,9 @@
  */
 /* TMPNAM_R_PROTO:
  *	This symbol encodes the prototype of tmpnam_r.
+ *	It is zero if d_tmpnam_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_tmpnam_r
+ *	is defined.
  */
 /*#define HAS_TMPNAM_R	   /**/
 #define TMPNAM_R_PROTO 0	   /**/
@@ -3810,7 +3882,9 @@
  *	This symbol, if defined, indicates that you must access
  *	character data through U32-aligned pointers.
  */
+#ifndef U32_ALIGNMENT_REQUIRED
 #define U32_ALIGNMENT_REQUIRED	/**/
+#endif
 
 /* HAS_USLEEP_PROTO:
  *	This symbol, if defined, indicates that the system provides
@@ -3844,6 +3918,9 @@
  */
 /* CTERMID_R_PROTO:
  *	This symbol encodes the prototype of ctermid_r.
+ *	It is zero if d_ctermid_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_ctermid_r
+ *	is defined.
  */
 /*#define HAS_CTERMID_R	   /**/
 #define CTERMID_R_PROTO 0	   /**/
@@ -3854,6 +3931,9 @@
  */
 /* ENDHOSTENT_R_PROTO:
  *	This symbol encodes the prototype of endhostent_r.
+ *	It is zero if d_endhostent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endhostent_r
+ *	is defined.
  */
 /*#define HAS_ENDHOSTENT_R	   /**/
 #define ENDHOSTENT_R_PROTO 0	   /**/
@@ -3864,6 +3944,9 @@
  */
 /* ENDNETENT_R_PROTO:
  *	This symbol encodes the prototype of endnetent_r.
+ *	It is zero if d_endnetent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endnetent_r
+ *	is defined.
  */
 /*#define HAS_ENDNETENT_R	   /**/
 #define ENDNETENT_R_PROTO 0	   /**/
@@ -3874,6 +3957,9 @@
  */
 /* ENDPROTOENT_R_PROTO:
  *	This symbol encodes the prototype of endprotoent_r.
+ *	It is zero if d_endprotoent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endprotoent_r
+ *	is defined.
  */
 /*#define HAS_ENDPROTOENT_R	   /**/
 #define ENDPROTOENT_R_PROTO 0	   /**/
@@ -3884,6 +3970,9 @@
  */
 /* ENDSERVENT_R_PROTO:
  *	This symbol encodes the prototype of endservent_r.
+ *	It is zero if d_endservent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endservent_r
+ *	is defined.
  */
 /*#define HAS_ENDSERVENT_R	   /**/
 #define ENDSERVENT_R_PROTO 0	   /**/
@@ -3894,6 +3983,9 @@
  */
 /* GETHOSTBYADDR_R_PROTO:
  *	This symbol encodes the prototype of gethostbyaddr_r.
+ *	It is zero if d_gethostbyaddr_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_gethostbyaddr_r
+ *	is defined.
  */
 /*#define HAS_GETHOSTBYADDR_R	   /**/
 #define GETHOSTBYADDR_R_PROTO 0	   /**/
@@ -3904,6 +3996,9 @@
  */
 /* GETHOSTBYNAME_R_PROTO:
  *	This symbol encodes the prototype of gethostbyname_r.
+ *	It is zero if d_gethostbyname_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_gethostbyname_r
+ *	is defined.
  */
 /*#define HAS_GETHOSTBYNAME_R	   /**/
 #define GETHOSTBYNAME_R_PROTO 0	   /**/
@@ -3914,6 +4009,9 @@
  */
 /* GETHOSTENT_R_PROTO:
  *	This symbol encodes the prototype of gethostent_r.
+ *	It is zero if d_gethostent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_gethostent_r
+ *	is defined.
  */
 /*#define HAS_GETHOSTENT_R	   /**/
 #define GETHOSTENT_R_PROTO 0	   /**/
@@ -3924,6 +4022,9 @@
  */
 /* GETNETBYADDR_R_PROTO:
  *	This symbol encodes the prototype of getnetbyaddr_r.
+ *	It is zero if d_getnetbyaddr_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getnetbyaddr_r
+ *	is defined.
  */
 /*#define HAS_GETNETBYADDR_R	   /**/
 #define GETNETBYADDR_R_PROTO 0	   /**/
@@ -3934,6 +4035,9 @@
  */
 /* GETNETBYNAME_R_PROTO:
  *	This symbol encodes the prototype of getnetbyname_r.
+ *	It is zero if d_getnetbyname_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getnetbyname_r
+ *	is defined.
  */
 /*#define HAS_GETNETBYNAME_R	   /**/
 #define GETNETBYNAME_R_PROTO 0	   /**/
@@ -3944,6 +4048,9 @@
  */
 /* GETNETENT_R_PROTO:
  *	This symbol encodes the prototype of getnetent_r.
+ *	It is zero if d_getnetent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getnetent_r
+ *	is defined.
  */
 /*#define HAS_GETNETENT_R	   /**/
 #define GETNETENT_R_PROTO 0	   /**/
@@ -3954,6 +4061,9 @@
  */
 /* GETPROTOBYNAME_R_PROTO:
  *	This symbol encodes the prototype of getprotobyname_r.
+ *	It is zero if d_getprotobyname_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getprotobyname_r
+ *	is defined.
  */
 /*#define HAS_GETPROTOBYNAME_R	   /**/
 #define GETPROTOBYNAME_R_PROTO 0	   /**/
@@ -3964,6 +4074,9 @@
  */
 /* GETPROTOBYNUMBER_R_PROTO:
  *	This symbol encodes the prototype of getprotobynumber_r.
+ *	It is zero if d_getprotobynumber_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getprotobynumber_r
+ *	is defined.
  */
 /*#define HAS_GETPROTOBYNUMBER_R	   /**/
 #define GETPROTOBYNUMBER_R_PROTO 0	   /**/
@@ -3974,6 +4087,9 @@
  */
 /* GETPROTOENT_R_PROTO:
  *	This symbol encodes the prototype of getprotoent_r.
+ *	It is zero if d_getprotoent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getprotoent_r
+ *	is defined.
  */
 /*#define HAS_GETPROTOENT_R	   /**/
 #define GETPROTOENT_R_PROTO 0	   /**/
@@ -3984,6 +4100,9 @@
  */
 /* GETSERVBYNAME_R_PROTO:
  *	This symbol encodes the prototype of getservbyname_r.
+ *	It is zero if d_getservbyname_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getservbyname_r
+ *	is defined.
  */
 /*#define HAS_GETSERVBYNAME_R	   /**/
 #define GETSERVBYNAME_R_PROTO 0	   /**/
@@ -3994,6 +4113,9 @@
  */
 /* GETSERVBYPORT_R_PROTO:
  *	This symbol encodes the prototype of getservbyport_r.
+ *	It is zero if d_getservbyport_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getservbyport_r
+ *	is defined.
  */
 /*#define HAS_GETSERVBYPORT_R	   /**/
 #define GETSERVBYPORT_R_PROTO 0	   /**/
@@ -4004,6 +4126,9 @@
  */
 /* GETSERVENT_R_PROTO:
  *	This symbol encodes the prototype of getservent_r.
+ *	It is zero if d_getservent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getservent_r
+ *	is defined.
  */
 /*#define HAS_GETSERVENT_R	   /**/
 #define GETSERVENT_R_PROTO 0	   /**/
@@ -4020,6 +4145,9 @@
  */
 /* READDIR64_R_PROTO:
  *	This symbol encodes the prototype of readdir64_r.
+ *	It is zero if d_readdir64_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_readdir64_r
+ *	is defined.
  */
 /*#define HAS_READDIR64_R	   /**/
 #define READDIR64_R_PROTO 0	   /**/
@@ -4030,6 +4158,9 @@
  */
 /* SETHOSTENT_R_PROTO:
  *	This symbol encodes the prototype of sethostent_r.
+ *	It is zero if d_sethostent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_sethostent_r
+ *	is defined.
  */
 /*#define HAS_SETHOSTENT_R	   /**/
 #define SETHOSTENT_R_PROTO 0	   /**/
@@ -4040,6 +4171,9 @@
  */
 /* SETLOCALE_R_PROTO:
  *	This symbol encodes the prototype of setlocale_r.
+ *	It is zero if d_setlocale_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setlocale_r
+ *	is defined.
  */
 /*#define HAS_SETLOCALE_R	   /**/
 #define SETLOCALE_R_PROTO 0	   /**/
@@ -4050,6 +4184,9 @@
  */
 /* SETNETENT_R_PROTO:
  *	This symbol encodes the prototype of setnetent_r.
+ *	It is zero if d_setnetent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setnetent_r
+ *	is defined.
  */
 /*#define HAS_SETNETENT_R	   /**/
 #define SETNETENT_R_PROTO 0	   /**/
@@ -4060,6 +4197,9 @@
  */
 /* SETPROTOENT_R_PROTO:
  *	This symbol encodes the prototype of setprotoent_r.
+ *	It is zero if d_setprotoent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setprotoent_r
+ *	is defined.
  */
 /*#define HAS_SETPROTOENT_R	   /**/
 #define SETPROTOENT_R_PROTO 0	   /**/
@@ -4070,6 +4210,9 @@
  */
 /* SETSERVENT_R_PROTO:
  *	This symbol encodes the prototype of setservent_r.
+ *	It is zero if d_setservent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setservent_r
+ *	is defined.
  */
 /*#define HAS_SETSERVENT_R	   /**/
 #define SETSERVENT_R_PROTO 0	   /**/
@@ -4080,6 +4223,9 @@
  */
 /* TTYNAME_R_PROTO:
  *	This symbol encodes the prototype of ttyname_r.
+ *	It is zero if d_ttyname_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_ttyname_r
+ *	is defined.
  */
 /*#define HAS_TTYNAME_R	   /**/
 #define TTYNAME_R_PROTO 0	   /**/
diff --git a/vos/config.ga.h b/vos/config.ga.h
index c1993c2cc6..33396106dc 100644
--- a/vos/config.ga.h
+++ b/vos/config.ga.h
@@ -1016,7 +1016,7 @@
 
 /* BYTEORDER:
  *	This symbol holds the hexadecimal constant defined in byteorder,
- *	i.e. 0x1234 or 0x4321, etc...
+ *	in a UV, i.e. 0x1234 or 0x4321 or 0x12345678, etc...
  *	If the compiler supports cross-compiling or multiple-architecture
  *	binaries (eg. on NeXT systems), use compiler-defined macros to
  *	determine the byte order.
@@ -1130,6 +1130,9 @@
  */
 /* ASCTIME_R_PROTO:
  *	This symbol encodes the prototype of asctime_r.
+ *	It is zero if d_asctime_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_asctime_r
+ *	is defined.
  */
 /*#define HAS_ASCTIME_R	   /**/
 #define ASCTIME_R_PROTO 0	   /**/
@@ -1191,6 +1194,9 @@
  */
 /* CRYPT_R_PROTO:
  *	This symbol encodes the prototype of crypt_r.
+ *	It is zero if d_crypt_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_crypt_r
+ *	is defined.
  */
 /*#define HAS_CRYPT_R	   /**/
 #define CRYPT_R_PROTO 0	   /**/
@@ -1212,6 +1218,9 @@
  */
 /* CTIME_R_PROTO:
  *	This symbol encodes the prototype of ctime_r.
+ *	It is zero if d_ctime_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_ctime_r
+ *	is defined.
  */
 /*#define HAS_CTIME_R	   /**/
 #define CTIME_R_PROTO 0	   /**/
@@ -1230,6 +1239,9 @@
  */
 /* DRAND48_R_PROTO:
  *	This symbol encodes the prototype of drand48_r.
+ *	It is zero if d_drand48_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_drand48_r
+ *	is defined.
  */
 /*#define HAS_DRAND48_R	   /**/
 #define DRAND48_R_PROTO 0	   /**/
@@ -1254,6 +1266,9 @@
  */
 /* ENDGRENT_R_PROTO:
  *	This symbol encodes the prototype of endgrent_r.
+ *	It is zero if d_endgrent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endgrent_r
+ *	is defined.
  */
 /*#define HAS_ENDGRENT_R	   /**/
 #define ENDGRENT_R_PROTO 0	   /**/
@@ -1288,6 +1303,9 @@
  */
 /* ENDPWENT_R_PROTO:
  *	This symbol encodes the prototype of endpwent_r.
+ *	It is zero if d_endpwent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endpwent_r
+ *	is defined.
  */
 /*#define HAS_ENDPWENT_R	   /**/
 #define ENDPWENT_R_PROTO 0	   /**/
@@ -1476,6 +1494,9 @@
  */
 /* GETGRENT_R_PROTO:
  *	This symbol encodes the prototype of getgrent_r.
+ *	It is zero if d_getgrent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getgrent_r
+ *	is defined.
  */
 /*#define HAS_GETGRENT_R	   /**/
 #define GETGRENT_R_PROTO 0	   /**/
@@ -1486,6 +1507,9 @@
  */
 /* GETGRGID_R_PROTO:
  *	This symbol encodes the prototype of getgrgid_r.
+ *	It is zero if d_getgrgid_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getgrgid_r
+ *	is defined.
  */
 /*#define HAS_GETGRGID_R	   /**/
 #define GETGRGID_R_PROTO 0	   /**/
@@ -1496,6 +1520,9 @@
  */
 /* GETGRNAM_R_PROTO:
  *	This symbol encodes the prototype of getgrnam_r.
+ *	It is zero if d_getgrnam_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getgrnam_r
+ *	is defined.
  */
 /*#define HAS_GETGRNAM_R	   /**/
 #define GETGRNAM_R_PROTO 0	   /**/
@@ -1567,6 +1594,9 @@
  */
 /* GETLOGIN_R_PROTO:
  *	This symbol encodes the prototype of getlogin_r.
+ *	It is zero if d_getlogin_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getlogin_r
+ *	is defined.
  */
 /*#define HAS_GETLOGIN_R	   /**/
 #define GETLOGIN_R_PROTO 0	   /**/
@@ -1671,6 +1701,9 @@
  */
 /* GETPWENT_R_PROTO:
  *	This symbol encodes the prototype of getpwent_r.
+ *	It is zero if d_getpwent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getpwent_r
+ *	is defined.
  */
 /*#define HAS_GETPWENT_R	   /**/
 #define GETPWENT_R_PROTO 0	   /**/
@@ -1681,6 +1714,9 @@
  */
 /* GETPWNAM_R_PROTO:
  *	This symbol encodes the prototype of getpwnam_r.
+ *	It is zero if d_getpwnam_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getpwnam_r
+ *	is defined.
  */
 /*#define HAS_GETPWNAM_R	   /**/
 #define GETPWNAM_R_PROTO 0	   /**/
@@ -1691,6 +1727,9 @@
  */
 /* GETPWUID_R_PROTO:
  *	This symbol encodes the prototype of getpwuid_r.
+ *	It is zero if d_getpwuid_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getpwuid_r
+ *	is defined.
  */
 /*#define HAS_GETPWUID_R	   /**/
 #define GETPWUID_R_PROTO 0	   /**/
@@ -1721,6 +1760,9 @@
  */
 /* GETSPNAM_R_PROTO:
  *	This symbol encodes the prototype of getspnam_r.
+ *	It is zero if d_getspnam_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getspnam_r
+ *	is defined.
  */
 /*#define HAS_GETSPNAM_R	   /**/
 #define GETSPNAM_R_PROTO 0	   /**/
@@ -1742,6 +1784,9 @@
  */
 /* GMTIME_R_PROTO:
  *	This symbol encodes the prototype of gmtime_r.
+ *	It is zero if d_gmtime_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_gmtime_r
+ *	is defined.
  */
 /*#define HAS_GMTIME_R	   /**/
 #define GMTIME_R_PROTO 0	   /**/
@@ -1843,6 +1888,9 @@
  */
 /* LOCALTIME_R_PROTO:
  *	This symbol encodes the prototype of localtime_r.
+ *	It is zero if d_localtime_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_localtime_r
+ *	is defined.
  */
 /*#define HAS_LOCALTIME_R	   /**/
 #define LOCALTIME_R_PROTO 0	   /**/
@@ -2005,6 +2053,9 @@
  */
 /* RANDOM_R_PROTO:
  *	This symbol encodes the prototype of random_r.
+ *	It is zero if d_random_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_random_r
+ *	is defined.
  */
 /*#define HAS_RANDOM_R	   /**/
 #define RANDOM_R_PROTO 0	   /**/
@@ -2015,6 +2066,9 @@
  */
 /* READDIR_R_PROTO:
  *	This symbol encodes the prototype of readdir_r.
+ *	It is zero if d_readdir_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_readdir_r
+ *	is defined.
  */
 /*#define HAS_READDIR_R	   /**/
 #define READDIR_R_PROTO 0	   /**/
@@ -2088,6 +2142,9 @@
  */
 /* SETGRENT_R_PROTO:
  *	This symbol encodes the prototype of setgrent_r.
+ *	It is zero if d_setgrent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setgrent_r
+ *	is defined.
  */
 /*#define HAS_SETGRENT_R	   /**/
 #define SETGRENT_R_PROTO 0	   /**/
@@ -2153,6 +2210,9 @@
  */
 /* SETPWENT_R_PROTO:
  *	This symbol encodes the prototype of setpwent_r.
+ *	It is zero if d_setpwent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setpwent_r
+ *	is defined.
  */
 /*#define HAS_SETPWENT_R	   /**/
 #define SETPWENT_R_PROTO 0	   /**/
@@ -2284,6 +2344,9 @@
  */
 /* SRAND48_R_PROTO:
  *	This symbol encodes the prototype of srand48_r.
+ *	It is zero if d_srand48_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_srand48_r
+ *	is defined.
  */
 /*#define HAS_SRAND48_R	   /**/
 #define SRAND48_R_PROTO 0	   /**/
@@ -2294,6 +2357,9 @@
  */
 /* SRANDOM_R_PROTO:
  *	This symbol encodes the prototype of srandom_r.
+ *	It is zero if d_srandom_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_srandom_r
+ *	is defined.
  */
 /*#define HAS_SRANDOM_R	   /**/
 #define SRANDOM_R_PROTO 0	   /**/
@@ -2424,6 +2490,9 @@
  */
 /* STRERROR_R_PROTO:
  *	This symbol encodes the prototype of strerror_r.
+ *	It is zero if d_strerror_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_strerror_r
+ *	is defined.
  */
 /*#define HAS_STRERROR_R	   /**/
 #define STRERROR_R_PROTO 0	   /**/
@@ -2496,6 +2565,9 @@
  */
 /* TMPNAM_R_PROTO:
  *	This symbol encodes the prototype of tmpnam_r.
+ *	It is zero if d_tmpnam_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_tmpnam_r
+ *	is defined.
  */
 /*#define HAS_TMPNAM_R	   /**/
 #define TMPNAM_R_PROTO 0	   /**/
@@ -3810,7 +3882,9 @@
  *	This symbol, if defined, indicates that you must access
  *	character data through U32-aligned pointers.
  */
+#ifndef U32_ALIGNMENT_REQUIRED
 #define U32_ALIGNMENT_REQUIRED	/**/
+#endif
 
 /* HAS_USLEEP_PROTO:
  *	This symbol, if defined, indicates that the system provides
@@ -3844,6 +3918,9 @@
  */
 /* CTERMID_R_PROTO:
  *	This symbol encodes the prototype of ctermid_r.
+ *	It is zero if d_ctermid_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_ctermid_r
+ *	is defined.
  */
 /*#define HAS_CTERMID_R	   /**/
 #define CTERMID_R_PROTO 0	   /**/
@@ -3854,6 +3931,9 @@
  */
 /* ENDHOSTENT_R_PROTO:
  *	This symbol encodes the prototype of endhostent_r.
+ *	It is zero if d_endhostent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endhostent_r
+ *	is defined.
  */
 /*#define HAS_ENDHOSTENT_R	   /**/
 #define ENDHOSTENT_R_PROTO 0	   /**/
@@ -3864,6 +3944,9 @@
  */
 /* ENDNETENT_R_PROTO:
  *	This symbol encodes the prototype of endnetent_r.
+ *	It is zero if d_endnetent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endnetent_r
+ *	is defined.
  */
 /*#define HAS_ENDNETENT_R	   /**/
 #define ENDNETENT_R_PROTO 0	   /**/
@@ -3874,6 +3957,9 @@
  */
 /* ENDPROTOENT_R_PROTO:
  *	This symbol encodes the prototype of endprotoent_r.
+ *	It is zero if d_endprotoent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endprotoent_r
+ *	is defined.
  */
 /*#define HAS_ENDPROTOENT_R	   /**/
 #define ENDPROTOENT_R_PROTO 0	   /**/
@@ -3884,6 +3970,9 @@
  */
 /* ENDSERVENT_R_PROTO:
  *	This symbol encodes the prototype of endservent_r.
+ *	It is zero if d_endservent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endservent_r
+ *	is defined.
  */
 /*#define HAS_ENDSERVENT_R	   /**/
 #define ENDSERVENT_R_PROTO 0	   /**/
@@ -3894,6 +3983,9 @@
  */
 /* GETHOSTBYADDR_R_PROTO:
  *	This symbol encodes the prototype of gethostbyaddr_r.
+ *	It is zero if d_gethostbyaddr_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_gethostbyaddr_r
+ *	is defined.
  */
 /*#define HAS_GETHOSTBYADDR_R	   /**/
 #define GETHOSTBYADDR_R_PROTO 0	   /**/
@@ -3904,6 +3996,9 @@
  */
 /* GETHOSTBYNAME_R_PROTO:
  *	This symbol encodes the prototype of gethostbyname_r.
+ *	It is zero if d_gethostbyname_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_gethostbyname_r
+ *	is defined.
  */
 /*#define HAS_GETHOSTBYNAME_R	   /**/
 #define GETHOSTBYNAME_R_PROTO 0	   /**/
@@ -3914,6 +4009,9 @@
  */
 /* GETHOSTENT_R_PROTO:
  *	This symbol encodes the prototype of gethostent_r.
+ *	It is zero if d_gethostent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_gethostent_r
+ *	is defined.
  */
 /*#define HAS_GETHOSTENT_R	   /**/
 #define GETHOSTENT_R_PROTO 0	   /**/
@@ -3924,6 +4022,9 @@
  */
 /* GETNETBYADDR_R_PROTO:
  *	This symbol encodes the prototype of getnetbyaddr_r.
+ *	It is zero if d_getnetbyaddr_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getnetbyaddr_r
+ *	is defined.
  */
 /*#define HAS_GETNETBYADDR_R	   /**/
 #define GETNETBYADDR_R_PROTO 0	   /**/
@@ -3934,6 +4035,9 @@
  */
 /* GETNETBYNAME_R_PROTO:
  *	This symbol encodes the prototype of getnetbyname_r.
+ *	It is zero if d_getnetbyname_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getnetbyname_r
+ *	is defined.
  */
 /*#define HAS_GETNETBYNAME_R	   /**/
 #define GETNETBYNAME_R_PROTO 0	   /**/
@@ -3944,6 +4048,9 @@
  */
 /* GETNETENT_R_PROTO:
  *	This symbol encodes the prototype of getnetent_r.
+ *	It is zero if d_getnetent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getnetent_r
+ *	is defined.
  */
 /*#define HAS_GETNETENT_R	   /**/
 #define GETNETENT_R_PROTO 0	   /**/
@@ -3954,6 +4061,9 @@
  */
 /* GETPROTOBYNAME_R_PROTO:
  *	This symbol encodes the prototype of getprotobyname_r.
+ *	It is zero if d_getprotobyname_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getprotobyname_r
+ *	is defined.
  */
 /*#define HAS_GETPROTOBYNAME_R	   /**/
 #define GETPROTOBYNAME_R_PROTO 0	   /**/
@@ -3964,6 +4074,9 @@
  */
 /* GETPROTOBYNUMBER_R_PROTO:
  *	This symbol encodes the prototype of getprotobynumber_r.
+ *	It is zero if d_getprotobynumber_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getprotobynumber_r
+ *	is defined.
  */
 /*#define HAS_GETPROTOBYNUMBER_R	   /**/
 #define GETPROTOBYNUMBER_R_PROTO 0	   /**/
@@ -3974,6 +4087,9 @@
  */
 /* GETPROTOENT_R_PROTO:
  *	This symbol encodes the prototype of getprotoent_r.
+ *	It is zero if d_getprotoent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getprotoent_r
+ *	is defined.
  */
 /*#define HAS_GETPROTOENT_R	   /**/
 #define GETPROTOENT_R_PROTO 0	   /**/
@@ -3984,6 +4100,9 @@
  */
 /* GETSERVBYNAME_R_PROTO:
  *	This symbol encodes the prototype of getservbyname_r.
+ *	It is zero if d_getservbyname_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getservbyname_r
+ *	is defined.
  */
 /*#define HAS_GETSERVBYNAME_R	   /**/
 #define GETSERVBYNAME_R_PROTO 0	   /**/
@@ -3994,6 +4113,9 @@
  */
 /* GETSERVBYPORT_R_PROTO:
  *	This symbol encodes the prototype of getservbyport_r.
+ *	It is zero if d_getservbyport_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getservbyport_r
+ *	is defined.
  */
 /*#define HAS_GETSERVBYPORT_R	   /**/
 #define GETSERVBYPORT_R_PROTO 0	   /**/
@@ -4004,6 +4126,9 @@
  */
 /* GETSERVENT_R_PROTO:
  *	This symbol encodes the prototype of getservent_r.
+ *	It is zero if d_getservent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getservent_r
+ *	is defined.
  */
 /*#define HAS_GETSERVENT_R	   /**/
 #define GETSERVENT_R_PROTO 0	   /**/
@@ -4020,6 +4145,9 @@
  */
 /* READDIR64_R_PROTO:
  *	This symbol encodes the prototype of readdir64_r.
+ *	It is zero if d_readdir64_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_readdir64_r
+ *	is defined.
  */
 /*#define HAS_READDIR64_R	   /**/
 #define READDIR64_R_PROTO 0	   /**/
@@ -4030,6 +4158,9 @@
  */
 /* SETHOSTENT_R_PROTO:
  *	This symbol encodes the prototype of sethostent_r.
+ *	It is zero if d_sethostent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_sethostent_r
+ *	is defined.
  */
 /*#define HAS_SETHOSTENT_R	   /**/
 #define SETHOSTENT_R_PROTO 0	   /**/
@@ -4040,6 +4171,9 @@
  */
 /* SETLOCALE_R_PROTO:
  *	This symbol encodes the prototype of setlocale_r.
+ *	It is zero if d_setlocale_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setlocale_r
+ *	is defined.
  */
 /*#define HAS_SETLOCALE_R	   /**/
 #define SETLOCALE_R_PROTO 0	   /**/
@@ -4050,6 +4184,9 @@
  */
 /* SETNETENT_R_PROTO:
  *	This symbol encodes the prototype of setnetent_r.
+ *	It is zero if d_setnetent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setnetent_r
+ *	is defined.
  */
 /*#define HAS_SETNETENT_R	   /**/
 #define SETNETENT_R_PROTO 0	   /**/
@@ -4060,6 +4197,9 @@
  */
 /* SETPROTOENT_R_PROTO:
  *	This symbol encodes the prototype of setprotoent_r.
+ *	It is zero if d_setprotoent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setprotoent_r
+ *	is defined.
  */
 /*#define HAS_SETPROTOENT_R	   /**/
 #define SETPROTOENT_R_PROTO 0	   /**/
@@ -4070,6 +4210,9 @@
  */
 /* SETSERVENT_R_PROTO:
  *	This symbol encodes the prototype of setservent_r.
+ *	It is zero if d_setservent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setservent_r
+ *	is defined.
  */
 /*#define HAS_SETSERVENT_R	   /**/
 #define SETSERVENT_R_PROTO 0	   /**/
@@ -4080,6 +4223,9 @@
  */
 /* TTYNAME_R_PROTO:
  *	This symbol encodes the prototype of ttyname_r.
+ *	It is zero if d_ttyname_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_ttyname_r
+ *	is defined.
  */
 /*#define HAS_TTYNAME_R	   /**/
 #define TTYNAME_R_PROTO 0	   /**/
diff --git a/win32/Makefile b/win32/Makefile
index 5020a84e2f..29814b4589 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -32,7 +32,7 @@ INST_TOP	= $(INST_DRV)\perl
 # versioned installation can be obtained by setting INST_TOP above to a
 # path that includes an arbitrary version string.
 #
-#INST_VER = \5.7.3
+#INST_VER = \5.8.0
 
 #
 # Comment this out if you DON'T want your perl installation to have
diff --git a/win32/config_H.bc b/win32/config_H.bc
index 07cd809609..5be778c5af 100644
--- a/win32/config_H.bc
+++ b/win32/config_H.bc
@@ -980,7 +980,7 @@
  *	This symbol contains the ~name expanded version of ARCHLIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define ARCHLIB "c:\\perl\\5.7.3\\lib\\MSWin32-x86-multi-thread"		/**/
+#define ARCHLIB "c:\\perl\\5.8.0\\lib\\MSWin32-x86-multi-thread"		/**/
 /*#define ARCHLIB_EXP ""	/**/
 
 /* ARCHNAME:
@@ -1011,8 +1011,8 @@
  *	This symbol is the filename expanded version of the BIN symbol, for
  *	programs that do not want to deal with that at run-time.
  */
-#define BIN "c:\\perl\\5.7.3\\bin\\MSWin32-x86-multi-thread"	/**/
-#define BIN_EXP "c:\\perl\\5.7.3\\bin\\MSWin32-x86-multi-thread"	/**/
+#define BIN "c:\\perl\\5.8.0\\bin\\MSWin32-x86-multi-thread"	/**/
+#define BIN_EXP "c:\\perl\\5.8.0\\bin\\MSWin32-x86-multi-thread"	/**/
 
 /* BYTEORDER:
  *	This symbol holds the hexadecimal constant defined in byteorder,
@@ -3200,8 +3200,8 @@
  *	This symbol contains the ~name expanded version of PRIVLIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define PRIVLIB "c:\\perl\\5.7.3\\lib"		/**/
-#define PRIVLIB_EXP (win32_get_privlib("5.7.3"))	/**/
+#define PRIVLIB "c:\\perl\\5.8.0\\lib"		/**/
+#define PRIVLIB_EXP (win32_get_privlib("5.8.0"))	/**/
 
 /* PTRSIZE:
  *	This symbol contains the size of a pointer, so that the C preprocessor
@@ -3304,7 +3304,7 @@
  *	This symbol contains the ~name expanded version of SITEARCH, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define SITEARCH "c:\\perl\\site\\5.7.3\\lib\\MSWin32-x86-multi-thread"		/**/
+#define SITEARCH "c:\\perl\\site\\5.8.0\\lib\\MSWin32-x86-multi-thread"		/**/
 /*#define SITEARCH_EXP ""	/**/
 
 /* SITELIB:
@@ -3327,8 +3327,8 @@
  *	removed.  The elements in inc_version_list (inc_version_list.U) can
  *	be tacked onto this variable to generate a list of directories to search.
  */
-#define SITELIB "c:\\perl\\site\\5.7.3\\lib"		/**/
-#define SITELIB_EXP (win32_get_sitelib("5.7.3"))	/**/
+#define SITELIB "c:\\perl\\site\\5.8.0\\lib"		/**/
+#define SITELIB_EXP (win32_get_sitelib("5.8.0"))	/**/
 #define SITELIB_STEM ""		/**/
 
 /* Size_t_size:
@@ -3565,7 +3565,7 @@
 /* PERL_XS_APIVERSION:
  *	This variable contains the version of the oldest perl binary
  *	compatible with the present perl.  perl.c:incpush() and
- *	lib/lib.pm will automatically search in c:\\perl\\site\\5.7.3\\lib\\MSWin32-x86-multi-thread for older
+ *	lib/lib.pm will automatically search in c:\\perl\\site\\5.8.0\\lib\\MSWin32-x86-multi-thread for older
  *	directories across major versions back to xs_apiversion.
  *	This is only useful if you have a perl library directory tree
  *	structured like the default one.
@@ -3584,7 +3584,7 @@
  *	compatible with the present perl.  (That is, pure perl modules
  *	written for pm_apiversion will still work for the current
  *	version).  perl.c:incpush() and lib/lib.pm will automatically
- *	search in c:\\perl\\site\\5.7.3\\lib for older directories across major versions
+ *	search in c:\\perl\\site\\5.8.0\\lib for older directories across major versions
  *	back to pm_apiversion.  This is only useful if you have a perl
  *	library directory tree structured like the default one.  The
  *	versioned site_perl library was introduced in 5.005, so that's
@@ -3594,7 +3594,7 @@
  *	(presumably) be similar.
  *	See the INSTALL file for how this works.
  */
-#define PERL_XS_APIVERSION "5.6.0"
+#define PERL_XS_APIVERSION "5.8.0"
 #define PERL_PM_APIVERSION "5.005"
 
 /* HAS_CRYPT:
diff --git a/win32/config_H.gc b/win32/config_H.gc
index 9215f8e4d8..a968ec6f3c 100644
--- a/win32/config_H.gc
+++ b/win32/config_H.gc
@@ -980,7 +980,7 @@
  *	This symbol contains the ~name expanded version of ARCHLIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define ARCHLIB "c:\\perl\\5.7.3\\lib\\MSWin32-x86-multi-thread"		/**/
+#define ARCHLIB "c:\\perl\\5.8.0\\lib\\MSWin32-x86-multi-thread"		/**/
 /*#define ARCHLIB_EXP ""	/**/
 
 /* ARCHNAME:
@@ -1011,8 +1011,8 @@
  *	This symbol is the filename expanded version of the BIN symbol, for
  *	programs that do not want to deal with that at run-time.
  */
-#define BIN "c:\\perl\\5.7.3\\bin\\MSWin32-x86-multi-thread"	/**/
-#define BIN_EXP "c:\\perl\\5.7.3\\bin\\MSWin32-x86-multi-thread"	/**/
+#define BIN "c:\\perl\\5.8.0\\bin\\MSWin32-x86-multi-thread"	/**/
+#define BIN_EXP "c:\\perl\\5.8.0\\bin\\MSWin32-x86-multi-thread"	/**/
 
 /* BYTEORDER:
  *	This symbol holds the hexadecimal constant defined in byteorder,
@@ -3200,8 +3200,8 @@
  *	This symbol contains the ~name expanded version of PRIVLIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define PRIVLIB "c:\\perl\\5.7.3\\lib"		/**/
-#define PRIVLIB_EXP (win32_get_privlib("5.7.3"))	/**/
+#define PRIVLIB "c:\\perl\\5.8.0\\lib"		/**/
+#define PRIVLIB_EXP (win32_get_privlib("5.8.0"))	/**/
 
 /* PTRSIZE:
  *	This symbol contains the size of a pointer, so that the C preprocessor
@@ -3304,7 +3304,7 @@
  *	This symbol contains the ~name expanded version of SITEARCH, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define SITEARCH "c:\\perl\\site\\5.7.3\\lib\\MSWin32-x86-multi-thread"		/**/
+#define SITEARCH "c:\\perl\\site\\5.8.0\\lib\\MSWin32-x86-multi-thread"		/**/
 /*#define SITEARCH_EXP ""	/**/
 
 /* SITELIB:
@@ -3327,8 +3327,8 @@
  *	removed.  The elements in inc_version_list (inc_version_list.U) can
  *	be tacked onto this variable to generate a list of directories to search.
  */
-#define SITELIB "c:\\perl\\site\\5.7.3\\lib"		/**/
-#define SITELIB_EXP (win32_get_sitelib("5.7.3"))	/**/
+#define SITELIB "c:\\perl\\site\\5.8.0\\lib"		/**/
+#define SITELIB_EXP (win32_get_sitelib("5.8.0"))	/**/
 #define SITELIB_STEM ""		/**/
 
 /* Size_t_size:
@@ -3565,7 +3565,7 @@
 /* PERL_XS_APIVERSION:
  *	This variable contains the version of the oldest perl binary
  *	compatible with the present perl.  perl.c:incpush() and
- *	lib/lib.pm will automatically search in c:\\perl\\site\\5.7.3\\lib\\MSWin32-x86-multi-thread for older
+ *	lib/lib.pm will automatically search in c:\\perl\\site\\5.8.0\\lib\\MSWin32-x86-multi-thread for older
  *	directories across major versions back to xs_apiversion.
  *	This is only useful if you have a perl library directory tree
  *	structured like the default one.
@@ -3584,7 +3584,7 @@
  *	compatible with the present perl.  (That is, pure perl modules
  *	written for pm_apiversion will still work for the current
  *	version).  perl.c:incpush() and lib/lib.pm will automatically
- *	search in c:\\perl\\site\\5.7.3\\lib for older directories across major versions
+ *	search in c:\\perl\\site\\5.8.0\\lib for older directories across major versions
  *	back to pm_apiversion.  This is only useful if you have a perl
  *	library directory tree structured like the default one.  The
  *	versioned site_perl library was introduced in 5.005, so that's
@@ -3594,7 +3594,7 @@
  *	(presumably) be similar.
  *	See the INSTALL file for how this works.
  */
-#define PERL_XS_APIVERSION "5.6.0"
+#define PERL_XS_APIVERSION "5.8.0"
 #define PERL_PM_APIVERSION "5.005"
 
 /* HAS_CRYPT:
diff --git a/win32/config_H.vc b/win32/config_H.vc
index 4b51a09637..bc81d7cd8d 100644
--- a/win32/config_H.vc
+++ b/win32/config_H.vc
@@ -3201,7 +3201,7 @@
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
 #define PRIVLIB "c:\\perl\\lib"		/**/
-#define PRIVLIB_EXP (win32_get_privlib("5.7.3"))	/**/
+#define PRIVLIB_EXP (win32_get_privlib("5.8.0"))	/**/
 
 /* PTRSIZE:
  *	This symbol contains the size of a pointer, so that the C preprocessor
@@ -3328,7 +3328,7 @@
  *	be tacked onto this variable to generate a list of directories to search.
  */
 #define SITELIB "c:\\perl\\site\\lib"		/**/
-#define SITELIB_EXP (win32_get_sitelib("5.7.3"))	/**/
+#define SITELIB_EXP (win32_get_sitelib("5.8.0"))	/**/
 #define SITELIB_STEM ""		/**/
 
 /* Size_t_size:
@@ -3594,7 +3594,7 @@
  *	(presumably) be similar.
  *	See the INSTALL file for how this works.
  */
-#define PERL_XS_APIVERSION "5.6.0"
+#define PERL_XS_APIVERSION "5.8.0"
 #define PERL_PM_APIVERSION "5.005"
 
 /* HAS_CRYPT:
diff --git a/win32/config_H.vc64 b/win32/config_H.vc64
index 4d8b748892..ac25851b49 100644
--- a/win32/config_H.vc64
+++ b/win32/config_H.vc64
@@ -3201,7 +3201,7 @@
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
 #define PRIVLIB "c:\\perl\\lib"		/**/
-#define PRIVLIB_EXP (win32_get_privlib("5.7.3"))	/**/
+#define PRIVLIB_EXP (win32_get_privlib("5.8.0"))	/**/
 
 /* PTRSIZE:
  *	This symbol contains the size of a pointer, so that the C preprocessor
@@ -3328,7 +3328,7 @@
  *	be tacked onto this variable to generate a list of directories to search.
  */
 #define SITELIB "c:\\perl\\site\\lib"		/**/
-#define SITELIB_EXP (win32_get_sitelib("5.7.3"))	/**/
+#define SITELIB_EXP (win32_get_sitelib("5.8.0"))	/**/
 #define SITELIB_STEM ""		/**/
 
 /* Size_t_size:
@@ -3594,7 +3594,7 @@
  *	(presumably) be similar.
  *	See the INSTALL file for how this works.
  */
-#define PERL_XS_APIVERSION "5.6.0"
+#define PERL_XS_APIVERSION "5.8.0"
 #define PERL_PM_APIVERSION "5.005"
 
 /* HAS_CRYPT:
diff --git a/win32/makefile.mk b/win32/makefile.mk
index e8a55f798d..87dc220150 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -34,7 +34,7 @@ INST_TOP	*= $(INST_DRV)\perl
 # versioned installation can be obtained by setting INST_TOP above to a
 # path that includes an arbitrary version string.
 #
-INST_VER	*= \5.7.3
+INST_VER	*= \5.8.0
 
 #
 # Comment this out if you DON'T want your perl installation to have
diff --git a/wince/Makefile.ce b/wince/Makefile.ce
index 3aa1d2bd07..ae345b9961 100644
--- a/wince/Makefile.ce
+++ b/wince/Makefile.ce
@@ -3,8 +3,8 @@
 # Time-stamp: <26/10/01 15:10:06 keuchel@keuchelnt>
 
 SRCDIR     = ..
-PV         = 57
-INST_VER   = 5.7.3
+PV         = 58
+INST_VER   = 5.8.0
 
 # INSTALL_ROOT specifies a path where this perl will be installed on CE device
 INSTALL_ROOT=/netzwerk/sprache/perl
diff --git a/wince/config_H.ce b/wince/config_H.ce
index 04c7eb0a08..364ea1152b 100644
--- a/wince/config_H.ce
+++ b/wince/config_H.ce
@@ -980,7 +980,7 @@
  *	This symbol contains the ~name expanded version of ARCHLIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define ARCHLIB "\\Storage Card\\perl-tests\\perl@16539\\lib"		/**/
+#define ARCHLIB "\\Storage Card\\perl-tests\\bleadperl\\lib"		/**/
 /*#define ARCHLIB_EXP ""	/**/
 
 /* ARCHNAME:
@@ -1011,8 +1011,8 @@
  *	This symbol is the filename expanded version of the BIN symbol, for
  *	programs that do not want to deal with that at run-time.
  */
-#define BIN "\\Storage Card\\perl-tests\\perl@16539\\bin"	/**/
-#define BIN_EXP "\\Storage Card\\perl-tests\\perl@16539\\bin"	/**/
+#define BIN "\\Storage Card\\perl-tests\\bleadperl\\bin"	/**/
+#define BIN_EXP "\\Storage Card\\perl-tests\\bleadperl\\bin"	/**/
 
 /* BYTEORDER:
  *	This symbol holds the hexadecimal constant defined in byteorder,
@@ -3200,8 +3200,8 @@
  *	This symbol contains the ~name expanded version of PRIVLIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define PRIVLIB "\\Storage Card\\perl-tests\\perl@16539\\lib"		/**/
-#define PRIVLIB_EXP (win32_get_privlib("5.7.3"))	/**/
+#define PRIVLIB "\\Storage Card\\perl-tests\\bleadperl\\lib"		/**/
+#define PRIVLIB_EXP (win32_get_privlib("5.8.0"))	/**/
 
 /* PTRSIZE:
  *	This symbol contains the size of a pointer, so that the C preprocessor
@@ -3304,7 +3304,7 @@
  *	This symbol contains the ~name expanded version of SITEARCH, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define SITEARCH "\\Storage Card\\perl-tests\\perl@16539\\site\\lib"		/**/
+#define SITEARCH "\\Storage Card\\perl-tests\\bleadperl\\site\\lib"		/**/
 /*#define SITEARCH_EXP ""	/**/
 
 /* SITELIB:
@@ -3327,8 +3327,8 @@
  *	removed.  The elements in inc_version_list (inc_version_list.U) can
  *	be tacked onto this variable to generate a list of directories to search.
  */
-#define SITELIB "\\Storage Card\\perl-tests\\perl@16539\\site\\lib"		/**/
-#define SITELIB_EXP (win32_get_sitelib("5.7.3"))	/**/
+#define SITELIB "\\Storage Card\\perl-tests\\bleadperl\\site\\lib"		/**/
+#define SITELIB_EXP (win32_get_sitelib("5.8.0"))	/**/
 #define SITELIB_STEM ""		/**/
 
 /* Size_t_size:
@@ -3565,7 +3565,7 @@
 /* PERL_XS_APIVERSION:
  *	This variable contains the version of the oldest perl binary
  *	compatible with the present perl.  perl.c:incpush() and
- *	lib/lib.pm will automatically search in \\Storage Card\\perl-tests\\perl@16539\\site\\lib for older
+ *	lib/lib.pm will automatically search in \\Storage Card\\perl-tests\\bleadperl\\site\\lib for older
  *	directories across major versions back to xs_apiversion.
  *	This is only useful if you have a perl library directory tree
  *	structured like the default one.
@@ -3584,7 +3584,7 @@
  *	compatible with the present perl.  (That is, pure perl modules
  *	written for pm_apiversion will still work for the current
  *	version).  perl.c:incpush() and lib/lib.pm will automatically
- *	search in \\Storage Card\\perl-tests\\perl@16539\\site\\lib for older directories across major versions
+ *	search in \\Storage Card\\perl-tests\\bleadperl\\site\\lib for older directories across major versions
  *	back to pm_apiversion.  This is only useful if you have a perl
  *	library directory tree structured like the default one.  The
  *	versioned site_perl library was introduced in 5.005, so that's
@@ -3594,7 +3594,7 @@
  *	(presumably) be similar.
  *	See the INSTALL file for how this works.
  */
-#define PERL_XS_APIVERSION "5.6.0"
+#define PERL_XS_APIVERSION "5.8.0"
 #define PERL_PM_APIVERSION "5.005"
 
 /* HAS_CRYPT: