Configure changes for new-style version numbers (from Andy Dougherty,

slightly altered)

p4raw-id: //depot/perl@4771

12 files changed, 496 insertions, 396 deletions

diff --git a/Configure b/Configure
index 4fe41b2b33..5b3b6d5e62 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 Wed Dec 22 14:18:58 EST 1999 [metaconfig 3.0 PL70]
+# Generated on Fri Jan  7 16:14:30 EST 2000 [metaconfig 3.0 PL70]
 # (with additional metaconfig patches by perlbug@perl.com)
 
 cat >/tmp/c1$$ <<EOF
@@ -862,6 +862,8 @@ usenm=''
 useperlio=''
 usesocks=''
 d_oldpthreads=''
+use5005threads=''
+useithreads=''
 usethreads=''
 incpath=''
 mips_type=''
@@ -1888,6 +1890,7 @@ comm
 cp
 echo
 expr
+find
 grep
 ls
 make
@@ -1909,11 +1912,14 @@ date
 egrep
 gzip
 less
+line
 ln
 more
 nm
 nroff
+perl
 pg
+sendmail
 test
 uname
 zip
@@ -2205,12 +2211,14 @@ EOM
 			osvers="$2.$3"
 		fi
 	fi
-       $test -f /sys/posix.dll &&
-	       $test -f /usr/bin/what &&
-	       set X `/usr/bin/what /sys/posix.dll` &&
-	       $test "$3" = UWIN &&
-	       osname=uwin &&
-	       osvers="$5"
+
+	$test -f /sys/posix.dll &&
+		$test -f /usr/bin/what &&
+		set X `/usr/bin/what /sys/posix.dll` &&
+		$test "$3" = UWIN &&
+		osname=uwin &&
+		osvers="$5"
+
 	if $test -f $uname; then
 		set X $myuname
 		shift
@@ -2260,6 +2268,12 @@ EOM
 			*) osvers=$tmp;;
 			esac
 			;;
+		bsd386) osname=bsd386
+			osvers=`$uname -r`
+			;;
+		cygwin*) osname=cygwin
+			osvers="$3"
+			;;
 		*dc.osx) osname=dcosx
 			osvers="$3"
 			;;
@@ -2304,17 +2318,17 @@ EOM
 			*) osname=newsos ;;
 			esac
 			;;
-		bsd386) osname=bsd386
-			osvers=`$uname -r`
+		next*) osname=next ;;
+		POSIX-BC | posix-bc ) osname=posix-bc
+			osvers="$3"
 			;;
-                POSIX-BC | posix-bc ) osname=posix-bc
-                        osvers="$3"
-                        ;;
 		powerux | power_ux | powermax_os | powermaxos | \
 		powerunix | power_unix) osname=powerux
 			osvers="$3"
 			;;
-		next*) osname=next ;;
+		qnx) osname=qnx
+			osvers="$4"
+			;;
 		solaris) osname=solaris
 			case "$3" in
 			5*) osvers=`echo $3 | $sed 's/^5/2/g'` ;;
@@ -2355,12 +2369,6 @@ EOM
 		uts) osname=uts
 			osvers="$3"
 			;;
-		qnx) osname=qnx
-			osvers="$4"
-			;;
-		cygwin*) osname=cygwin
-			osvers="$3"
-			;;
 		$2) case "$osname" in
 			*isc*) ;;
 			*freebsd*) ;;
@@ -2660,11 +2668,52 @@ esac
 rp='Build a threading Perl?'
 . ./myread
 case "$ans" in
-y|Y)    val="$define" ;;     
+y|Y)    val="$define" ;;
 *)      val="$undef" ;;
 esac
 set usethreads
-eval $setvar 
+eval $setvar
+
+case "$usethreads" in
+$define)
+	$cat <<EOM
+
+As of 5.5.64, Perl has two different internal threading implementations,
+the 5.005 version (5005threads) and an interpreter-based version
+(ithreads) that has one interpreter per thread.  Both are very 
+experimental.  This arrangement exists to help developers work out
+which one is better.
+EOM
+	: Default to ithreads unless overridden on command line or with
+	: old config.sh
+	dflt='y'
+	case "$use5005threads" in
+		$define|true|[yY]*) dflt='n';;
+	esac
+	case "$useithreads" in
+		$undef|false|[nN]*) dflt='n';;
+	esac
+	rp='Use interpreter-based ithreads?'
+	. ./myread
+	case "$ans" in
+	y|Y)    val="$define" ;;
+	*)      val="$undef" ;;
+	esac
+	set useithreads
+	eval $setvar
+	: Now set use5005threads to the opposite value.
+	case "$useithreads" in
+	$define) val="$undef" ;;
+	*) val="$define" ;;
+	esac
+	set use5005threads
+	eval $setvar
+	;;
+*)
+	useithreads="$undef"
+	use5005threads="$undef"
+	;;
+esac
 
 case "$d_oldpthreads" in
 '')	: Configure tests would be welcome here.  For now, assume undef.
@@ -2689,7 +2738,7 @@ case "$usethreads" in
  Assuming POSIX threads, then.)
 EOM
 	fi
-    ;;
+	;;
 esac
 
 cat <<EOM
@@ -4622,15 +4671,10 @@ $echo $n " patchlevel $patchlevel" $c
 test 0 -eq "$subversion" || $echo $n " subversion $subversion" $c
 echo ".)"
 
-if test 0 -eq "$subversion"; then
-	version=`LC_ALL=C; export LC_ALL; \
-		 echo $baserev $patchlevel | \
-		 $awk '{ printf "%.3f\n", $1 + $2/1000.0 }'`
-else
-	version=`LC_ALL=C; export LC_ALL; \
-		 echo $baserev $patchlevel $subversion | \
-		 $awk '{ printf "%.5f\n", $1 + $2/1000.0 + $3/100000.0 }'`
-fi
+version=`LC_ALL=C; export LC_ALL; \
+	 echo $baserev $patchlevel $subversion | \
+	 $awk '{ printf "%.6f\n", $1 + $2/1000.0 + $3/1000000.0 }' | \
+	 sed -e 's/0*$//'`
 
 : determine installation style
 : For now, try to deduce it from prefix unless it is already set.
@@ -14846,8 +14890,10 @@ uidtype='$uidtype'
 uname='$uname'
 uniq='$uniq'
 uquadtype='$uquadtype'
+use5005threads='$use5005threads'
 use64bits='$use64bits'
 usedl='$usedl'
+useithreads='$useithreads'
 uselargefiles='$uselargefiles'
 uselongdouble='$uselongdouble'
 uselonglong='$uselonglong'
diff --git a/INSTALL b/INSTALL
index 47cb37de40..c5dc0ef546 100644
--- a/INSTALL
+++ b/INSTALL
@@ -604,6 +604,20 @@ line so that the hint files can make appropriate adjustments.
 
 The default is to compile without thread support.
 
+As of v5.5.64, perl has two different internal threads implementations.
+The 5.005 version (5005threads) and an interpreter-based implementation
+(ithreads) with one interpreter per thread.  By default, Configure selects
+ithreads if -Dusethreads is specified.  However, you can select the old
+5005threads behavior instead by either
+
+	sh Configure -Dusethreads -Duse5005threads
+
+or by
+	sh Configure -Dusethreads -Uuseithreads
+
+Eventually (by perl v5.6.0) this internal confusion ought to disappear,
+and these options may disappear as well.
+
 =head2 Selecting File IO mechanisms
 
 Previous versions of perl used the standard IO mechanisms as defined in
diff --git a/Porting/Glossary b/Porting/Glossary
index 371a2a1335..bef7409c73 100644
--- a/Porting/Glossary
+++ b/Porting/Glossary
@@ -1646,8 +1646,9 @@ fflushall (fflushall.U):
 	even be probed for and will be left undefined.
 
 find (Loc.U):
-	This variable is defined but not used by Configure.
-	The value is a plain '' and is not useful.
+	This variable is used internally by Configure to determine the
+	full pathname (if any) of the find program.  After Configure runs,
+	the value is reset to a plain "find" and is not useful.
 
 firstmakefile (Unix.U):
 	This variable defines the first file searched by make.  On unix,
@@ -1723,6 +1724,8 @@ groupcat (nis.U):
 	This variable contains a command that produces the text of the
 	/etc/group file.  This is normally "cat /etc/group", but can be
 	"ypcat group" when NIS is used.
+	On some systems, such as os390, there may be no equivalent
+	command, in which case this variable is unset.
 
 groupstype (groupstype.U):
 	This variable defines Groups_t to be something like gid_t, int, 
@@ -1751,6 +1754,8 @@ hostcat (nis.U):
 	This variable contains a command that produces the text of the
 	/etc/hosts file.  This is normally "cat /etc/hosts", but can be
 	"ypcat hosts" when NIS is used.
+	On some systems, such as os390, there may be no equivalent
+	command, in which case this variable is unset.
 
 huge (models.U):
 	This variable contains a flag which will tell the C compiler and loader
@@ -2274,8 +2279,9 @@ libswanted (Myinit.U):
 	ahead of ucb or bsd libraries for SVR4.
 
 line (Loc.U):
-	This variable is defined but not used by Configure.
-	The value is a plain '' and is not useful.
+	This variable is used internally by Configure to determine the
+	full pathname (if any) of the line program.  After Configure runs,
+	the value is reset to a plain "line" and is not useful.
 
 lint (Loc.U):
 	This variable is defined but not used by Configure.
@@ -2583,6 +2589,8 @@ passcat (nis.U):
 	This variable contains a command that produces the text of the
 	/etc/passwd file.  This is normally "cat /etc/passwd", but can be
 	"ypcat passwd" when NIS is used.
+	On some systems, such as os390, there may be no equivalent
+	command, in which case this variable is unset.
 
 patchlevel (patchlevel.U):
 	The patchlevel level of this package.
@@ -2593,8 +2601,9 @@ path_sep (Unix.U):
 	used to separate elements in the command shell search PATH.
 
 perl (Loc.U):
-	This variable is defined but not used by Configure.
-	The value is a plain '' and is not useful.
+	This variable is used internally by Configure to determine the
+	full pathname (if any) of the perl program.  After Configure runs,
+	the value is reset to a plain "perl" and is not useful.
 
 perladmin (perladmin.U):
 	Electronic mail address of the perl5 administrator.
