Integrate with Sarathy.

p4raw-id: //depot/cfgperl@5254

8 files changed, 58 insertions, 54 deletions

diff --git a/ext/B/B.xs b/ext/B/B.xs
index d0ee8e463a..9e2985582a 100644
--- a/ext/B/B.xs
+++ b/ext/B/B.xs
@@ -163,8 +163,11 @@ cc_opclass(pTHX_ OP *o)
 	 * an SVOP (and op_sv is the GV for the filehandle argument).
 	 */
 	return ((o->op_flags & OPf_KIDS) ? OPc_UNOP :
+#ifdef USE_ITHREADS
+		(o->op_flags & OPf_REF) ? OPc_PADOP : OPc_BASEOP);
+#else
 		(o->op_flags & OPf_REF) ? OPc_SVOP : OPc_BASEOP);
-
+#endif
     case OA_LOOPEXOP:
 	/*
 	 * next, last, redo, dump and goto use OPf_SPECIAL to indicate that a
diff --git a/ext/B/B/C.pm b/ext/B/B/C.pm
index c8fd96bb82..dafef33bb1 100644
--- a/ext/B/B/C.pm
+++ b/ext/B/B/C.pm
@@ -298,7 +298,7 @@ sub B::PADOP::save {
     my ($op, $level) = @_;
     my $sym = objsym($op);
     return $sym if defined $sym;
-    $padopsect->add(sprintf("s\\_%x, s\\_%x, NULL, %u, %u, %u, 0x%x, 0x%x, Nullgv",
+    $padopsect->add(sprintf("s\\_%x, s\\_%x, NULL, %u, %u, %u, 0x%x, 0x%x, 0",
 			   ${$op->next}, ${$op->sibling},
 			   $op->targ, $op->type, $op_seq, $op->flags,
 			   $op->private));
@@ -314,7 +314,7 @@ sub B::COP::save {
     return $sym if defined $sym;
     warn sprintf("COP: line %d file %s\n", $op->line, $op->file)
 	if $debug_cops;
-    $copsect->add(sprintf("s\\_%x, s\\_%x, NULL, %u, %u, %u, 0x%x, 0x%x, %s, Nullhv, Nullgv, %u, %d, %u",
+    $copsect->add(sprintf("s\\_%x, s\\_%x, NULL, %u, %u, %u, 0x%x, 0x%x, %s, NULL, NULL, %u, %d, %u",
 			  ${$op->next}, ${$op->sibling},
 			  $op->targ, $op->type, $op_seq, $op->flags,
 			  $op->private, cstring($op->label), $op->cop_seq,
@@ -1090,6 +1090,7 @@ sub output_boilerplate {
     print <<'EOT';
 #include "EXTERN.h"
 #include "perl.h"
+#include "XSUB.h"
 
 /* Workaround for mapstart: the only op which needs a different ppaddr */
 #undef Perl_pp_mapstart
diff --git a/lib/Pod/InputObjects.pm b/lib/Pod/InputObjects.pm
index 174759aa9c..7544fb76c5 100644
--- a/lib/Pod/InputObjects.pm
+++ b/lib/Pod/InputObjects.pm
@@ -11,7 +11,7 @@
 package Pod::InputObjects;
 
 use vars qw($VERSION);
-$VERSION = 1.093;  ## Current version of this package
+$VERSION = 1.10;  ## Current version of this package
 require  5.004;    ## requires this Perl version or later
 
 #############################################################################
diff --git a/lib/Pod/Parser.pm b/lib/Pod/Parser.pm
index bafabba093..22b3e49c61 100644
--- a/lib/Pod/Parser.pm
+++ b/lib/Pod/Parser.pm
@@ -10,7 +10,7 @@
 package Pod::Parser;
 
 use vars qw($VERSION);
-$VERSION = 1.093;  ## Current version of this package
+$VERSION = 1.10;  ## Current version of this package
 require  5.004;    ## requires this Perl version or later
 
 #############################################################################
