integrate cfgperl changes#6224..6229 into mainline

p4raw-link: @6229 on //depot/cfgperl: 94f13a8fe911b4e5d658c1e8bb515599305c074c
p4raw-link: @6224 on //depot/cfgperl: 9e7db0fd3029ee5d3ce957e842a66c057eacd303

p4raw-id: //depot/perl@6352
p4raw-deleted: from //depot/cfgperl@6351 'delete in' lib/lib.pm
	(@5608..)
p4raw-integrated: from //depot/cfgperl@6351 'copy in' t/lib/english.t
	(@5586..) ext/Socket/Socket.pm (@5704..) README.hpux (@5972..)
	lib/English.pm (@6034..)
p4raw-integrated: from //depot/cfgperl@6228 'copy in' op.c (@6226..)
p4raw-branched: from //depot/cfgperl@6227 'branch in' lib/lib.pm.PL
p4raw-integrated: from //depot/cfgperl@6227 'copy in' Makefile.SH
	(@6182..) MANIFEST (@6192..)
p4raw-integrated: from //depot/cfgperl@6225 'merge in' embed.pl
	(@6221..)

9 files changed, 251 insertions, 265 deletions

diff --git a/MANIFEST b/MANIFEST
index be991fb146..2681a11657 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -720,7 +720,7 @@ lib/hostname.pl		Old hostname code
 lib/importenv.pl	Perl routine to get environment into variables
 lib/integer.pm		For "use integer"
 lib/less.pm		For "use less"
-lib/lib.pm		For "use lib"
+lib/lib.pm.PL		For "use lib"
 lib/locale.pm		For "use locale"
 lib/look.pl		A "look" equivalent
 lib/newgetopt.pl	A perl library supporting long option parsing
diff --git a/Makefile.SH b/Makefile.SH
index 84226d5cfd..52789b9241 100644
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -231,10 +231,10 @@ shextract = Makefile cflags config.h makeaperl makedepend \
 # available.  Dependencies handled manually below (for now).
 
 pl = pod/pod2html.PL pod/pod2latex.PL pod/pod2man.PL pod/pod2text.PL \
-	pod/pod2usage.PL pod/podchecker.PL pod/podselect.PL
+	pod/pod2usage.PL pod/podchecker.PL pod/podselect.PL lib/lib.pm.PL
 
 plextract = pod/pod2html pod/pod2latex pod/pod2man pod/pod2text \
-	pod/pod2usage pod/podchecker pod/podselect
+	pod/pod2usage pod/podchecker pod/podselect lib/lib.pm
 
 addedbyconf = UU $(shextract) $(plextract) pstruct
 
diff --git a/README.hpux b/README.hpux
index 06b39b99d1..5fbddf759e 100644
--- a/README.hpux
+++ b/README.hpux
@@ -1,6 +1,6 @@
-If you read this file _as_is_, just ignore the funny characters you
-see. It is written in the POD format (see pod/perlpod.pod) which is
-specially designed to be readable as is.
+If you read this file _as_is_, just ignore the funny characters you see.
+It is written in the POD format (see pod/perlpod.pod) which is specially
+designed to be readable as is.
 
 =head1 NAME
 
@@ -8,33 +8,35 @@ README.hpux - Perl version 5 on Hewlett-Packard Unix (HP-UX) systems
 
 =head1 DESCRIPTION
 
-This document describes various features of HP's Unix operating system (HP-UX)
-that will affect how Perl version 5 (hereafter just Perl) is compiled and/or
-runs.
+This document describes various features of HP's Unix operating system
+(HP-UX) that will affect how Perl version 5 (hereafter just Perl) is
+compiled and/or runs.
 
 =head2 Compiling Perl 5 on HP-UX
 
-An ANSI C compiler is required to build Perl.  The C compiler that ships
-with all HP-UX systems is a K&R compiler that can only be used to build
-new kernels.
+When compiling Perl, you must use an ANSI C compiler.  The C compiler
+that ships with all HP-UX systems is a K&R compiler that should only be
+used to build new kernels.
 
 Perl can be compiled with either HP's ANSI C compiler or with gcc.  The
-former is recommended, as not only can it compile Perl with no difficulty,
-but also can take advantage of features listed later that require the use
-of HP compiler-specific command-line flags.
+former is recommended, as not only can it compile Perl with no
+difficulty, but also can take advantage of features listed later that
+require the use of HP compiler-specific command-line flags.
 