@@ -2808,8 +2817,9 @@ selecttype (selecttype.U):
 	have select(), naturally.
 
 sendmail (Loc.U):
-	This variable is defined but not used by Configure.
-	The value is a plain '' and is not useful.
+	This variable is used internally by Configure to determine the
+	full pathname (if any) of the sendmail program.  After Configure runs,
+	the value is reset to a plain "sendmail" and is not useful.
 
 sh (sh.U):
 	This variable contains the full pathname of the shell used
@@ -2943,9 +2953,6 @@ siteprefixexp (siteprefix.U):
 	This variable holds the full absolute path of the directory below
 	which the user will install add-on packages.  Derived from siteprefix.
 
-sizesize (sizesize.U):
-	This variable contains the size of a sizetype in bytes.
-
 sizetype (sizetype.U):
 	This variable defines sizetype to be something like size_t, 
 	unsigned long, or whatever type is used to declare length 
@@ -3179,15 +3186,25 @@ uquadtype (quadtype.U):
 	unsigned int, unsigned long long, uint64_t, or whatever type is
 	used for 64-bit integers.
 
+use5005threads (usethreads.U):
+	This variable conditionally defines the USE_5005THREADS symbol,
+	and indicates that Perl should be built to use the 5.005-based
+	threading implementation.
+
 use64bits (use64bits.U):
 	This variable conditionally defines the USE_64_BITS symbol,
-	and indicates that explicit 64-bit interfaces should be used
+	and indicates that 64-bit integer types should be used
 	when available.
 
 usedl (dlsrc.U):
 	This variable indicates if the the system supports dynamic
 	loading of some sort.  See also dlsrc and dlobj.
 
+useithreads (usethreads.U):
+	This variable conditionally defines the USE_ITHREADS symbol,
+	and indicates that Perl should be built to use the interpreter-based
+	threading implementation.
+
 uselargefiles (uselfs.U):
 	This variable conditionally defines the USE_LARGE_FILES symbol,
 	and indicates that large file interfaces should be used when
diff --git a/Porting/config.sh b/Porting/config.sh
index b730743538..711b3d464f 100644
--- a/Porting/config.sh
+++ b/Porting/config.sh
@@ -8,9 +8,9 @@
 
 # Package name      : perl5
 # Source directory  : .
-# Configuration time: Sat Nov 13 15:28:21 EET 1999
-# Configured by     : jhi
-# Target system     : osf1 alpha.hut.fi v4.0 878 alpha 
+# Configuration time: Fri Jan  7 16:16:39 EST 2000
+# Configured by     : doughera
+# Target system     : linux fractal 2.0.36 #1 mon feb 1 17:23:08 est 1999 i686 unknown 
 
 Author=''
 Date='$Date'
@@ -27,15 +27,15 @@ _a='.a'
 _exe=''
 _o='.o'
 afs='false'
-alignbytes='8'
+alignbytes='4'
 ansi2knr=''
 aphostname=''
-apiversion='5.00563'
+apiversion='5.00564'
 ar='ar'
-archlib='/opt/perl/lib/5.00563/alpha-dec_osf-thread'
-archlibexp='/opt/perl/lib/5.00563/alpha-dec_osf-thread'
+archlib='/opt/perl/lib/5.00564/i686-linux-thread'
+archlibexp='/opt/perl/lib/5.00564/i686-linux-thread'
 archname64=''
-archname='alpha-dec_osf-thread'
+archname='i686-linux-thread'
 archobjs=''
 awk='awk'
 baserev='5.0'
@@ -45,18 +45,18 @@ bincompat5005='undef'
 binexp='/opt/perl/bin'
 bison=''
 byacc='byacc'
-byteorder='12345678'
-c='\c'
+byteorder='1234'
+c=''
 castflags='0'
 cat='cat'
 cc='cc'
-cccdlflags=' '
-ccdlflags='  -Wl,-rpath,/opt/perl/lib/5.00563/alpha-dec_osf-thread/CORE'
-ccflags='-pthread -std -DLANGUAGE_C'
-ccsymbols='LANGUAGE_C=1 SYSTYPE_BSD=1 _LONGLONG=1 __LANGUAGE_C__=1'
-cf_by='jhi'
+cccdlflags='-fpic'
+ccdlflags='-rdynamic'
+ccflags='-D_REENTRANT -Dbool=char -DHAS_BOOL -fno-strict-aliasing -I/usr/local/include -DUSE_LONG_LONG'
+ccsymbols='__ELF__=1 __GNUC_MINOR__=95 __GNUC__=2 __linux=1 cpu=i386 machine=i386 system=posix'
+cf_by='doughera'
 cf_email='yourname@yourhost.yourplace.com'
-cf_time='Sat Nov 13 15:28:21 EET 1999'
+cf_time='Fri Jan  7 16:16:39 EST 2000'
 charsize='1'
 chgrp=''
 chmod=''
@@ -69,13 +69,13 @@ cp='cp'
 cpio=''
 cpp='cpp'
 cpp_stuff='42'
-cppccsymbols='_SYSTYPE_BSD=1 __alpha=1 __osf__=1 __unix__=1 unix=1'
-cppflags='-pthread -std -DLANGUAGE_C'
-cpplast=''
-cppminus=''
-cpprun='/usr/bin/cpp'
-cppstdin='cppstdin'
-cppsymbols=''
+cppccsymbols='__i386=1 __i386__=1 __linux__=1 __unix=1 __unix__=1 i386=1 linux=1 unix=1'
+cppflags='-D_REENTRANT -Dbool=char -DHAS_BOOL -fno-strict-aliasing -I/usr/local/include'
+cpplast='-'
+cppminus='-'
+cpprun='cc -E'
+cppstdin='cc -E'
+cppsymbols='__STDC__=1'
 crosscompile='undef'
 cryptlib=''
 csh='csh'
@@ -97,14 +97,14 @@ d_accessx='undef'
 d_alarm='define'
 d_archlib='define'
 d_atolf='undef'
-d_atoll='undef'
-d_attribut='undef'
+d_atoll='define'
+d_attribut='define'
 d_bcmp='define'
 d_bcopy='define'
 d_bincompat5005='undef'
 d_bsd='undef'
 d_bsdgetpgrp='undef'
-d_bsdsetpgrp='define'
+d_bsdsetpgrp='undef'
 d_bzero='define'
 d_casti32='undef'
 d_castneg='define'
@@ -119,7 +119,7 @@ d_csh='define'
 d_cuserid='define'
 d_dbl_dig='define'
 d_difftime='define'
-d_dirnamlen='define'
+d_dirnamlen='undef'
 d_dlerror='define'
 d_dlopen='define'
 d_dlsymun='undef'
@@ -133,7 +133,7 @@ d_endnent='define'
 d_endpent='define'
 d_endpwent='define'
 d_endsent='define'
-d_endspent='undef'
+d_endspent='define'
 d_eofnblk='define'
 d_eunice='undef'
 d_fchmod='define'
@@ -141,7 +141,7 @@ d_fchown='define'
 d_fcntl='define'
 d_fd_macros='define'
 d_fd_set='define'
-d_fds_bits='define'
+d_fds_bits='undef'
 d_fgetpos='define'
 d_flexfnam='define'
 d_flock='define'
@@ -149,11 +149,11 @@ d_fork='define'
 d_fpathconf='define'
 d_fpos64_t='undef'
 d_fs_data_s='undef'
-d_fseeko='undef'
+d_fseeko='define'
 d_fsetpos='define'
 d_fstatfs='define'
 d_fstatvfs='define'
-d_ftello='undef'
+d_ftello='define'
 d_ftime='undef'
 d_getgrent='define'
 d_getgrps='define'
@@ -164,7 +164,7 @@ d_gethname='define'
 d_gethostprotos='define'
 d_getlogin='define'
 d_getmnt='undef'
-d_getmntent='undef'
+d_getmntent='define'
 d_getnbyaddr='define'
 d_getnbyname='define'
 d_getnent='define'
@@ -183,16 +183,16 @@ d_getsbyname='define'
 d_getsbyport='define'
 d_getsent='define'
 d_getservprotos='define'
-d_getspent='undef'
-d_getspnam='undef'
+d_getspent='define'
+d_getspnam='define'
 d_gettimeod='define'
-d_gnulibc='undef'
+d_gnulibc='define'
 d_grpasswd='define'
-d_hasmntopt='undef'
+d_hasmntopt='define'
 d_htonl='define'
 d_index='undef'
 d_inetaton='define'
-d_int64t='undef'
+d_int64t='define'
 d_isascii='define'
 d_killpg='define'
 d_lchown='define'
@@ -219,7 +219,7 @@ d_msg_ctrunc='define'
 d_msg_dontroute='define'
 d_msg_oob='define'
 d_msg_peek='define'
-d_msg_proxy='undef'
+d_msg_proxy='define'
 d_msgctl='define'
 d_msgget='define'
 d_msgrcv='define'
@@ -241,11 +241,11 @@ d_pthread_yield='undef'
 d_pwage='undef'
 d_pwchange='undef'
 d_pwclass='undef'
-d_pwcomment='define'
+d_pwcomment='undef'
 d_pwexpire='undef'
 d_pwgecos='define'
 d_pwpasswd='define'
-d_pwquota='define'
+d_pwquota='undef'
 d_quad='define'
 d_readdir='define'
 d_readlink='define'
@@ -280,14 +280,14 @@ d_setpgrp='define'
 d_setprior='define'
 d_setpwent='define'
 d_setregid='define'
-d_setresgid='undef'
-d_setresuid='undef'
+d_setresgid='define'
+d_setresuid='define'
 d_setreuid='define'
-d_setrgid='define'
-d_setruid='define'
+d_setrgid='undef'
+d_setruid='undef'
 d_setsent='define'
 d_setsid='define'
-d_setspent='undef'
+d_setspent='define'
 d_setvbuf='define'
 d_sfio='undef'
 d_shm='define'
@@ -302,12 +302,12 @@ d_socket='define'
 d_sockpair='define'
 d_sqrtl='define'
 d_statblks='define'
