integrate cfgperl changes into mainline, fix conflicts

p4raw-id: //depot/perl@2620

diff --cc ext/B/B.xs
Simple merge

diff --cc ext/B/B/C.pm
index b742bc4,fe47f0a..336784c
--- 1/ext/B/B/C.pm
--- 2/ext/B/B/C.pm
+++ b/ext/B/B/C.pm
@@@ -103,6 -103,9 +103,8 @@@ sub walk_and_save_optree 
  # to "know" that op_seq is a U16 and use 65535. Ugh.
  my $op_seq = 65535;
  
 -sub AVf_REAL () { 1 }
+ sub define HEf_SVKEY   () { -2 }
+ 
  # Look this up here so we can do just a number compare
  # rather than looking up the name of every BASEOP in B::OP
  my $OP_THREADSV = opnumber('threadsv');

diff --cc ext/B/B/CC.pm
Simple merge

diff --cc pod/perl5005delta.pod
index 205c6af,0539442..1c69bdd
--- 1/pod/perl5005delta.pod
--- 2/pod/perl5005delta.pod
+++ b/pod/perl5005delta.pod
@@@ -884,12 -913,14 +913,22 @@@ Removed because B<-e> doesn't use tempo
  (F) The create routine failed for some reason while trying to process
  a B<-e> switch.  Maybe your /tmp partition is full, or clobbered.
  
+ Removed because B<-e> doesn't use temporary files any more.
+ 
+ =item regexp too big
+ 
+ (F) The current implementation of regular expressions uses shorts as
+ address offsets within a string.  Unfortunately this means that if
+ the regular expression compiles to longer than 32767, it'll blow up.
+ Usually when you want a regular expression this big, there is a better
++way to do it with multiple statements.  See L<perlre>.
++
 +=item regexp too big
 +
 +(F) The current implementation of regular expressions uses shorts as
 +address offsets within a string.  Unfortunately this means that if
 +the regular expression compiles to longer than 32767, it'll blow up.
 +Usually when you want a regular expression this big, there is a better
  way to do it with multiple statements.  See L<perlre>.
  
  =back

diff --cc pod/perlfunc.pod
Simple merge