-If you decide to use gcc, make sure your installation is recent and complete,
-and be sure to read the Perl README file for more gcc-specific details.
+If you decide to use gcc, make sure your installation is recent and
+complete, and be sure to read the Perl README file for more gcc-specific
+details.
 
 =head2 PA-RISC
 
-HP's current Unix systems run on its own Precision Architecture (PA-RISC) chip.
-HP-UX used to run on the Motorola MC68000 family of chips, but any machine with
-this chip in it is quite obsolete and this document will not attempt to address
-issues for compiling Perl on the Motorola chipset.
+HP's current Unix systems run on its own Precision Architecture
+(PA-RISC) chip.  HP-UX used to run on the Motorola MC68000 family of
+chips, but any machine with this chip in it is quite obsolete and this
+document will not attempt to address issues for compiling Perl on the
+Motorola chipset.
 
-The most recent version of PA-RISC at the time of this document's last update
-is 2.0.
+The most recent version of PA-RISC at the time of this document's last
+update is 2.0.
 
 =head2 PA-RISC 1.0
 
@@ -42,8 +44,8 @@ The original version of PA-RISC, HP no longer sells any system with this chip.
 
 The following systems contain PA-RISC 1.0 chips:
 
-    600, 635, 645, 800, 808, 815, 822, 825, 832, 834, 835, 840,
-    842, 845, 850, 852, 855, 860, 865, 870, 890
+    600, 635, 645, 808, 815, 822, 825, 832, 834, 835, 840, 842, 845, 850, 852,
+    855, 860, 865, 870, 890
 
 =head2 PA-RISC 1.1
 
@@ -52,52 +54,58 @@ system.
 
 The following systems contain with PA-RISC 1.1 chips:
 
-    705, 710, 712, 715, 720, 722, 725, 728, 730, 735, 743, 745, 747, 750,
-    755, 770, 807S, 817S, 827S, 837S, 847S, 857S, 867S, 877S, 887S, 897S,
-    D200, D210, D220, D230, D250, D260, D310, D320, D330, D350, D360, D400,
-    E25, E35, E45, E55, F10, F20, F30, G30, G40, G50, G60, G70, H30, H40,
-    H50, H60, H70, I30, I40, I50, I60, I70, K100, K200, K210, K220, K400,
-    K410, K420, T500, T520
-
+    705, 710, 712, 715, 720, 722, 725, 728, 730, 735, 742, 743, 745, 747, 750,
+    755, 770, 777, 778, 779, 800, 801, 803, 806, 807, 809, 811, 813, 816, 817,
+    819, 821, 826, 827, 829, 831, 837, 839, 841, 847, 849, 851, 856, 857, 859,
+    867, 869, 877, 887, 891, 892, 897, A180, A180C, B115, B120, B132L, B132L+,
+    B160L, B180L, C100, C110, C115, C120, C160L, D200, D210, D220, D230, D250,
+    D260, D310, D320, D330, D350, D360, D410, DX0, DX5, DZO, E25, E35, E45,
+    E55, F10, F20, F30, G30, G40, G50, G60, G70, H20, H30, H40, H50, H60, H70,
+    I30, I40, I50, I60, I70, J200, J210, J210XC, K100, K200, K210, K220, K230,
+    K400, K410, K420, S700i, S715, S724, S760, T500, T520
 
 =head2 PA-RISC 2.0
 
-The most recent upgrade to the PA-RISC design, it added support for 64-bit
-integer data.
+The most recent upgrade to the PA-RISC design, it added support for
+64-bit integer data.
 
-The following systems contain PA-RISC 2.0 chips (this is very likely to be
-out of date):
+As of the date of this document's last update, the following systems
+contain PA-RISC 2.0 chips (this is very likely to be out of date):
 
-    D270, D280, D370, D380, K250, K260, K370, K380, K450, K460, K570, K580,
-    T600, V2200, N-class
+    700, 780, 781, 782, 783, 785, 802, 804, 810, 820, 861, 871, 879, 889, 893,
+    895, 896, 898, 899, B1000, C130, C140, C160, C180, C180+, C180-XP, C200+,
+    C400+, C3000, C360, CB260, D270, D280, D370, D380, D390, D650, J220, J2240,
+    J280, J282, J400, J410, J5000, J7000, K250, K260, K260-EG, K270, K360,
+    K370, K380, K450, K460, K460-EG, K460-XP, K470, K570, K580, L1000, L2000,
+    N4000, R380, R390, T540, T600, V2000, V2200, V2250, V2500
 
 A complete list of models at the time the OS was built is in the file