-d_statfs_f_flags='define'
+d_statfs_f_flags='undef'
 d_statfs_s='define'
 d_statvfs='define'
-d_stdio_cnt_lval='define'
+d_stdio_cnt_lval='undef'
 d_stdio_ptr_lval='define'
-d_stdio_stream_array='define'
+d_stdio_stream_array='undef'
 d_stdiobase='define'
 d_stdstdio='define'
 d_strchr='define'
@@ -318,7 +318,7 @@ d_strerror='define'
 d_strtod='define'
 d_strtol='define'
 d_strtoul='define'
-d_strtoull='undef'
+d_strtoull='define'
 d_strxfrm='define'
 d_suidsafe='undef'
 d_symlink='define'
@@ -361,7 +361,7 @@ dlext='so'
 dlsrc='dl_dlopen.xs'
 doublesize='8'
 drand01='drand48()'
-dynamic_ext='B ByteLoader DB_File Data/Dumper Devel/DProf Devel/Peek Fcntl File/Glob IO IPC/SysV NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Thread attrs re'
+dynamic_ext='B ByteLoader DB_File Data/Dumper Devel/DProf Devel/Peek Fcntl File/Glob GDBM_File IO IPC/SysV ODBM_File Opcode POSIX SDBM_File Socket Thread attrs re'
 eagain='EAGAIN'
 ebcdic='undef'
 echo='echo'
@@ -370,24 +370,24 @@ emacs=''
 eunicefix=':'
 exe_ext=''
 expr='expr'
-extensions='B ByteLoader DB_File Data/Dumper Devel/DProf Devel/Peek Fcntl File/Glob IO IPC/SysV NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Thread attrs re Errno'
+extensions='B ByteLoader DB_File Data/Dumper Devel/DProf Devel/Peek Fcntl File/Glob GDBM_File IO IPC/SysV ODBM_File Opcode POSIX SDBM_File Socket Thread attrs re Errno'
 fflushNULL='define'
 fflushall='undef'
-find=''
+find='find'
 firstmakefile='makefile'
 flex=''
-fpossize='8'
+fpossize='4'
 fpostype='fpos_t'
 freetype='void'
 full_ar='/usr/bin/ar'
-full_csh='/usr/bin/csh'
-full_sed='/usr/bin/sed'
-gccversion=''
-gidformat='"u"'
+full_csh='/bin/csh'
+full_sed='/bin/sed'
+gccversion='2.95.2 19991109 (Debian GNU/Linux)'
+gidformat='"lu"'
 gidsign='1'
 gidsize='4'
 gidtype='gid_t'
-glibpth='/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib'
+glibpth='/usr/shlib  /shlib /lib/pa1.1 /usr/lib/large /lib /usr/lib /usr/lib/386 /lib/386 /lib/large /usr/lib/small /lib/small /usr/ccs/lib /usr/ucblib /usr/local/lib '
 grep='grep'
 groupcat='cat /etc/group'
 groupstype='gid_t'
@@ -400,9 +400,9 @@ huge=''
 i16size='2'
 i16type='short'
 i32size='4'
-i32type='int'
+i32type='long'
 i64size='8'
-i64type='long'
+i64type='long long'
 i8size='1'
 i8type='char'
 i_arpainet='define'
@@ -414,17 +414,17 @@ i_dld='undef'
 i_dlfcn='define'
 i_fcntl='undef'
 i_float='define'
-i_gdbm='undef'
+i_gdbm='define'
 i_grp='define'
-i_inttypes='undef'
+i_inttypes='define'
 i_limits='define'
 i_locale='define'
 i_machcthr='undef'
 i_malloc='define'
 i_math='define'
 i_memory='undef'
-i_mntent='undef'
-i_ndbm='define'
+i_mntent='define'
+i_ndbm='undef'
 i_netdb='define'
 i_neterrno='undef'
 i_netinettcp='define'
@@ -435,13 +435,13 @@ i_pwd='define'
 i_rpcsvcdbm='undef'
 i_sfio='undef'
 i_sgtty='undef'
-i_shadow='undef'
+i_shadow='define'
 i_socks='undef'
 i_stdarg='define'
 i_stddef='define'
 i_stdlib='define'
 i_string='define'
-i_sysaccess='define'
+i_sysaccess='undef'
 i_sysdir='define'
 i_sysfile='define'
 i_sysfilio='undef'
@@ -451,11 +451,11 @@ i_sysmount='define'
 i_sysndir='undef'
 i_sysparam='define'
 i_sysresrc='define'
-i_syssecrt='define'
+i_syssecrt='undef'
 i_sysselct='define'
 i_syssockio=''
 i_sysstat='define'
-i_sysstatfs='undef'
+i_sysstatfs='define'
 i_sysstatvfs='define'
 i_systime='define'
 i_systimek='undef'
@@ -463,7 +463,7 @@ i_systimes='define'
 i_systypes='define'
 i_sysuio='define'
 i_sysun='define'
-i_sysvfs='undef'
+i_sysvfs='define'
 i_syswait='define'
 i_termio='undef'
 i_termios='define'
@@ -475,18 +475,18 @@ i_values='define'
 i_varargs='undef'
 i_varhdr='stdarg.h'
 i_vfork='undef'
-ignore_versioned_solibs=''
+ignore_versioned_solibs='y'
 incpath=''
 inews=''
-installarchlib='/opt/perl/lib/5.00563/alpha-dec_osf-thread'
+installarchlib='/opt/perl/lib/5.00564/i686-linux-thread'
 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.00563'
-installscript='/opt/perl/bin'
-installsitearch='/opt/perl/lib/site_perl/5.00563/alpha-dec_osf-thread'
+installprivlib='/opt/perl/lib/5.00564'
+installscript='/opt/perl/script'
+installsitearch='/opt/perl/lib/site_perl/5.00564/i686-linux-thread'
 installsitebin='/opt/perl/bin'
 installsitelib='/opt/perl/lib/site_perl'
 installstyle='lib'
@@ -494,37 +494,37 @@ installusrbinperl='define'
 installvendorbin=''
 installvendorlib=''
 intsize='4'
-ivdformat='"ld"'
+ivdformat='"lld"'
 ivsize='8'
-ivtype='long'
+ivtype='long long'
 known_extensions='B ByteLoader DB_File Data/Dumper Devel/DProf Devel/Peek Fcntl File/Glob GDBM_File IO IPC/SysV NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Thread attrs re'
 ksh=''
 large=''
-ld='ld'
-lddlflags='-shared -expect_unresolved "*" -msym -s'
-ldflags=''
+ld='cc'
+lddlflags='-shared -L/usr/local/lib'
+ldflags=' -L/usr/local/lib'
 ldlibpthname='LD_LIBRARY_PATH'
 less='less'
 lib_ext='.a'
-libc='/usr/shlib/libc.so'
-libperl='libperl.so'
-libpth='/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /var/shlib'
-libs='-lgdbm -ldbm -ldb -lm -lpthread -lexc'
-libswanted='sfio socket inet nsl nm gdbm dbm db malloc dld ld sun m cposix posix ndir dir crypt sec ucb BSD x pthread exc'
-line=''
+libc='/lib/libc-2.1.2.so'
+libperl='libperl.a'
+libpth='/usr/local/lib /lib /usr/lib'
+libs='-lnsl -lndbm -lgdbm -ldbm -ldb -ldl -lm -lpthread -lc -lposix -lcrypt'
+libswanted='sfio socket inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m pthread c cposix posix ndir dir crypt sec ucb BSD PW x'
+line='line'
 lint=''
 lkflags=''
 ln='ln'
-lns='/usr/bin/ln -s'
+lns='/bin/ln -s'
 locincpth='/usr/local/include /opt/local/include /usr/gnu/include /opt/gnu/include /usr/GNU/include /opt/GNU/include'
 loclibpth='/usr/local/lib /opt/local/lib /usr/gnu/lib /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib'
-longdblsize='8'
+longdblsize='12'
 longlongsize='8'
-longsize='8'
+longsize='4'
 lp=''
 lpr=''
 ls='ls'
-lseeksize='8'
+lseeksize='4'
 lseektype='off_t'
 mail=''
 mailx=''
@@ -547,18 +547,18 @@ modetype='mode_t'
 more='more'
 multiarch='undef'
 mv=''
-myarchname='alpha-dec_osf'
+myarchname='i686-linux'
 mydomain='.yourplace.com'
 myhostname='yourhost'
-myuname='osf1 alpha.hut.fi v4.0 878 alpha '
-n=''
-netdb_hlen_type='int'
+myuname='linux fractal 2.0.36 #1 mon feb 1 17:23:08 est 1999 i686 unknown '
+n='-n'
+netdb_hlen_type='size_t'
 netdb_host_type='const char *'
 netdb_name_type='const char *'
-netdb_net_type='int'
+netdb_net_type='unsigned long'
 nm='nm'
-nm_opt='-p'
-nm_so_opt=''
+nm_opt=''
+nm_so_opt='--dynamic'
 nonxs_ext='Errno'
 nroff='nroff'
 nvsize='8'
@@ -568,14 +568,14 @@ obj_ext='.o'
 old_pthread_create_joinable=''
 optimize='-O'
 orderlib='false'
-osname='dec_osf'
-osvers='4.0'
+osname='linux'
+osvers='2.0.36'
 package='perl5'
-pager='/c/bin/less'
+pager='/usr/bin/less'
 passcat='cat /etc/passwd'
 patchlevel='5'
 path_sep=':'
-perl=''
+perl='perl'
 perladmin='yourname@yourhost.yourplace.com'
 perlpath='/opt/perl/bin/perl'
 pg='pg'
@@ -587,12 +587,12 @@ pmake=''
 pr=''
 prefix='/opt/perl'
 prefixexp='/opt/perl'
-privlib='/opt/perl/lib/5.00563'
-privlibexp='/opt/perl/lib/5.00563'
+privlib='/opt/perl/lib/5.00564'
+privlibexp='/opt/perl/lib/5.00564'
 prototype='define'
