Integrate mainline some more

p4raw-id: //depot/perlio@13515
p4raw-integrated: from //depot/perl@13514 'copy in' hints/linux.sh
	(@13342..) README.hpux (@13348..)

diff --git a/README.hpux b/README.hpux
index 9a76607..f990964 100644 (file)
--- a/README.hpux
+++ b/README.hpux
@@ -84,12 +84,12 @@ The following systems contain with PA-RISC 1.1 chips:
     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, DXO, 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,
-    S744, S760, T500, T520
+    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, DXO, 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, S744, S760, T500, T520
 
 =head2 PA-RISC 2.0
 
@@ -105,8 +105,9 @@ contain PA-RISC 2.0 chips (this is very likely to be out of date):
     D280, D370, D380, D390, D650, J220, J2240, J280, J282, J400, J410,
     J5000, J5500XM, J5600, J7000, J7600, K250, K260, K260-EG, K270, K360,
     K370, K380, K450, K460, K460-EG, K460-XP, K470, K570, K580, L1000,
-    L2000, L3000, N4000, R380, R390, RP8400, SD16000, SD32000, SD64000,
-    T540, T600, V2000, V2200, V2250, V2500, V2600
+    L2000, L3000, N4000, R380, R390, RP5400, RP5430, RP5450, RP5470,
+    RP7400, RP8400, SD16000, SD32000, SD64000, T540, T600, V2000, V2200,
+    V2250, V2500, V2600
 
 =head2 Itanium
 

diff --git a/hints/linux.sh b/hints/linux.sh
index 9837ee8..fd38198 100644 (file)
--- a/hints/linux.sh
+++ b/hints/linux.sh
@@ -100,7 +100,7 @@ case "$optimize" in
 '') # If we have modern enough gcc and well-supported enough CPU,
     # crank up the optimization level.
     case "`${cc:-gcc} -v 2>&1`" in
-    *gcc-2.95*|*gcc-3.*)
+    *"gcc version 2.95"*|*"gcc version 3."*)
         case "`arch 2>&1`" in
         i?86|ppc) optimize='-O3' ;;
         esac

diff --git a/pod/perlfunc.pod b/pod/perlfunc.pod
index 2b20a4b..6d79b7a 100644 (file)
--- a/pod/perlfunc.pod
+++ b/pod/perlfunc.pod
@@ -6152,7 +6152,7 @@ The status is returned in C<$?>.  If you say
     #...
     do {
        $kid = waitpid(-1, WNOHANG);
-    } until $kid == -1;
+    } until $kid > 0;
 
 then you can do a non-blocking wait for all pending zombie processes.
 Non-blocking wait is available on machines supporting either the