-/opt/langtools/lib/sched.models.
-The first column corresponds to the output of the "uname -m" command
-(without the leading "9000/").
-The second column is the PA-RISC version
-and the third column is the exact chip type used.
+/opt/langtools/lib/sched.models.  The first column corresponds to the
+output of the "uname -m" command (without the leading "9000/").  The
+second column is the PA-RISC version and the third column is the exact
+chip type used.
 
 =head2 Portability Between PA-RISC Versions
 
 An executable compiled on a PA-RISC 2.0 platform will not execute on a
-PA-RISC 1.1 platform, even if they are running the same version of HP-UX.
-If you are building Perl on a PA-RISC 2.0 platform and want that Perl to
-to also run on a PA-RISC 1.1, the compiler flags +DAportable and +DS32
-should be used.
+PA-RISC 1.1 platform, even if they are running the same version of
+HP-UX.  If you are building Perl on a PA-RISC 2.0 platform and want that
+Perl to to also run on a PA-RISC 1.1, the compiler flags +DAportable and
++DS32 should be used.
 
-It is no longer possible to compile PA-RISC 1.0 executables on either the
-PA-RISC 1.1 or 2.0 platforms.
+It is no longer possible to compile PA-RISC 1.0 executables on either
+the PA-RISC 1.1 or 2.0 platforms.
 
 =head2 Building Dynamic Extensions on HP-UX
 
 HP-UX supports dynamically loadable libraries (shared libraries).
 Shared libraries end with the suffix .sl.
 
-Shared libraries created on a platform using a particular PA-RISC version
-are not usable on platforms using an earlier PA-RISC version by default.
-However, this backwards compatibility may be enabled using the same
-+DAportable compiler flag (with the same PA-RISC 1.0 caveat mentioned above).
+Shared libraries created on a platform using a particular PA-RISC
+version are not usable on platforms using an earlier PA-RISC version by
+default.  However, this backwards compatibility may be enabled using the
+same +DAportable compiler flag (with the same PA-RISC 1.0 caveat
+mentioned above).
 
 To create a shared library, the following steps must be performed:
 
@@ -116,49 +124,46 @@ If these dependent libraries are not listed at shared library creation
 time, you will get fatal "Unresolved symbol" errors at run time when the
 library is loaded.
 
-You may create a shared library that refers to another library, which
-may be either an archive library or a shared library.  If it is a
-shared library, this is called a "dependent library".
-The dependent library's name is recorded in the main shared library,
-but it is not linked into the shared library.
-Instead, it is loaded when the main shared library is loaded.
+You may create a shared library that referers to another library, which
+may be either an archive library or a shared library.  If this second
+library is a shared library, this is called a "dependent library".  The
+dependent library's name is recorded in the main shared library, but it
+is not linked into the shared library.  Instead, it is loaded when the
+main shared library is loaded.  This can cause problems if you build an
+extension on one system and move it to another system where the
+libraries may not be located in the same place as on the first system.
 
 If the referred library is an archive library, then it is treated as a
 simple collection of .o modules (all of which must contain PIC).  These
 modules are then linked into the shared library.
 
-Note that it is okay to create a library which contains a dependent library
-that is already linked into perl.
+Note that it is okay to create a library which contains a dependent
+library that is already linked into perl.
 
 It is no longer possible to link PA-RISC 1.0 shared libraries.
 
 =head2 The HP ANSI C Compiler
 
-When using this compiler to build Perl, you should make sure that
-the flag -Aa is added to the cpprun and cppstdin variables in the
-config.sh file.
+When using this compiler to build Perl, you should make sure that the
+flag -Aa is added to the cpprun and cppstdin variables in the config.sh
+file (though see the section on 64-bit perl below).
 
 =head2 Using Large Files with Perl
 
-Beginning with HP-UX version 10.20, files larger than 2GB (2^31) may be
-created and manipulated.
-Three separate methods of doing this are available.
-Of these methods,
-the best method for Perl is to compile using the -Duselargefiles
-flag to Configure.
-This will cause the -D_FILE_OFFSET_BITS=64 compiler flag to be used
-when building Perl.
-This causes Perl to be compiled using structures and functions in which
-these are 64 bits wide, rather than 32 bits wide.
-(Note that this will only work with HP's ANSI C compiler.
-If you want to compile Perl using gcc, you will have to get a version
-of the compiler that support 64-bit operations.)
-
-The one drawback to this approach is that
-any extension which calls any file-manipulating C function
-will need to be recompiled
+Beginning with HP-UX version 10.20, files larger than 2GB (2^31 bytes)
+may be created and manipulated.  Three separate methods of doing this
+are available.  Of these methods, the best method for Perl is to compile
+using the -Duselargefiles flag to Configure.  This causes Perl to be
+compiled using structures and functions in which these are 64 bits wide,
+rather than 32 bits wide.  (Note that this will only work with HP's ANSI
+C compiler.  If you want to compile Perl using gcc, you will have to get
+a version of the compiler that support 64-bit operations.)
+
+There are some drawbacks to this approach.  One is that any extension
+which calls any file-manipulating C function will need to be recompiled
 (just follow the usual "perl Makefile.PL; make; make test; make install"
 procedure).