-ptrsize='8'
-quadkind='2'
-quadtype='long'
+ptrsize='4'
+quadkind='3'
+quadtype='long long'
 randbits='48'
 randfunc='drand48'
 randseedtype='long'
@@ -600,27 +600,27 @@ ranlib=':'
 rd_nodata='-1'
 rm='rm'
 rmail=''
-runnm='true'
-sPRIEldbl='"E"'
-sPRIFldbl='"F"'
-sPRIGldbl='"G"'
-sPRIX64='"lX"'
-sPRId64='"ld"'
-sPRIeldbl='"e"'
-sPRIfldbl='"f"'
-sPRIgldbl='"g"'
-sPRIi64='"li"'
-sPRIo64='"lo"'
-sPRIu64='"lu"'
-sPRIx64='"lx"'
+runnm='false'
+sPRIEldbl='"llE"'
+sPRIFldbl='"llF"'
+sPRIGldbl='"llG"'
+sPRIX64='"llX"'
+sPRId64='"lld"'
+sPRIeldbl='"lle"'
+sPRIfldbl='"llf"'
+sPRIgldbl='"llg"'
+sPRIi64='"lli"'
+sPRIo64='"llo"'
+sPRIu64='"llu"'
+sPRIx64='"llx"'
 sched_yield='sched_yield()'
-scriptdir='/opt/perl/bin'
-scriptdirexp='/opt/perl/bin'
+scriptdir='/opt/perl/script'
+scriptdirexp='/opt/perl/script'
 sed='sed'
 seedfunc='srand48'
 selectminbits='32'
 selecttype='fd_set *'
-sendmail=''
+sendmail='sendmail'
 sh='/bin/sh'
 shar=''
 sharpbang='#!'
@@ -628,21 +628,20 @@ shmattype='void *'
 shortsize='2'
 shrpenv=''
 shsharp='true'
-sig_count='49'
-sig_name='ZERO HUP INT QUIT ILL TRAP ABRT EMT FPE KILL BUS SEGV SYS PIPE ALRM TERM IOINT STOP TSTP CONT CHLD TTIN TTOU AIO XCPU XFSZ VTALRM PROF WINCH INFO USR1 USR2 RESV RTMIN NUM34 NUM35 NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 MAX IOT LOST URG CLD IO POLL PTY PWR RTMAX '
-sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "EMT", "FPE", "KILL", "BUS", "SEGV", "SYS", "PIPE", "ALRM", "TERM", "IOINT", "STOP", "TSTP", "CONT", "CHLD", "TTIN", "TTOU", "AIO", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "INFO", "USR1", "USR2", "RESV", "RTMIN", "NUM34", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "MAX", "IOT", "LOST", "URG", "CLD", "IO", "POLL", "PTY", "PWR", "RTMAX", 0'
-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 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 '
-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_count='64'
+sig_name='ZERO HUP INT QUIT ILL TRAP ABRT BUS FPE KILL USR1 SEGV USR2 PIPE ALRM TERM STKFLT CHLD CONT STOP TSTP TTIN TTOU URG XCPU XFSZ VTALRM PROF WINCH IO PWR UNUSED NUM32 NUM33 NUM34 NUM35 NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 NUM63 RTMIN IOT CLD POLL '
+sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "BUS", "FPE", "KILL", "USR1", "SEGV", "USR2", "PIPE", "ALRM", "TERM", "STKFLT", "CHLD", "CONT", "STOP", "TSTP", "TTIN", "TTOU", "URG", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "IO", "PWR", "UNUSED", "NUM32", "NUM33", "NUM34", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "NUM63", "RTMIN", "IOT", "CLD", "POLL", 0'
+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 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 -1 6 17 29 '
+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, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, -1, 6, 17, 29, 0'
 signal_t='void'
-sitearch='/opt/perl/lib/site_perl/5.00563/alpha-dec_osf-thread'
-sitearchexp='/opt/perl/lib/site_perl/5.00563/alpha-dec_osf-thread'
+sitearch='/opt/perl/lib/site_perl/5.00564/i686-linux-thread'
+sitearchexp='/opt/perl/lib/site_perl/5.00564/i686-linux-thread'
 sitebin='/opt/perl/bin'
 sitebinexp='/opt/perl/bin'
 sitelib='/opt/perl/lib/site_perl'
 sitelibexp='/opt/perl/lib/site_perl'
 siteprefix='/opt/perl'
 siteprefixexp='/opt/perl'
-sizesize='8'
 sizetype='size_t'
 sleep=''
 smail=''
@@ -659,16 +658,16 @@ ssizetype='ssize_t'
 startperl='#!/opt/perl/bin/perl'
 startsh='#!/bin/sh'
 static_ext=' '
-stdchar='unsigned char'
-stdio_base='((fp)->_base)'
-stdio_bufsiz='((fp)->_cnt + (fp)->_ptr - (fp)->_base)'
-stdio_cnt='((fp)->_cnt)'
+stdchar='char'
+stdio_base='((fp)->_IO_read_base)'
+stdio_bufsiz='((fp)->_IO_read_end - (fp)->_IO_read_base)'
+stdio_cnt='((fp)->_IO_read_end - (fp)->_IO_read_ptr)'
 stdio_filbuf=''
-stdio_ptr='((fp)->_ptr)'
-stdio_stream_array='_iob'
+stdio_ptr='((fp)->_IO_read_ptr)'
+stdio_stream_array=''
 strings='/usr/include/string.h'
 submit=''
-subversion='63'
+subversion='640'
 sysman='/usr/man/man1'
 tail=''
 tar=''
@@ -684,54 +683,56 @@ troff=''
 u16size='2'
 u16type='unsigned short'
 u32size='4'
-u32type='unsigned int'
+u32type='unsigned long'
 u64size='8'
-u64type='unsigned long'
+u64type='unsigned long long'
 u8size='1'
 u8type='unsigned char'
-uidformat='"u"'
+uidformat='"lu"'
 uidsign='1'
 uidsize='4'
 uidtype='uid_t'
 uname='uname'
 uniq='uniq'
-uquadtype='unsigned long'
+uquadtype='unsigned long long'
+use5005threads='undef'
 use64bits='define'
 usedl='define'
-uselargefiles='undef'
+useithreads='define'
+uselargefiles='define'
 uselongdouble='undef'
-uselonglong='undef'
+uselonglong='define'
 usemorebits='undef'
 usemultiplicity='undef'
 usemymalloc='n'
-usenm='true'
+usenm='false'
 useopcode='true'
 useperlio='undef'
 useposix='true'
 usesfio='false'
-useshrplib='true'
+useshrplib='false'
 usesocks='undef'
 usethreads='define'
 usevendorprefix='undef'
 usevfork='false'
 usrinc='/usr/include'
 uuname=''
-uvoformat='"lo"'
+uvoformat='"llo"'
 uvsize='8'
-uvtype='unsigned long'
-uvuformat='"lu"'
-uvxformat='"lx"'
+uvtype='unsigned long long'
+uvuformat='"llu"'
+uvxformat='"llx"'
 vendorbin=''
 vendorbinexp=''
 vendorlib=''
 vendorlibexp=''
 vendorprefix=''
 vendorprefixexp=''
-version='5.00563'
+version='5.00564'
 vi=''
 voidflags='15'
 xlibpth='/usr/lib/386 /lib/386'
-xs_apiversion='5.00563'
+xs_apiversion='5.00564'
 zcat=''
 zip='zip'
 # Configure command line arguments.
@@ -751,8 +752,6 @@ config_arg10='-Dmyhostname=yourhost'
 config_arg11='-dE'
 PERL_REVISION=5
 PERL_VERSION=5
-PERL_SUBVERSION=63
-PERL_APIVERSION=5.00563
+PERL_SUBVERSION=640
+PERL_APIVERSION=5.00564
 CONFIGDOTSH=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 313007519b..eb4e9d0ea9 100644
--- a/Porting/config_H
+++ b/Porting/config_H
@@ -17,9 +17,9 @@
 /*
  * Package name      : perl5
  * Source directory  : .
- * Configuration time: Sat Nov 13 15:28:21 EET 1999
- * Configured by     : jhi
- * Target system     : osf1 alpha.hut.fi v4.0 878 alpha 
+ * Configuration time: Fri Jan  7 16:16:39 EST 2000
+ * Configured by     : doughera
+ * Target system     : linux fractal 2.0.36 #1 mon feb 1 17:23:08 est 1999 i686 unknown 
  */
 
 #ifndef _config_h_
@@ -28,7 +28,7 @@
 /* LOC_SED:
  *	This symbol holds the complete pathname to the sed program.
  */
-#define LOC_SED 	"/usr/bin/sed"	/**/
+#define LOC_SED 	"/bin/sed"	/**/
 
 /* HAS_ALARM:
  *	This symbol, if defined, indicates that the alarm routine is
@@ -40,7 +40,7 @@
  *	This symbol indicates the C compiler can check for function attributes,
  *	such as printf formats. This is normally only supported by GNU cc.
  */
-/*#define HASATTRIBUTE 	/ **/
+#define HASATTRIBUTE 	/**/
 #ifndef HASATTRIBUTE
 #define __attribute__(_arg_)
 #endif
@@ -493,7 +493,7 @@
  *	for a POSIX interface.
  */
 #define HAS_SETPGRP		/**/
-#define USE_BSD_SETPGRP	/**/
+/*#define USE_BSD_SETPGRP	/ **/
 
 /* HAS_SETPGRP2:
  *	This symbol, if defined, indicates that the setpgrp2() (as in DG/UX)
@@ -518,7 +518,7 @@
  *	process.
  */
 #define HAS_SETREGID		/**/
-/*#define HAS_SETRESGID		/ **/
+#define HAS_SETRESGID		/**/
 
 /* HAS_SETREUID:
  *	This symbol, if defined, indicates that the setreuid routine is
@@ -531,19 +531,19 @@
  *	process.
  */
 #define HAS_SETREUID		/**/
-/*#define HAS_SETRESUID		/ **/
+#define HAS_SETRESUID		/**/
 
 /* HAS_SETRGID:
  *	This symbol, if defined, indicates that the setrgid routine is available
  *	to change the real gid of the current program.
  */