@@ -764,13 +764,13 @@ sub parse_text {
     my @seq_stack = ($seq);
     my ($ldelim, $rdelim) = ('', '');
 
-    ## Iterate over all sequence starts/stops, newlines, & text
-    ## (NOTE: split with capturing parens keeps the delimiters)
+    ## Iterate over all sequence starts text (NOTE: split with
+    ## capturing parens keeps the delimiters)
     $_ = $text;
     my @tokens = split /([A-Z]<(?:<+\s+)?)/;
     while ( @tokens ) {
         $_ = shift @tokens;
-        ## Look for the beginning of a sequencd
+        ## Look for the beginning of a sequence
         if ( /^([A-Z])(<(?:<+\s+)?)$/ ) {
             ## Push a new sequence onto the stack of those "in-progress"
             ($cmd, $ldelim) = ($1, $2);
diff --git a/lib/Pod/Select.pm b/lib/Pod/Select.pm
index 150dfca1fe..230dc8f03b 100644
--- a/lib/Pod/Select.pm
+++ b/lib/Pod/Select.pm
@@ -10,7 +10,7 @@
 package Pod::Select;
 
 use vars qw($VERSION);
-$VERSION = 1.093;  ## Current version of this package
+$VERSION = 1.10;  ## Current version of this package
 require  5.004;    ## requires this Perl version or later
 
 #############################################################################
diff --git a/lib/Pod/Usage.pm b/lib/Pod/Usage.pm
index 9f01a52ebb..84a936e396 100644
--- a/lib/Pod/Usage.pm
+++ b/lib/Pod/Usage.pm
@@ -10,7 +10,7 @@
 package Pod::Usage;
 
 use vars qw($VERSION);
-$VERSION = 1.093;  ## Current version of this package
+$VERSION = 1.10;  ## Current version of this package
 require  5.004;    ## requires this Perl version or later
 
 =head1 NAME
diff --git a/t/lib/filefind.t b/t/lib/filefind.t
index f958b19cad..8e57aec673 100755
--- a/t/lib/filefind.t
+++ b/t/lib/filefind.t
@@ -21,14 +21,14 @@ finddepth(sub { print "ok 2\n" if $_ eq 'filefind.t'; }, ".");
 my $case = 2;
 
 END {
-    unlink 'FA/FA_ord','FA/FSL','FA/FAA/FAA_ord',
-	   'FA/FAB/FAB_ord','FA/FAB/FABA/FABA_ord','FB/FB_ord','FB/FBA/FBA_ord';
-    rmdir 'FA/FAA';
-    rmdir 'FA/FAB/FABA';
-    rmdir 'FA/FAB';
-    rmdir 'FA';
-    rmdir 'FB/FBA';
-    rmdir 'FB';
+    unlink 'fa/fa_ord','fa/fsl','fa/faa/faa_ord',
+	   'fa/fab/fab_ord','fa/fab/faba/faba_ord','fb/fb_ord','fb/fba/fba_ord';
+    rmdir 'fa/faa';
+    rmdir 'fa/fab/faba';
+    rmdir 'fa/fab';
+    rmdir 'fa';
+    rmdir 'fb/fba';
+    rmdir 'fb';
 }
 
 sub Check($) {
@@ -55,50 +55,50 @@ sub wanted {
   print "# '$_' => 1\n";
   Check( $Expect{$_} );
   delete $Expect{$_};
-  $File::Find::prune=1 if  $_ eq 'FABA';
+  $File::Find::prune=1 if  $_ eq 'faba';
 }
 
-MkDir( 'FA',0770 );
-MkDir( 'FB',0770  );
-touch('FB/FB_ord');
-MkDir( 'FB/FBA',0770  );
-touch('FB/FBA/FBA_ord');
-CheckDie( symlink('../FB','FA/FSL') ) if $symlink_exists;
-touch('FA/FA_ord');
-
-MkDir( 'FA/FAA',0770  );
-touch('FA/FAA/FAA_ord');
-MkDir( 'FA/FAB',0770  );
-touch('FA/FAB/FAB_ord');
-MkDir( 'FA/FAB/FABA',0770  );
-touch('FA/FAB/FABA/FABA_ord');
-
-%Expect = ('.' => 1, 'FSL' => 1, 'FA_ord' => 1, 'FAB' => 1, 'FAB_ord' => 1,
-	   'FABA' => 1, 'FAA' => 1, 'FAA_ord' => 1);
-delete $Expect{'FSL'} unless $symlink_exists;
-File::Find::find( {wanted => \&wanted, },'FA' );
+MkDir( 'fa',0770 );
+MkDir( 'fb',0770  );
+touch('fb/fb_ord');
+MkDir( 'fb/fba',0770  );
+touch('fb/fba/fba_ord');
+CheckDie( symlink('../fb','fa/fsl') ) if $symlink_exists;
+touch('fa/fa_ord');
+
+MkDir( 'fa/faa',0770  );
+touch('fa/faa/faa_ord');
+MkDir( 'fa/fab',0770  );
+touch('fa/fab/fab_ord');
+MkDir( 'fa/fab/faba',0770  );
+touch('fa/fab/faba/faba_ord');
+
+%Expect = ('.' => 1, 'fsl' => 1, 'fa_ord' => 1, 'fab' => 1, 'fab_ord' => 1,
+	   'faba' => 1, 'faa' => 1, 'faa_ord' => 1);
+delete $Expect{'fsl'} unless $symlink_exists;
+File::Find::find( {wanted => \&wanted, },'fa' );
 Check( scalar(keys %Expect) == 0 );
 
-%Expect=('FA' => 1, 'FA/FSL' => 1, 'FA/FA_ord' => 1, 'FA/FAB' => 1,
-	 'FA/FAB/FAB_ord' => 1, 'FA/FAB/FABA' => 1,
-	 'FA/FAB/FABA/FABA_ord' => 1, 'FA/FAA' => 1, 'FA/FAA/FAA_ord' => 1);
-delete $Expect{'FA/FSL'} unless $symlink_exists;
-File::Find::find( {wanted => \&wanted, no_chdir => 1},'FA' );
+%Expect=('fa' => 1, 'fa/fsl' => 1, 'fa/fa_ord' => 1, 'fa/fab' => 1,
+	 'fa/fab/fab_ord' => 1, 'fa/fab/faba' => 1,
+	 'fa/fab/faba/faba_ord' => 1, 'fa/faa' => 1, 'fa/faa/faa_ord' => 1);
+delete $Expect{'fa/fsl'} unless $symlink_exists;
+File::Find::find( {wanted => \&wanted, no_chdir => 1},'fa' );
 
 Check( scalar(keys %Expect) == 0 );
 
 if ( $symlink_exists ) {
-  %Expect=('.' => 1, 'FA_ord' => 1, 'FSL' => 1, 'FB_ord' => 1, 'FBA' => 1, 
-           'FBA_ord' => 1, 'FAB' => 1, 'FAB_ord' => 1, 'FABA' => 1, 'FAA' => 1,
-           'FAA_ord' => 1);
+  %Expect=('.' => 1, 'fa_ord' => 1, 'fsl' => 1, 'fb_ord' => 1, 'fba' => 1,
+           'fba_ord' => 1, 'fab' => 1, 'fab_ord' => 1, 'faba' => 1, 'faa' => 1,
+           'faa_ord' => 1);
 
-  File::Find::find( {wanted => \&wanted, follow_fast => 1},'FA' );
+  File::Find::find( {wanted => \&wanted, follow_fast => 1},'fa' );
   Check( scalar(keys %Expect) == 0 );
-  %Expect=('FA' => 1, 'FA/FA_ord' => 1, 'FA/FSL' => 1, 'FA/FSL/FB_ord' => 1,
-           'FA/FSL/FBA' => 1, 'FA/FSL/FBA/FBA_ord' => 1, 'FA/FAB' => 1,
-           'FA/FAB/FAB_ord' => 1, 'FA/FAB/FABA' => 1, 'FA/FAB/FABA/FABA_ord' => 1,
-           'FA/FAA' => 1, 'FA/FAA/FAA_ord' => 1);
-  File::Find::find( {wanted => \&wanted, follow_fast => 1, no_chdir => 1},'FA' );
+  %Expect=('fa' => 1, 'fa/fa_ord' => 1, 'fa/fsl' => 1, 'fa/fsl/fb_ord' => 1,
+           'fa/fsl/fba' => 1, 'fa/fsl/fba/fba_ord' => 1, 'fa/fab' => 1,
+           'fa/fab/fab_ord' => 1, 'fa/fab/faba' => 1, 'fa/fab/faba/faba_ord' => 1,
+           'fa/faa' => 1, 'fa/faa/faa_ord' => 1);
+  File::Find::find( {wanted => \&wanted, follow_fast => 1, no_chdir => 1},'fa' );
   Check( scalar(keys %Expect) == 0 );
 }
 
diff --git a/t/pod/poderrs.xr b/t/pod/poderrs.xr
index 038cf4fb4c..2848faa46a 100644
--- a/t/pod/poderrs.xr
+++ b/t/pod/poderrs.xr
@@ -19,7 +19,6 @@
 *** ERROR: garbled entity E<abcI<bla>> at line 82 in file pod/poderrs.t
 *** WARNING: collapsing newlines to blanks at line 92 in file pod/poderrs.t
 *** ERROR: malformed link L<> : empty link at line 94 in file pod/poderrs.t
-*** WARNING: section in 'passwd(5)' deprecated at line 99 in file pod/poderrs.t
 *** WARNING: ignoring leading whitespace in link at line 100 in file pod/poderrs.t
 *** WARNING: ignoring trailing whitespace in link at line 100 in file pod/poderrs.t
 *** ERROR: Spurious character(s) after =back at line 106 in file pod/poderrs.t
@@ -29,5 +28,6 @@
 *** ERROR: unresolved internal link 'end with begin' at line 87 in file pod/poderrs.t
 *** ERROR: unresolved internal link 'OoPs' at line 88 in file pod/poderrs.t
 *** ERROR: unresolved internal link 'abc def' at line 92 in file pod/poderrs.t
+*** ERROR: unresolved internal link 'passwd(5)' at line 99 in file pod/poderrs.t
 *** WARNING: multiple occurence of link target 'oops' at line - in file pod/poderrs.t
-pod/poderrs.t has 21 pod syntax errors.
+pod/poderrs.t has 22 pod syntax errors.