+
 The list of functions that will need to recompiled is:
 creat,		fgetpos,	fopen,
 freopen,	fsetpos,	fstat,
@@ -169,65 +174,72 @@ open,		prealloc,	stat,
 statvfs,	statvfsdev,	tmpfile,
 truncate,	getrlimit,	setrlimit
 
+Another drawback is only valid for Perl versions before 5.6.0.  This
+drawback is that the seek and tell functions (both the builtin version
+and POSIX module version) will not perform correctly.
+
+It is strongly recommended that you use this flag when you run
+Configure.  If you do not do this, but later answer the question about
+large files when Configure asks you, you may get a configuration that
+cannot be compiled, or that does not function as expected.
+
 =head2 Threaded Perl
 
 It is impossible to compile a version of threaded Perl on any version of
 HP-UX before 10.30, and it is strongly suggested that you be running on
 HP-UX 11.00 at least.
 
-To compile Perl with thread, add -Dusethreads to the arguments of Configure.
-Ensure that the -D_POSIX_C_SOURCE=199506L compiler flag is automatically
-added to the list of flags.  Also make sure that -lpthread is listed before
--lc in the list of libraries to link Perl with.
+To compile Perl with threads, add -Dusethreads to the arguments of
+Configure.  Verify that the -D_POSIX_C_SOURCE=199506L compiler flag is
+automatically added to the list of flags.  Also make sure that -lpthread
+is listed before -lc in the list of libraries to link Perl with.
 
-As of the date of this document,
-Perl threads are not fully supported on HP-UX.
+As of the date of this document, Perl threads are not fully supported on
+HP-UX.
 
 =head2 64-bit Perl
 
-Beginning with HP-UX 11.00, programs compiled under HP-UX can take advantage
-of the LP64 programming environment (LP64 means Longs and Pointers are 64 bits
-wide).
+Beginning with HP-UX 11.00, programs compiled under HP-UX can take
+advantage of the LP64 programming environment (LP64 means Longs and
+Pointers are 64 bits wide).
 
-Work is being performed on Perl to make it 64-bit compliant on all versions
-of Unix.  Once this is complete, scalar variables will be able to hold
-numbers larger than 2^32 with complete precision.
+Work is being performed on Perl to make it 64-bit compliant on all
+versions of Unix.  Once this is complete, scalar variables will be able
+to hold numbers larger than 2^32 with complete precision.
 
 As of the date of this document, Perl is not 64-bit compliant on HP-UX.
 
-Should a user wish to experiment with compiling Perl in the LP64 environment,
-use the -Duse64bitall flag to Configure.
-This will force Perl to be compiled in a pure LP64 environment (via the
-+DD64 flag).
+Should a user wish to experiment with compiling Perl in the LP64
+environment, use the -Duse64bitall flag to Configure.  This will force
+Perl to be compiled in a pure LP64 environment (via the +DD64 flag).
 
-You can also use the -Duse64bitint flag to Configure.
-Although there are some minor differences between compiling Perl with
-this flag versus the -Duse64bitall flag,
-they should not be noticeable from a Perl user's perspective.
+You can also use the -Duse64bitint flag to Configure.  Although there
+are some minor differences between compiling Perl with this flag versus
+the -Duse64bitall flag, they should not be noticeable from a Perl user's
+perspective.
 
-In both cases, it is strongly recommended that you use these flags
-when you run Configure.
-If you do not use them, but answer the questions about 64-bit numbers
-when Configure asks you,
-you may get a configuration that cannot be compiled, or that does
-not function as expected.
+In both cases, it is strongly recommended that you use these flags when
+you run Configure.  If you do not use do this, but later answer the
+questions about 64-bit numbers when Configure asks you, you may get a
+configuration that cannot be compiled, or that does not function as
+expected.
 