-#define HAS_SETRGID		/**/
+/*#define HAS_SETRGID		/ **/
 
 /* HAS_SETRUID:
  *	This symbol, if defined, indicates that the setruid routine is available
  *	to change the real uid of the current program.
  */
-#define HAS_SETRUID		/**/
+/*#define HAS_SETRUID		/ **/
 
 /* HAS_SETSID:
  *	This symbol, if defined, indicates that the setsid routine is
@@ -734,7 +734,7 @@
  *	portably declare your directory entries.
  */
 #define I_DIRENT		/**/
-#define DIRNAMLEN	/**/
+/*#define DIRNAMLEN	/ **/
 #define Direntry_t struct dirent
 
 /* I_DLFCN:
@@ -784,7 +784,7 @@
  *	This symbol, if defined, indicates that <ndbm.h> exists and should
  *	be included.
  */
-#define I_NDBM	/**/
+/*#define I_NDBM	/ **/
 
 /* I_NET_ERRNO:
  *	This symbol, if defined, indicates that <net/errno.h> exists and 
@@ -982,26 +982,49 @@
  *	This symbol is defined to be the type of char used in stdio.h.
  *	It has the values "unsigned char" or "char".
  */
-#define STDCHAR unsigned char	/**/
+#define STDCHAR char	/**/
 
-/* HAS_QUAD:
- *	This symbol, if defined, tells that there's a 64-bit integer type,
- *	Quad_t.
+/* CROSSCOMPILE:
+ *	This symbol, if defined, signifies that we our
+ *	build process is a cross-compilation.
+ */
+/*#define CROSSCOMPILE		/ **/
+
+/* INTSIZE:
+ *	This symbol contains the value of sizeof(int) so that the C
+ *	preprocessor can make decisions based on it.
+ */
+/* LONGSIZE:
+ *	This symbol contains the value of sizeof(long) so that the C
+ *	preprocessor can make decisions based on it.
+ */
+/* SHORTSIZE:
+ *	This symbol contains the value of sizeof(short) so that the C
+ *	preprocessor can make decisions based on it.
  */
-/* Quad_t:
- *	This symbol holds the type used for 64-bit integers.
- *	It can be int, long, long long, int64_t etc...
+#define INTSIZE 4		/**/
+#define LONGSIZE 4		/**/
+#define SHORTSIZE 2		/**/
+
+/* MULTIARCH:
+ *	This symbol, if defined, signifies that the build
+ *	process will produce some binary files that are going to be
+ *	used in a cross-platform environment.  This is the case for
+ *	example with the NeXT "fat" binaries that contain executables
+ *	for several CPUs.
  */
-/* Uquad_t:
- *	This symbol holds the type used for unsigned 64-bit integers.
- *	It can be unsigned int, unsigned long, unsigned long long,
- *	uint64_t etc...
+/*#define MULTIARCH		/ **/
+
+/* HAS_QUAD:
+ *	This symbol, if defined, tells that there's a 64-bit integer type,
+ *	Quad_t, and its unsigned counterpar, Uquad_t. QUADKIND will be one
+ *	of QUAD_IS_INT, QUAD_IS_LONG, QUAD_IS_LONG_LONG, or QUAD_IS_INT64_T.
  */
 #define HAS_QUAD	/**/
-#define Quad_t long	/**/
-#define Uquad_t unsigned long	/**/
 #ifdef HAS_QUAD
-#   define QUADKIND 2	/**/
+#   define Quad_t long long	/**/
+#   define Uquad_t unsigned long long	/**/
+#   define QUADKIND 3	/**/
 #   define QUAD_IS_INT	1
 #   define QUAD_IS_LONG	2
 #   define QUAD_IS_LONG_LONG	3
@@ -1024,44 +1047,13 @@
  *     This symbol, if defined, indicates to the C program that it should
  *     include <sys/access.h>.
  */
-#define   I_SYS_ACCESS                /**/
+/*#define   I_SYS_ACCESS                / **/
 
 /* I_SYS_SECURITY:
  *     This symbol, if defined, indicates to the C program that it should
  *     include <sys/security.h>.
  */
-#define   I_SYS_SECURITY	/**/
-
-/* CROSSCOMPILE:
- *	This symbol, if defined, signifies that we our
- *	build process is a cross-compilation.
- */
-/*#define CROSSCOMPILE		/ **/
-
-/* INTSIZE:
- *	This symbol contains the value of sizeof(int) so that the C
- *	preprocessor can make decisions based on it.
- */
-/* LONGSIZE:
- *	This symbol contains the value of sizeof(long) so that the C
- *	preprocessor can make decisions based on it.
- */
-/* SHORTSIZE:
- *	This symbol contains the value of sizeof(short) so that the C
- *	preprocessor can make decisions based on it.
- */
-#define INTSIZE 4		/**/
-#define LONGSIZE 8		/**/
-#define SHORTSIZE 2		/**/
-
-/* MULTIARCH:
- *	This symbol, if defined, signifies that the build
- *	process will produce some binary files that are going to be
- *	used in a cross-platform environment.  This is the case for
- *	example with the NeXT "fat" binaries that contain executables
- *	for several CPUs.
- */
-/*#define MULTIARCH		/ **/
+/*#define   I_SYS_SECURITY	/ **/
 
 /* MEM_ALIGNBYTES:
  *	This symbol contains the number of bytes required to align a
@@ -1071,7 +1063,7 @@
 #if defined(CROSSCOMPILE) || defined(MULTIARCH)
 #  define MEM_ALIGNBYTES 8
 #else
-#define MEM_ALIGNBYTES 8
+#define MEM_ALIGNBYTES 4
 #endif
 
 /* BYTEORDER:
@@ -1114,7 +1106,7 @@
 #    define BYTEORDER 0x4321
 #  endif
 #else
-#define BYTEORDER 0x12345678	/* large digits for MSB */
+#define BYTEORDER 0x1234	/* large digits for MSB */
 #endif /* NeXT */
 
 /* CASTI32:
@@ -1171,7 +1163,7 @@
  *	This symbol, if defined, indicates to the C program that 
  *	the GNU C library is being used.
  */
-/*#define HAS_GNULIBC  	/ **/
+#define HAS_GNULIBC  	/**/
 /* HAS_ISASCII:
  *	This manifest constant lets the C program know that isascii 
  *	is available.
@@ -1278,10 +1270,10 @@
  */
 #define USE_STDIO_PTR 	/**/
 #ifdef USE_STDIO_PTR
-#define FILE_ptr(fp)	((fp)->_ptr)
+#define FILE_ptr(fp)	((fp)->_IO_read_ptr)
 #define STDIO_PTR_LVALUE 		/**/
-#define FILE_cnt(fp)	((fp)->_cnt)
-#define STDIO_CNT_LVALUE 		/**/
+#define FILE_cnt(fp)	((fp)->_IO_read_end - (fp)->_IO_read_ptr)
+/*#define STDIO_CNT_LVALUE 		/ **/
 #endif
 
 /* USE_STDIO_BASE:
@@ -1306,8 +1298,8 @@
  */
 #define USE_STDIO_BASE 	/**/
 #ifdef USE_STDIO_BASE
-#define FILE_base(fp)	((fp)->_base)
-#define FILE_bufsiz(fp)	((fp)->_cnt + (fp)->_ptr - (fp)->_base)
+#define FILE_base(fp)	((fp)->_IO_read_base)
+#define FILE_bufsiz(fp)	((fp)->_IO_read_end - (fp)->_IO_read_base)
 #endif
 
 /* HAS_VPRINTF:
@@ -1379,7 +1371,7 @@
  *	the compiler supports (void *); otherwise it will be
  *	sizeof(char *).
  */
-#define PTRSIZE 8		/**/
+#define PTRSIZE 4		/**/
 
 /* Drand01:
  *	This macro is to be used to generate uniformly distributed
@@ -1435,8 +1427,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.00563/alpha-dec_osf-thread"		/**/
-#define ARCHLIB_EXP "/opt/perl/lib/5.00563/alpha-dec_osf-thread"		/**/
+#define ARCHLIB "/opt/perl/lib/5.00564/i686-linux-thread"		/**/
+#define ARCHLIB_EXP "/opt/perl/lib/5.00564/i686-linux-thread"		/**/
 
 /* BIN:
  *	This symbol holds the path of the bin directory where the package will
@@ -1465,8 +1457,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.00563"		/**/
-#define PRIVLIB_EXP "/opt/perl/lib/5.00563"		/**/
+#define PRIVLIB "/opt/perl/lib/5.00564"		/**/
+#define PRIVLIB_EXP "/opt/perl/lib/5.00564"		/**/
 
 /* SITEARCH:
  *	This symbol contains the name of the private library for this package.
@@ -1483,8 +1475,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.00563/alpha-dec_osf-thread"		/**/
-#define SITEARCH_EXP "/opt/perl/lib/site_perl/5.00563/alpha-dec_osf-thread"		/**/
+#define SITEARCH "/opt/perl/lib/site_perl/5.00564/i686-linux-thread"		/**/
+#define SITEARCH_EXP "/opt/perl/lib/site_perl/5.00564/i686-linux-thread"		/**/
 
 /* SITELIB:
  *	This symbol contains the name of the private library for this package.
@@ -1515,7 +1507,7 @@
  *	by Configure.  You shouldn't rely on it too much; the specific
  *	feature tests from Configure are generally more reliable.
  */
-#define OSNAME "dec_osf"		/**/
+#define OSNAME "linux"		/**/
 
 /* CAT2:
  *	This macro catenates 2 tokens together.
@@ -1562,10 +1554,10 @@
  *	This symbol is intended to be used along with CPPRUN in the same manner
  *	symbol CPPMINUS is used with CPPSTDIN. It contains either "-" or "".
  */
-#define CPPSTDIN "cppstdin"
-#define CPPMINUS ""
-#define CPPRUN "/usr/bin/cpp"
-#define CPPLAST ""
+#define CPPSTDIN "cc -E"
+#define CPPMINUS "-"
+#define CPPRUN "cc -E"
+#define CPPLAST "-"
 
 /* HAS_ACCESS:
  *	This manifest constant lets the C program know that the access()
@@ -1582,7 +1574,7 @@
  */
 #define HAS_CSH		/**/
 #ifdef HAS_CSH
