Integrate mainline.

p4raw-id: //depot/perlio@9411

diff --cc MANIFEST
Simple merge

diff --cc t/op/utf8decode.t
index 824805d,494aa8c..2893ffc
--- 1/t/op/utf8decode.t
--- 2/t/op/utf8decode.t
+++ b/t/op/utf8decode.t
@@@ -3,22 -3,23 +3,35 @@@
  BEGIN {
      chdir 't' if -d 't';
      @INC = '../lib';
- 
 +}
  
 +{
 +    my $wide = v256;
 +    use bytes;
 +    print STDERR ord($wide),"\n";
 +    if (ord($wide) == 140) {
 +      print "1..0 # Skip: UTF-EBCDIC (not UTF-8) used here\n";
 +      exit 0;
 +    }
 +    elsif (ord($wide) != 196) {
 +      warn sprintf("v256 starts with %02X\n",ord($wide));
 +    }
  }
  
+ {
+     my $wide = v256;
+     use bytes;
+     my $ordwide = ord($wide);
+     printf "# under use bytes ord(v256) = 0x%02x\n", $ordwide;
+     if ($ordwide == 140) {
+       print "1..0 # Skip: UTF-EBCDIC (not UTF-8) used here\n";
+       exit 0;
+     }
+     elsif ($ordwide != 196) {
+       printf "# v256 starts with 0x%02x\n", $ordwide;
+     }
+ }
+ 
  no utf8;
  
  print "1..78\n";