-(Note that these Configure flags will only work with HP's ANSI C compiler.
-If you want to compile Perl using gcc, you will have to get a version
-of the compiler that support 64-bit operations.)
+(Note that these Configure flags will only work with HP's ANSI C
+compiler.  If you want to compile Perl using gcc, you will have to get a
+version of the compiler that support 64-bit operations.)
 
 =head2 GDBM and Threads
 
-If you attempt to compile Perl with threads on an 11.X system and also link
-in the GDBM library, then Perl will immediately core dump when it starts up.
-The only workaround at this point is to relink the GDBM library under 11.X,
-then relink it into Perl.
+If you attempt to compile Perl with threads on an 11.X system and also
+link in the GDBM library, then Perl will immediately core dump when it
+starts up.  The only workaround at this point is to relink the GDBM
+library under 11.X, then relink it into Perl.
 
 =head2 NFS filesystems and utime(2)
 
 If you are compiling Perl on a remotely-mounted NFS filesystem, the test
-io/fs.t may fail on test #18.
-This appears to be a bug in HP-UX and no fix is currently available.
+io/fs.t may fail on test #18.  This appears to be a bug in HP-UX and no
+fix is currently available.
 
 =head1 AUTHOR
 
@@ -237,6 +249,6 @@ With much assistance regarding shared libraries from Marc Sabatella.
 
 =head1 DATE
 
-Version 0.3: 2000/03/31
+Version 0.6.1: 2000/06/20
 
 =cut
diff --git a/embed.pl b/embed.pl
index 7d159166f5..33ed679640 100755
--- a/embed.pl
+++ b/embed.pl
@@ -1081,8 +1081,8 @@ my %apidocs;
 my %gutsdocs;
 my %docfuncs;
 