-#define CSH "/usr/bin/csh"	/**/
+#define CSH "/bin/csh"	/**/
 #endif
 
 /* HAS_ENDGRENT:
@@ -1769,7 +1761,7 @@
  */
 #define HAS_LONG_DOUBLE		/**/
 #ifdef HAS_LONG_DOUBLE
-#define LONG_DOUBLESIZE 8		/**/
+#define LONG_DOUBLESIZE 12		/**/
 #endif
 
 /* HAS_LONG_LONG:
@@ -1903,7 +1895,7 @@
 #define	HAS_MSG_DONTROUTE	/**/
 #define	HAS_MSG_OOB	/**/
 #define	HAS_MSG_PEEK	/**/
-/*#define	HAS_MSG_PROXY	/ **/
+#define	HAS_MSG_PROXY	/**/
 #define	HAS_SCM_RIGHTS	/**/
 
 /* USE_STAT_BLOCKS:
@@ -2035,12 +2027,12 @@
  *	contains pw_passwd.
  */
 #define I_PWD		/**/
-#define PWQUOTA	/**/
+/*#define PWQUOTA	/ **/
 /*#define PWAGE	/ **/
 /*#define PWCHANGE	/ **/
 /*#define PWCLASS	/ **/
 /*#define PWEXPIRE	/ **/
-#define PWCOMMENT	/**/
+/*#define PWCOMMENT	/ **/
 #define PWGECOS	/**/
 #define PWPASSWD	/**/
 
@@ -2093,8 +2085,8 @@
  *	The last element is 0, corresponding to the 0 at the end of
  *	the sig_name list.
  */
-#define SIG_NAME "ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "EMT", "FPE", "KILL", "BUS", "SEGV", "SYS", "PIPE", "ALRM", "TERM", "IOINT", "STOP", "TSTP", "CONT", "CHLD", "TTIN", "TTOU", "AIO", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "INFO", "USR1", "USR2", "RESV", "RTMIN", "NUM34", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "MAX", "IOT", "LOST", "URG", "CLD", "IO", "POLL", "PTY", "PWR", "RTMAX", 0		/**/
-#define 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, 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		/**/
+#define SIG_NAME "ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "BUS", "FPE", "KILL", "USR1", "SEGV", "USR2", "PIPE", "ALRM", "TERM", "STKFLT", "CHLD", "CONT", "STOP", "TSTP", "TTIN", "TTOU", "URG", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "IO", "PWR", "UNUSED", "NUM32", "NUM33", "NUM34", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "NUM63", "RTMIN", "IOT", "CLD", "POLL", 0		/**/
+#define 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, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, -1, 6, 17, 29, 0		/**/
 
 /* VOIDFLAGS:
  *	This symbol indicates how much support of the void type is given by this
@@ -2131,7 +2123,7 @@
  *	This symbol, if defined, indicates that the atoll routine is
  *	available to convert strings into long longs.
  */
-/*#define HAS_ATOLL		/ **/
+#define HAS_ATOLL		/**/
 
 /* PERL_BINCOMPAT_5005:
  *	This symbol, if defined, indicates that Perl 5.006 should be
@@ -2153,7 +2145,7 @@
  *	This symbol, if defined, indicates that the endspent system call is
  *	available to finalize the scan of SysV shadow password entries.
  */
-/*#define HAS_ENDSPENT		/ **/
+#define HAS_ENDSPENT		/**/
 
 /* HAS_STRUCT_FS_DATA:
  *	This symbol, if defined, indicates that the struct fs_data
@@ -2165,7 +2157,7 @@
  *	This symbol, if defined, indicates that the fseeko routine is
  *	available to fseek beyond 32 bits (useful for ILP32 hosts).
  */
-/*#define HAS_FSEEKO		/ **/
+#define HAS_FSEEKO		/**/
 
 /* HAS_FSTATFS:
  *	This symbol, if defined, indicates that the fstatfs routine is
@@ -2176,7 +2168,7 @@
  *	This symbol, if defined, indicates that the ftello routine is
  *	available to ftell beyond 32 bits (useful for ILP32 hosts).
  */
-/*#define HAS_FTELLO		/ **/
+#define HAS_FTELLO		/**/
 
 /* HAS_GETMNT:
  *	This symbol, if defined, indicates that the getmnt routine is
@@ -2188,32 +2180,32 @@
  *	This symbol, if defined, indicates that the getmntent routine is
  *	available to iterate through mounted file systems to get their info.
  */
-/*#define HAS_GETMNTENT		/ **/
+#define HAS_GETMNTENT		/**/
 
 /* HAS_GETSPENT:
  *	This symbol, if defined, indicates that the getspent system call is
  *	available to retrieve SysV shadow password entries sequentially.
  */
-/*#define HAS_GETSPENT		/ **/
+#define HAS_GETSPENT		/**/
 
 /* HAS_GETSPNAM:
  *	This symbol, if defined, indicates that the getspnam system call is
  *	available to retrieve SysV shadow password entries by name.
  */
-/*#define HAS_GETSPNAM		/ **/
+#define HAS_GETSPNAM		/**/
 
 /* HAS_HASMNTOPT:
  *	This symbol, if defined, indicates that the hasmntopt routine is
  *	available to query the mount options of file systems.
  */
-/*#define HAS_HASMNTOPT		/ **/
+#define HAS_HASMNTOPT		/**/
 
 /* HAS_INT64_T:
  *     This symbol will defined if the C compiler supports int64_t.
  *     Usually the <inttypes.h> needs to be included, but sometimes
  *	<sys/types.h> is enough.
  */
-/*#define     HAS_INT64_T               / **/
+#define     HAS_INT64_T               /**/
 
 /* HAS_LDBL_DIG:
  *	This symbol, if defined, indicates that this system's <float.h>
@@ -2227,7 +2219,7 @@
  *	This symbol, if defined, indicates that the setspent system call is
  *	available to initialize the scan of SysV shadow password entries.
  */
-/*#define HAS_SETSPENT		/ **/
+#define HAS_SETSPENT		/**/
 
 /* USE_SFIO:
  *	This symbol, if defined, indicates that sfio should
@@ -2250,7 +2242,7 @@
  *	have statfs() and struct statfs, they have ustat() and getmnt()
  *	with struct ustat and struct fs_data.
  */
-#define HAS_STRUCT_STATFS_F_FLAGS		/**/
+/*#define HAS_STRUCT_STATFS_F_FLAGS		/ **/
 
 /* HAS_STRUCT_STATFS:
  *	This symbol, if defined, indicates that the struct statfs
@@ -2315,13 +2307,13 @@
  *     This symbol, if defined, indicates to the C program that it should
  *     include <inttypes.h>.
  */
-/*#define   I_INTTYPES                / **/
+#define   I_INTTYPES                /**/
 
 /* I_MNTENT:
  *	This symbol, if defined, indicates that <mntent.h> exists and
  *	should be included.
  */
-/*#define	I_MNTENT		/ **/
+#define	I_MNTENT		/**/
 
 /* I_NETINET_TCP:
  *     This symbol, if defined, indicates to the C program that it should
@@ -2339,7 +2331,7 @@
  *	This symbol, if defined, indicates that <shadow.h> exists and
  *	should be included.
  */
-/*#define	I_SHADOW		/ **/
+#define	I_SHADOW		/**/
 
 /* I_SOCKS:
  *	This symbol, if defined, indicates that <socks.h> exists and
@@ -2356,7 +2348,7 @@
 /* I_SYS_STATFS:
  *	This symbol, if defined, indicates that <sys/statfs.h> exists.
  */
-/*#define	I_SYS_STATFS		/ **/
+#define	I_SYS_STATFS		/**/
 
 /* I_SYS_STATVFS:
  *	This symbol, if defined, indicates that <sys/statvfs.h> exists and
@@ -2368,7 +2360,7 @@
  *	This symbol, if defined, indicates that <sys/vfs.h> exists and
  *	should be included.
  */
-/*#define	I_SYS_VFS		/ **/
+#define	I_SYS_VFS		/**/
 
 /* I_USTAT:
  *	This symbol, if defined, indicates that <ustat.h> exists and
@@ -2393,8 +2385,8 @@
  *	This symbol, if defined, contains the string used by stdio to
  *	format long doubles (format 'g') for output.
  */
-#define PERL_PRIfldbl	"f"	/**/
-#define PERL_PRIgldbl	"g"	/**/
+#define PERL_PRIfldbl	"llf"	/**/
+#define PERL_PRIgldbl	"llg"	/**/
 
 /* IVTYPE:
  *	This symbol defines the C type used for Perl's IV.
@@ -2459,20 +2451,17 @@
 /* U64SIZE:
  *	This symbol contains the sizeof(U64).
  */
-/* NVSIZE:
- *	This symbol contains the sizeof(NV).
- */
-#define	IVTYPE		long		/**/
-#define	UVTYPE		unsigned long		/**/
+#define	IVTYPE		long long		/**/
+#define	UVTYPE		unsigned long long		/**/
 #define	I8TYPE		char		/**/
 #define	U8TYPE		unsigned char		/**/
 #define	I16TYPE		short	/**/
 #define	U16TYPE		unsigned short	/**/
-#define	I32TYPE		int	/**/
-#define	U32TYPE		unsigned int	/**/
+#define	I32TYPE		long	/**/
+#define	U32TYPE		unsigned long	/**/
 #ifdef HAS_QUAD
-#define	I64TYPE		long	/**/
-#define	U64TYPE		unsigned long	/**/
+#define	I64TYPE		long long	/**/
+#define	U64TYPE		unsigned long long	/**/
 #endif
 #define	NVTYPE		double		/**/
 #define	IVSIZE		8		/**/
@@ -2487,7 +2476,6 @@
 #define	I64SIZE		8	/**/
 #define	U64SIZE		8	/**/
 #endif
-#define	NVSIZE		8		/**/
 
 /* IVdf:
  *	This symbol defines the format string used for printing a Perl IV
@@ -2505,10 +2493,10 @@
  *	This symbol defines the format string used for printing a Perl UV
  *	as an unsigned hexadecimal integer.
  */
-#define	IVdf		"ld"		/**/
-#define	UVuf		"lu"		/**/
-#define	UVof		"lo"		/**/
-#define	UVxf		"lx"		/**/
+#define	IVdf		"lld"		/**/
+#define	UVuf		"llu"		/**/
+#define	UVof		"llo"		/**/
+#define	UVxf		"llx"		/**/
 
 /* SELECT_MIN_BITS:
  *	This symbol holds the minimum number of bits operated by select.
@@ -2534,18 +2522,18 @@
  *	This symbol tells the name of the array holding the stdio streams.
  *	Usual values include _iob, __iob, and __sF.
  */
-#define	HAS_STDIO_STREAM_ARRAY	/**/
-#define STDIO_STREAM_ARRAY	_iob
+/*#define	HAS_STDIO_STREAM_ARRAY	/ **/
+#define STDIO_STREAM_ARRAY	
 
 /* HAS_STRTOULL:
  *	This symbol, if defined, indicates that the strtoull routine is
  *	available to convert strings into unsigned long longs.
  */
-/*#define HAS_STRTOULL		/ **/
+#define HAS_STRTOULL		/**/
 
 /* USE_64_BITS:
- *	This symbol, if defined, indicates that 64-bit interfaces should
- *	be used when available.  If not defined, the native default interfaces
+ *	This symbol, if defined, indicates that 64-bit integers should
+ *	be used when available.  If not defined, the native integers
  *	will be used (be they 32 or 64 bits).
  */
 #ifndef USE_64_BITS
@@ -2558,7 +2546,7 @@
  *	also be turned on if necessary.
  */
 #ifndef USE_LARGE_FILES
-/*#define	USE_LARGE_FILES		/ **/
+#define	USE_LARGE_FILES		/**/
 #endif
 
 /* USE_LONG_DOUBLE:
@@ -2574,7 +2562,7 @@
  *	be used when available.
  */
 #ifndef USE_LONG_LONG
-/*#define	USE_LONG_LONG		/ **/
+#define	USE_LONG_LONG		/**/
 #endif
 
 #ifndef USE_MORE_BITS
@@ -2609,7 +2597,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.00563/alpha-dec_osf-thread for older
+ *	lib/lib.pm will automatically search in /opt/perl/lib/site_perl/5.00564/i686-linux-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.
@@ -2638,7 +2626,7 @@
  *	(presumably) be similar.
  *	See the INSTALL file for how this works.
  */
-#define PERL_XS_APIVERSION 5.00563 /* Change to string for tuples?*/
+#define PERL_XS_APIVERSION 5.00564 /* Change to string for tuples?*/
 #define PERL_PM_APIVERSION 5.005 /* Change to string for tuples?*/
 
 /* HAS_DRAND48_PROTO:
@@ -2698,9 +2686,9 @@
  *	getnetbyaddr().
  */
 #define Netdb_host_t		const char * /**/
-#define Netdb_hlen_t		int /**/
+#define Netdb_hlen_t		size_t /**/
 #define Netdb_name_t		const char * /**/
-#define Netdb_net_t		int /**/
+#define Netdb_net_t		unsigned long /**/
 
 /* Select_fd_set_t:
  *	This symbol holds the type used for the 2nd, 3rd, and 4th
@@ -2716,7 +2704,7 @@
  *	where library files may be held under a private library, for
  *	instance.
  */
-#define ARCHNAME "alpha-dec_osf-thread"		/**/
+#define ARCHNAME "i686-linux-thread"		/**/
 
 /* OLD_PTHREAD_CREATE_JOINABLE:
  *	This symbol, if defined, indicates how to create pthread
@@ -2759,16 +2747,22 @@
  */
 #define   I_PTHREAD	/**/
 
-/* USE_THREADS:
- *	This symbol, if defined, indicates that Perl should
- *	be built to use threads.
+/* USE_ITHREADS:
+ *	This symbol, if defined, indicates that Perl should be built to
+ *	use the interpreter-based threading implementation.
+ */
+/* USE_5005THREADS:
+ *	This symbol, if defined, indicates that Perl should be built to
+ *	use the 5.005-based threading implementation.
  */
 /* OLD_PTHREADS_API:
  *	This symbol, if defined, indicates that Perl should
  *	be built to use the old draft POSIX threads API.
  */
-#ifndef USE_TTHREADS
-#define	USE_THREADS		/**/
+/*#define	USE_5005THREADS		/ **/
+#define	USE_ITHREADS		/**/
+#if defined(USE_5005THREADS) && !defined(USE_ITHREADS)
+#define		USE_THREADS		/* until src is revised*/
 #endif
 /*#define	OLD_PTHREADS_API		/ **/
 
@@ -2796,7 +2790,7 @@
 /* Gid_t_f:
  *	This symbol defines the format string used for printing a Gid_t.
  */
-#define	Gid_t_f		"u"		/**/
+#define	Gid_t_f		"lu"		/**/
 
 /* Gid_t_size:
  *	This symbol holds the size of a Gid_t in bytes.
@@ -2824,8 +2818,8 @@
  *	This symbol holds the number of bytes used by the Off_t.
  */
 #define Off_t off_t		/* <offset> type */
-#define LSEEKSIZE 8		/* <offset> size */
-#define Off_t_size 8	/* <offset> size */
+#define LSEEKSIZE 4		/* <offset> size */
+#define Off_t_size 4	/* <offset> size */
 
 /* Mode_t:
  *	This symbol holds the type used to declare file modes 
@@ -2842,11 +2836,6 @@
  */
 #define Pid_t pid_t		/* PID type */
 
-/* Size_t_size:
- *	This symbol holds the size of a Size_t in bytes.
- */
-#define Size_t_size 8		/* */
-
 /* Size_t:
  *	This symbol holds the type used to declare length parameters
  *	for string functions.  It is usually size_t, but may be
@@ -2858,7 +2847,7 @@
 /* Uid_t_f:
  *	This symbol defines the format string used for printing a Uid_t.
  */
-#define	Uid_t_f		"u"		/**/
+#define	Uid_t_f		"lu"		/**/
 
 /* Uid_t_size:
  *	This symbol holds the size of a Uid_t in bytes.
diff --git a/config_h.SH b/config_h.SH
index 7e0f25af9d..58dc53f9ed 100644
--- a/config_h.SH
+++ b/config_h.SH
@@ -998,6 +998,37 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  */
 #define STDCHAR $stdchar	/**/
 
+/* CROSSCOMPILE:
+ *	This symbol, if defined, signifies that we our
+ *	build process is a cross-compilation.
+ */
+#$crosscompile CROSSCOMPILE		/**/
+
+/* INTSIZE:
+ *	This symbol contains the value of sizeof(int) so that the C
+ *	preprocessor can make decisions based on it.
+ */
+/* LONGSIZE:
+ *	This symbol contains the value of sizeof(long) so that the C
+ *	preprocessor can make decisions based on it.
+ */
+/* SHORTSIZE:
+ *	This symbol contains the value of sizeof(short) so that the C
+ *	preprocessor can make decisions based on it.
+ */
+#define INTSIZE $intsize		/**/
+#define LONGSIZE $longsize		/**/
+#define SHORTSIZE $shortsize		/**/
+
+/* MULTIARCH:
+ *	This symbol, if defined, signifies that the build
+ *	process will produce some binary files that are going to be
+ *	used in a cross-platform environment.  This is the case for
+ *	example with the NeXT "fat" binaries that contain executables
+ *	for several CPUs.
+ */
+#$multiarch MULTIARCH		/**/
+
 /* HAS_QUAD:
  *	This symbol, if defined, tells that there's a 64-bit integer type,
  *	Quad_t, and its unsigned counterpar, Uquad_t. QUADKIND will be one
@@ -1038,37 +1069,6 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  */
 #$i_syssecrt   I_SYS_SECURITY	/**/
 
-/* CROSSCOMPILE:
- *	This symbol, if defined, signifies that we our
- *	build process is a cross-compilation.
- */
-#$crosscompile CROSSCOMPILE		/**/
-
-/* INTSIZE:
- *	This symbol contains the value of sizeof(int) so that the C
- *	preprocessor can make decisions based on it.
- */
-/* LONGSIZE:
- *	This symbol contains the value of sizeof(long) so that the C
- *	preprocessor can make decisions based on it.
- */
-/* SHORTSIZE:
- *	This symbol contains the value of sizeof(short) so that the C
- *	preprocessor can make decisions based on it.
- */
-#define INTSIZE $intsize		/**/
-#define LONGSIZE $longsize		/**/
-#define SHORTSIZE $shortsize		/**/
-
-/* MULTIARCH:
- *	This symbol, if defined, signifies that the build
- *	process will produce some binary files that are going to be
- *	used in a cross-platform environment.  This is the case for
- *	example with the NeXT "fat" binaries that contain executables
- *	for several CPUs.
- */
-#$multiarch MULTIARCH		/**/
-
 /* MEM_ALIGNBYTES:
  *	This symbol contains the number of bytes required to align a
  *	double. Usual values are 2, 4 and 8. The default is eight,
@@ -2761,16 +2761,22 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  */
 #$i_pthread   I_PTHREAD	/**/
 
-/* USE_THREADS:
- *	This symbol, if defined, indicates that Perl should
- *	be built to use threads.
+/* USE_ITHREADS:
+ *	This symbol, if defined, indicates that Perl should be built to
+ *	use the interpreter-based threading implementation.
+ */
+/* USE_5005THREADS:
+ *	This symbol, if defined, indicates that Perl should be built to
+ *	use the 5.005-based threading implementation.
  */
 /* OLD_PTHREADS_API:
  *	This symbol, if defined, indicates that Perl should
  *	be built to use the old draft POSIX threads API.
  */
-#ifndef USE_TTHREADS
-#$usethreads	USE_THREADS		/**/
+#$use5005threads	USE_5005THREADS		/**/
+#$useithreads	USE_ITHREADS		/**/
+#if defined(USE_5005THREADS) && !defined(USE_ITHREADS)
+#define		USE_THREADS		/* until src is revised*/
 #endif
 #$d_oldpthreads	OLD_PTHREADS_API		/**/
 