-sub autodoc ($) { # parse a file and extract documentation info
-    my($fh) = @_;
+sub autodoc ($$) { # parse a file and extract documentation info
+    my($fh,$file) = @_;
     my($in, $doc);
 
 FUNC:
@@ -1100,14 +1100,14 @@ DOC:
 	    $docs = "\n$docs" if $docs and $docs !~ /^\n/;
 	    if ($flags =~ /m/) {
 		if ($flags =~ /A/) {
-		    $apidocs{$name} = [$flags, $docs, $ret, @args];
+		    $apidocs{$name} = [$flags, $docs, $ret, $file, @args];
 		}
 		else {
-		    $gutsdocs{$name} = [$flags, $docs, $ret, @args];
+		    $gutsdocs{$name} = [$flags, $docs, $ret, $file, @args];
 		}
 	    }
 	    else {
-		$docfuncs{$name} = [$flags, $docs, $ret, @args];
+		$docfuncs{$name} = [$flags, $docs, $ret, $file, @args];
 	    }
 	    if ($doc =~ /^=for/) {
 		$in = $doc;
@@ -1119,7 +1119,7 @@ DOC:
 
 sub docout ($$$) { # output the docs for one function
     my($fh, $name, $docref) = @_;
-    my($flags, $docs, $ret, @args) = @$docref;
+    my($flags, $docs, $ret, $file, @args) = @$docref;
 
     $docs .= "NOTE: the perl_ form of this function is deprecated.\n\n" 
 	if $flags =~ /p/;
@@ -1137,12 +1137,13 @@ sub docout ($$$) { # output the docs for one function
 	print $fh "(" . join(", ", @args) . ")";
 	print $fh "\n\n";
     }
+    print $fh "=for hackers\nFound in file $file\n\n";
 }
 
 my $file;
 for $file (glob('*.c'), glob('*.h')) {
     open F, "< $file" or die "Cannot open $file for docs: $!\n";
-    autodoc(\*F);
+    autodoc(\*F,$file);
     close F or die "Error closing $file: $!\n";
 }
 
@@ -1159,10 +1160,12 @@ walk_table {	# load documented functions into approriate hash
 	if ($flags =~ /A/) {
 	    my $docref = delete $docfuncs{$func};
 	    warn "no docs for $func\n" unless $docref and @$docref;
-	    $apidocs{$func} = [$docref->[0] . 'A', $docref->[1], $retval, @args];
+	    $apidocs{$func} = [$docref->[0] . 'A', $docref->[1], $retval,
+			       $docref->[3], @args];
 	} else {
 	    my $docref = delete $docfuncs{$func};
-	    $gutsdocs{$func} = [$docref->[0], $docref->[1], $retval, @args];
+	    $gutsdocs{$func} = [$docref->[0], $docref->[1], $retval,
+				$docref->[3], @args];
 	}
     }
     return "";
diff --git a/ext/Socket/Socket.pm b/ext/Socket/Socket.pm
index 02f098df77..025888d8ab 100644
--- a/ext/Socket/Socket.pm
+++ b/ext/Socket/Socket.pm
@@ -325,116 +325,6 @@ sub sockaddr_un {
     }
 }
 
-sub INADDR_ANY 		();
-sub INADDR_BROADCAST	();
-sub INADDR_LOOPBACK	();
-sub INADDR_LOOPBACK	();
-
-sub AF_802		();
-sub AF_APPLETALK	();
-sub AF_CCITT		();
-sub AF_CHAOS		();
-sub AF_DATAKIT		();
-sub AF_DECnet		();
-sub AF_DLI		();
-sub AF_ECMA		();
-sub AF_GOSIP		();
-sub AF_HYLINK		();
-sub AF_IMPLINK		();
-sub AF_INET		();
-sub AF_LAT		();
-sub AF_MAX		();
-sub AF_NBS		();
-sub AF_NIT		();
-sub AF_NS		();
-sub AF_OSI		();
-sub AF_OSINET		();
-sub AF_PUP		();
-sub AF_SNA		();
-sub AF_UNIX		();
-sub AF_UNSPEC		();
-sub AF_X25		();
-sub IOV_MAX		();
-sub MSG_BCAST		();
-sub MSG_CTLFLAGS	();
-sub MSG_CTLIGNORE	();
-sub MSG_CTRUNC		();
-sub MSG_DONTROUTE	();
-sub MSG_DONTWAIT	();
-sub MSG_EOF		();
-sub MSG_EOR		();
-sub MSG_ERRQUEUE	();
-sub MSG_FIN		();
-sub MSG_MAXIOVLEN	();
-sub MSG_MCAST		();
-sub MSG_NOSIGNAL	();
-sub MSG_OOB		();
-sub MSG_PEEK		();
-sub MSG_PROXY		();
-sub MSG_RST		();
-sub MSG_SYN		();
-sub MSG_TRUNC		();
-sub MSG_URG		();
-sub MSG_WAITALL		();
-sub PF_802		();
-sub PF_APPLETALK	();
-sub PF_CCITT		();
-sub PF_CHAOS		();
-sub PF_DATAKIT		();
-sub PF_DECnet		();
-sub PF_DLI		();
-sub PF_ECMA		();
-sub PF_GOSIP		();
-sub PF_HYLINK		();
-sub PF_IMPLINK		();
-sub PF_INET		();
-sub PF_LAT		();
-sub PF_MAX		();
-sub PF_NBS		();
-sub PF_NIT		();
-sub PF_NS		();
-sub PF_OSI		();
-sub PF_OSINET		();
-sub PF_PUP		();
-sub PF_SNA		();
-sub PF_UNIX		();
-sub PF_UNSPEC		();
-sub PF_X25		();
-sub SCM_CONNECT		();
-sub SCM_CREDENTIALS	();
-sub SCM_CREDS		();
-sub SCM_RIGHTS		();
-sub SCM_TIMESTAMP	();
-sub SHUT_RD		();
-sub SHUT_RDWR		();
-sub SHUT_WR		();
-sub SOCK_DGRAM		();
-sub SOCK_RAW		();
-sub SOCK_RDM		();
-sub SOCK_SEQPACKET	();
-sub SOCK_STREAM		();
-sub SOL_SOCKET		();
-sub SOMAXCONN		();
-sub SO_ACCEPTCONN	();
-sub SO_BROADCAST	();
-sub SO_DEBUG		();
-sub SO_DONTLINGER	();
-sub SO_DONTROUTE	();
-sub SO_ERROR		();
-sub SO_KEEPALIVE	();
-sub SO_LINGER		();
-sub SO_OOBINLINE	();
-sub SO_RCVBUF		();
-sub SO_RCVLOWAT		();
-sub SO_RCVTIMEO		();
-sub SO_REUSEADDR	();
-sub SO_SNDBUF		();
-sub SO_SNDLOWAT		();
-sub SO_SNDTIMEO		();
-sub SO_TYPE		();
-sub SO_USELOOPBACK	();
-sub UIO_MAXIOV		();
-
 sub AUTOLOAD {
     my($constname);
     ($constname = $AUTOLOAD) =~ s/.*:://;
diff --git a/lib/English.pm b/lib/English.pm
index f38c313beb..1ebc3de11d 100644
--- a/lib/English.pm
+++ b/lib/English.pm
@@ -9,6 +9,7 @@ English - use nice English (or awk) names for ugly punctuation variables
 
 =head1 SYNOPSIS
 
+    use English qw( -no_match_vars ) ;  # Avoids regex performance penalty
     use English;
     ...
     if ($ERRNO =~ /denied/) { ... }
@@ -27,29 +28,52 @@ $INPUT_RECORD_SEPARATOR if you are using the English module.
 
 See L<perlvar> for a complete list of these.
 
-=head1 BUGS
+=head1 PERFORMANCE
 
-This module provokes sizeable inefficiencies for regular expressions,
-due to unfortunate implementation details.  If performance matters,
-consider avoiding English.
+This module can provoke sizeable inefficiencies for regular expressions,
+due to unfortunate implementation details.  If performance matters in
+your application and you don't need $PREMATCH, $MATCH, or $POSTMATCH,
+try doing
+
+   use English qw( -no_match_vars ) ;
+
+.  B<It is especially important to do this in modules to avoid penalizing
+all applications which use them.>
 
 =cut
 
 no warnings;
 
+my $globbed_match ;
+
 # Grandfather $NAME import
 sub import {
     my $this = shift;
-    my @list = @_;
+    my @list = grep { ! /^-no_match_vars$/ } @_ ;
     local $Exporter::ExportLevel = 1;
+    if ( @_ == @list ) {
+        *EXPORT = \@COMPLETE_EXPORT ;
+        $globbed_match ||= (
+	    eval q{
+		*MATCH				= *&	;
+		*PREMATCH				= *`	;
+		*POSTMATCH				= *'	;
+		1 ;
+	       }
+	    || do {
+		require Carp ;
+		Carp::croak "Can't create English for match leftovers: $@" ;
+	    }
+	) ;
+    }
+    else {
+        *EXPORT = \@MINIMAL_EXPORT ;
+    }
     Exporter::import($this,grep {s/^\$/*/} @list);
 }
 
-@EXPORT = qw(
+@MINIMAL_EXPORT = qw(
 	*ARG
-	*MATCH
-	*PREMATCH
-	*POSTMATCH
 	*LAST_PAREN_MATCH
 	*INPUT_LINE_NUMBER
 	*NR
@@ -102,15 +126,21 @@ sub import {
 	@LAST_MATCH_END
 );
 
+
+@MATCH_EXPORT = qw(
+	*MATCH
+	*PREMATCH
+	*POSTMATCH
+);
+
+@COMPLETE_EXPORT = ( @MINIMAL_EXPORT, @MATCH_EXPORT ) ;
+
 # The ground of all being. @ARG is deprecated (5.005 makes @_ lexical)
 
 	*ARG					= *_	;
 
 # Matching.
 
-	*MATCH					= *&	;
-	*PREMATCH				= *`	;
-	*POSTMATCH				= *'	;
 	*LAST_PAREN_MATCH			= *+	;
 	*LAST_MATCH_START			= *-{ARRAY} ;
 	*LAST_MATCH_END				= *+{ARRAY} ;
diff --git a/lib/lib.pm b/lib/lib.pm.PL
index 98e2f733cb..1b5efa08ad 100644
--- a/lib/lib.pm
+++ b/lib/lib.pm.PL
@@ -1,12 +1,35 @@
+use Config;
+use File::Basename qw(&basename &dirname);
+use File::Spec;
+use Cwd;
+
+my $origdir = cwd;
+chdir dirname($0);
+my $file = basename($0, '.PL');
+
+my $Config_archname = defined($Config{'archname'}) ? $Config{'archname'} : '';
+my $Config_ver = defined($Config{'version'}) ? $Config{'version'} : '';
+my @Config_inc_version_list = defined($Config{'inc_version_list'}) ?
+  reverse split / /, $Config{'inc_version_list'} : ();
+ 
+open OUT,">$file" or die "Can't create $file: $!";
+ 
+print "Extracting $file (with variable substitutions)\n";
+ 
+# In this section, perl variables will be expanded during extraction.
+# You can use $Config{...} to use Configure variables.
+ 
+print OUT <<"!GROK!THIS!";
 package lib;
 
 use 5.005_64;
-use Config;
 
-my $archname = defined($Config{'archname'}) ? $Config{'archname'} : '';
-my $ver = defined($Config{'version'}) ? $Config{'version'} : '';
-my @inc_version_list = defined($Config{'inc_version_list'}) ?
-   reverse split / /, $Config{'inc_version_list'} : ();
+my \$archname = "$Config_archname";
+my \$ver = "$Config_ver";
+my \@inc_version_list = qw(@Config_inc_version_list);
+
+!GROK!THIS!
+print OUT <<'!NO!SUBS!';
 
 our @ORIG_INC = @INC;	# take a handy copy of 'original' value
 our $VERSION = '0.5564';
@@ -131,3 +154,7 @@ FindBin - optional module which deals with paths relative to the source file.
 Tim Bunce, 2nd June 1995.
 
 =cut
+!NO!SUBS!
+
+close OUT or die "Can't close $file: $!";
+chdir $origdir;
diff --git a/op.c b/op.c
index d70f0d51f8..fb060d3052 100644
--- a/op.c
+++ b/op.c
@@ -4431,9 +4431,15 @@ Perl_newATTRSUB(pTHX_ I32 floor, OP *o, OP *proto, OP *attrs, OP *block)
     if (!name || GvCVGEN(gv))
 	cv = Nullcv;
     else if ((cv = GvCV(gv))) {
-	cv_ckproto(cv, gv, ps);
+        bool exists = CvROOT(cv) || CvXSUB(cv);
+        /* if the subroutine doesn't exist and wasn't pre-declared
+         * with a prototype, assume it will be AUTOLOADed,
+         * skipping the prototype check
+         */
+        if (exists || SvPOK(cv))
+            cv_ckproto(cv, gv, ps);
 	/* already defined (or promised)? */
-	if (CvROOT(cv) || CvXSUB(cv) || GvASSUMECV(gv)) {
+	if (exists || GvASSUMECV(gv)) {
 	    SV* const_sv;
 	    bool const_changed = TRUE;
 	    if (!block && !attrs) {
@@ -4448,7 +4454,7 @@ Perl_newATTRSUB(pTHX_ I32 floor, OP *o, OP *proto, OP *attrs, OP *block)
 		goto withattrs;
 	    if ((const_sv = cv_const_sv(cv)))
 		const_changed = sv_cmp(const_sv, op_const_sv(block, Nullcv));
-	    if ((const_sv || const_changed) && ckWARN(WARN_REDEFINE))
+            if ((const_sv && const_changed) || ckWARN(WARN_REDEFINE))
 	    {
 		line_t oldline = CopLINE(PL_curcop);
 		CopLINE_set(PL_curcop, PL_copline);
diff --git a/t/lib/english.t b/t/lib/english.t
index dba68dbf94..bcc41e1135 100755
--- a/t/lib/english.t
+++ b/t/lib/english.t
@@ -1,9 +1,9 @@
 #!./perl
 
-print "1..16\n";
+print "1..22\n";
 
 BEGIN { unshift @INC, '../lib' }
-use English;
+use English qw( -no_match_vars ) ;
 use Config;
 my $threads = $Config{'use5005threads'} || 0;
 
@@ -17,13 +17,11 @@ sub foo {
 }
 &foo(1);
 
-if ($threads) {
-    $_ = "ok 4\nok 5\nok 6\n";
-} else {
-    $ARG = "ok 4\nok 5\nok 6\n";
-}
-/ok 5\n/;
-print $PREMATCH, $MATCH, $POSTMATCH;
+"abc" =~ /b/;
+
+print ! $PREMATCH  ? "" : "not ", "ok 4\n" ;
+print ! $MATCH     ? "" : "not ", "ok 5\n" ;
+print ! $POSTMATCH ? "" : "not ", "ok 6\n" ;
 
 $OFS = " ";
 $ORS = "\n";
@@ -45,3 +43,23 @@ print $EGID == $) ? "ok 14\n" : "not ok 14\n";
 
 print $PROGRAM_NAME == $0 ? "ok 15\n" : "not ok 15\n";
 print $BASETIME == $^T ? "ok 16\n" : "not ok 16\n";
+
+package B ;
+
+use English ;
+
+"abc" =~ /b/;
+
+print $PREMATCH  ? "" : "not ", "ok 17\n" ;
+print $MATCH     ? "" : "not ", "ok 18\n" ;
+print $POSTMATCH ? "" : "not ", "ok 19\n" ;
+
+package C ;
+
+use English qw( -no_match_vars ) ;
+
+"abc" =~ /b/;
+
+print ! $PREMATCH  ? "" : "not ", "ok 20\n" ;
+print ! $MATCH     ? "" : "not ", "ok 21\n" ;
+print ! $POSTMATCH ? "" : "not ", "ok 22\n" ;