diff --git a/perl.h b/perl.h
index 98c6265fd0..be2bf4fbc8 100644
--- a/perl.h
+++ b/perl.h
@@ -23,6 +23,17 @@
 #define VOIDUSED 1
 #include "config.h"
 
+#if defined(USE_ITHREADS) && defined(USE_5005THREADS)
+#  include "error: USE_ITHREADS and USE_5005THREADS are incompatible"
+#endif
+
+/* XXX This next guard can disappear if the sources are revised
+   to use USE_5005THREADS throughout. -- A.D  1/6/2000
+*/
+#if defined(USE_ITHREADS) && defined(USE_THREADS)
+#  include "error: USE_ITHREADS and USE_THREADS are incompatible"
+#endif
+
 /* See L<perlguts/"The Perl API"> for detailed notes on
  * PERL_IMPLICIT_CONTEXT and PERL_IMPLICIT_SYS */
 
diff --git a/win32/Makefile b/win32/Makefile
index 79edfc2bad..6cfb264612 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -29,7 +29,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.00563
+INST_VER	= \5.00564
 
 #
 # Comment this out if you DON'T want your perl installation to have
@@ -47,7 +47,7 @@ INST_ARCH	= \$(ARCHNAME)
 #
 # uncomment to enable threads-capabilities
 #
-#USE_THREADS	= define
+#USE_5005THREADS= define
 
 #
 # XXX WARNING! This option currently undergoing changes.  May be broken.
@@ -203,7 +203,7 @@ CRYPT_FLAG	= -DHAVE_DES_FCRYPT
 
 !IF "$(USE_OBJECT)" == "define"
 PERL_MALLOC	= undef
-USE_THREADS	= undef
+USE_5005THREADS	= undef
 USE_MULTI	= undef
 USE_IMP_SYS	= define
 !ENDIF
@@ -212,11 +212,11 @@ USE_IMP_SYS	= define
 PERL_MALLOC	= undef
 !ENDIF
 
-!IF "$(USE_THREADS)" == ""
-USE_THREADS	= undef
+!IF "$(USE_5005THREADS)" == ""
+USE_5005THREADS	= undef
 !ENDIF
 
-!IF "$(USE_THREADS)" == "define"
+!IF "$(USE_5005THREADS)" == "define"
 USE_ITHREADS	= undef
 !ENDIF
 
@@ -236,7 +236,7 @@ USE_ITHREADS	= undef
 USE_IMP_SYS	= undef
 !ENDIF
 
-!IF "$(USE_MULTI)$(USE_THREADS)$(USE_OBJECT)" != "undefundefundef"
+!IF "$(USE_MULTI)$(USE_5005THREADS)$(USE_OBJECT)" != "undefundefundef"
 BUILDOPT	= $(BUILDOPT) -DPERL_IMPLICIT_CONTEXT
 !ENDIF
 
@@ -255,7 +255,7 @@ PROCESSOR_ARCHITECTURE	= x86
 !IF "$(USE_OBJECT)" == "define"
 ARCHNAME	= MSWin32-$(PROCESSOR_ARCHITECTURE)-object
 !ELSE
-!IF "$(USE_THREADS)" == "define"
+!IF "$(USE_5005THREADS)" == "define"
 ARCHNAME	= MSWin32-$(PROCESSOR_ARCHITECTURE)-thread
 !ELSE
 !IF "$(USE_MULTI)" == "define"
@@ -266,6 +266,10 @@ ARCHNAME	= MSWin32-$(PROCESSOR_ARCHITECTURE)
 !ENDIF
 !ENDIF
 
+!IF "$(USE_ITHREADS)" == "define"
+ARCHNAME	= $(ARCHNAME)-thread
+!ENDIF
+
 # Visual Studio 98 specific
 !IF "$(CCTYPE)" == "MSVC60"
 
@@ -518,7 +522,7 @@ WIN32_SRC	=		\
 		.\win32.c	\
 		.\win32sck.c
 
-!IF "$(USE_THREADS)" == "define"
+!IF "$(USE_5005THREADS)" == "define"
 WIN32_SRC	= $(WIN32_SRC) .\win32thread.c 
 !ENDIF
 
@@ -715,7 +719,9 @@ CFG_VARS	=					\
 		"static_ext=$(STATIC_EXT)"		\
 		"dynamic_ext=$(DYNAMIC_EXT)"		\
 		"nonxs_ext=$(NONXS_EXT)"		\
-		"usethreads=$(USE_THREADS)"		\
+		"use5005threads=$(USE_5005THREADS)"	\
+		"useithreads=$(USE_ITHREADS)"		\
+		"usethreads=$(USE_5005THREADS)"		\
 		"usemultiplicity=$(USE_MULTI)"		\
 		"LINK_FLAGS=$(LINK_FLAGS:"=\")"		\
 		"optimize=$(OPTIMIZE:"=\")"
diff --git a/win32/config.bc b/win32/config.bc
index 81ec602bac..915c733c7f 100644
--- a/win32/config.bc
+++ b/win32/config.bc
@@ -685,8 +685,10 @@ uidtype='uid_t'
 uname='uname'
 uniq='uniq'
 uquadtype='unsigned __int64'
+use5005threads='undef'
 use64bits='undef'
 usedl='define'
+useithreads='undef'
 uselargefiles='undef'
 uselongdouble='undef'
 uselonglong='undef'
diff --git a/win32/config.gc b/win32/config.gc
index ff2da5726b..a5f8d4087c 100644
--- a/win32/config.gc
+++ b/win32/config.gc
@@ -685,8 +685,10 @@ uidtype='uid_t'
 uname='uname'
 uniq='uniq'
 uquadtype='unsigned long long'
+use5005threads='undef'
 use64bits='undef'
 usedl='define'
+useithreads='undef'
 uselargefiles='undef'
 uselongdouble='undef'
 uselonglong='undef'
diff --git a/win32/config.vc b/win32/config.vc
index a294dbcf43..4428c470fa 100644
--- a/win32/config.vc
+++ b/win32/config.vc
@@ -685,8 +685,10 @@ uidtype='uid_t'
 uname='uname'
 uniq='uniq'
 uquadtype='unsigned __int64'
+use5005threads='undef'
 use64bits='undef'
 usedl='define'
+useithreads='undef'
 uselargefiles='undef'
 uselongdouble='undef'
 uselonglong='undef'
diff --git a/win32/makefile.mk b/win32/makefile.mk
index 9bdcf3d796..b7bf93fcf2 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -33,7 +33,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.00563
+INST_VER	*= \5.00564
 
 #
 # Comment this out if you DON'T want your perl installation to have
@@ -51,7 +51,7 @@ INST_ARCH	*= \$(ARCHNAME)
 #
 # uncomment to enable threads-capabilities
 #
-#USE_THREADS	*= define
+#USE_5005THREADS	*= define
 
 #
 # XXX WARNING! This option currently undergoing changes.  May be broken.
@@ -228,16 +228,16 @@ CRYPT_FLAG	= -DHAVE_DES_FCRYPT
 
 .IF "$(USE_OBJECT)" == "define"
 PERL_MALLOC	!= undef
-USE_THREADS	!= undef
+USE_5005THREADS	!= undef
 USE_MULTI	!= undef
 USE_IMP_SYS	!= define
 .ENDIF
 
 PERL_MALLOC	*= undef
 
-USE_THREADS	*= undef
+USE_5005THREADS	*= undef
 
-.IF "$(USE_THREADS)" == "define"
+.IF "$(USE_5005THREADS)" == "define"
 USE_ITHREADS	!= undef
 .ENDIF
 
@@ -246,7 +246,7 @@ USE_OBJECT	*= undef
 USE_ITHREADS	*= undef
 USE_IMP_SYS	*= undef
 
-.IF "$(USE_MULTI)$(USE_THREADS)$(USE_OBJECT)" != "undefundefundef"
+.IF "$(USE_MULTI)$(USE_5005THREADS)$(USE_OBJECT)" != "undefundefundef"
 BUILDOPT	+= -DPERL_IMPLICIT_CONTEXT
 .ENDIF
 
@@ -264,7 +264,7 @@ PROCESSOR_ARCHITECTURE *= x86
 
 .IF "$(USE_OBJECT)" == "define"
 ARCHNAME	= MSWin32-$(PROCESSOR_ARCHITECTURE)-object
-.ELIF "$(USE_THREADS)" == "define"
+.ELIF "$(USE_5005THREADS)" == "define"
 ARCHNAME	= MSWin32-$(PROCESSOR_ARCHITECTURE)-thread
 .ELIF "$(USE_MULTI)" == "define"
 ARCHNAME	= MSWin32-$(PROCESSOR_ARCHITECTURE)-multi
@@ -272,6 +272,10 @@ ARCHNAME	= MSWin32-$(PROCESSOR_ARCHITECTURE)-multi
 ARCHNAME	= MSWin32-$(PROCESSOR_ARCHITECTURE)
 .ENDIF
 
+.IF "$(USE_OBJECT)" == "define"
+ARCHNAME	= $(ARCHNAME)-thread
+.ENDIF
+
 # Visual Studio 98 specific
 .IF "$(CCTYPE)" == "MSVC60"
 
@@ -644,7 +648,7 @@ WIN32_SRC	=		\
 		.\win32.c	\
 		.\win32sck.c
 
-.IF "$(USE_THREADS)" == "define"
+.IF "$(USE_5005THREADS)" == "define"
 WIN32_SRC	+= .\win32thread.c 
 .ENDIF
 
@@ -843,7 +847,9 @@ CFG_VARS	=					\
 		static_ext=$(STATIC_EXT)	~	\
 		dynamic_ext=$(DYNAMIC_EXT)	~	\
 		nonxs_ext=$(NONXS_EXT)		~	\
-		usethreads=$(USE_THREADS)	~	\
+		use5005threads=$(USE_5005THREADS)	~	\
+		useithreads=$(USE_ITHREADS)	~	\
+		usethreads=$(USE_5005THREADS)	~	\
 		usemultiplicity=$(USE_MULTI)	~	\
 		LINK_FLAGS=$(LINK_FLAGS:s/\/\\/)		~	\
 		optimize=$(OPTIMIZE)