integrate cfgperl changes into mainline

p4raw-id: //depot/perl@5396

4 files changed, 18 insertions, 16 deletions

diff --git a/ext/Fcntl/Fcntl.pm b/ext/Fcntl/Fcntl.pm
index 8ce761c50b..171538e583 100644
--- a/ext/Fcntl/Fcntl.pm
+++ b/ext/Fcntl/Fcntl.pm
@@ -192,8 +192,8 @@ sub S_ISSOCK   { ( $_[0] & _S_IFMT() ) == S_IFSOCK()  }
 sub S_ISBLK    { ( $_[0] & _S_IFMT() ) == S_IFBLK()   }
 sub S_ISCHR    { ( $_[0] & _S_IFMT() ) == S_IFCHR()   }
 sub S_ISFIFO   { ( $_[0] & _S_IFMT() ) == S_IFIFO()   }
-sub S_ISWHT    { ( $_[0] & _S_IFMT() ) == S_ISWHT()   }
-sub S_ISENFMT  { ( $_[0] & _S_IFMT() ) == S_ISENFMT() }
+sub S_ISWHT    { ( $_[0] & _S_IFMT() ) == S_IFWHT()   }
+sub S_ISENFMT  { ( $_[0] & _S_IFMT() ) == S_IFENFMT() }
 
 sub AUTOLOAD {
     (my $constname = $AUTOLOAD) =~ s/.*:://;
diff --git a/hints/solaris_2.sh b/hints/solaris_2.sh
index a52c88f362..954af6a418 100644
--- a/hints/solaris_2.sh
+++ b/hints/solaris_2.sh
@@ -368,6 +368,17 @@ cat > UU/use64bitall.cbu <<'EOCBU'
 # after it has prompted the user for whether to be maximally 64 bitty.
 case "$use64bitall" in
 "$define"|true|[yY]*)
+	    libc='/usr/lib/sparcv9/libc.so'
+	    if test ! -f $libc; then
+		cat <<EOM
+
+I do not see the 64-bit libc, $libc.
+Cannot continue, aborting.
+
+EOM
+		exit 1
+	    fi 
+	    loclibpth="$loclibpth /usr/lib/sparcv9"
 	    case "$cc -v 2>/dev/null" in
 	    *gcc*)
 		# I don't know what are the flags to make gcc sparcv9-aware,
@@ -380,18 +391,9 @@ case "$use64bitall" in
 		ccflags="$ccflags `getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`"
 		ldflags="$ldflags `getconf XBS5_LP64_OFF64_LDFLAGS 2>/dev/null`"
 		lddlflags="$lddlflags -G `getconf XBS5_LP64_OFF64_LDFLAGS 2>/dev/null`"
+		test -d /opt/SUNWspro/lib && loclibpth="$loclibpth /opt/SUNWspro/lib"
 		;;
 	    esac	
-	    libc='/usr/lib/sparcv9/libc.so'
-	    if test ! -f $libc; then
-		cat <<EOM
-
-I do not see the 64-bit libc, $libc.
-Cannot continue, aborting.
-
-EOM
-		exit 1
-	    fi 
 	    libscheck='case "`/usr/bin/file $xxx`" in
 *64-bit*|*SPARCV9*) ;;
 *) xxx=/no/64-bit$xxx ;;
diff --git a/pp.c b/pp.c
index 70babce262..d0a9959eba 100644
--- a/pp.c
+++ b/pp.c
@@ -905,7 +905,7 @@ PP(pp_pow)
     djSP; dATARGET; tryAMAGICbin(pow,opASSIGN);
     {
       dPOPTOPnnrl;
-      SETn( pow( left, right) );
+      SETn( Perl_pow( left, right) );
       RETURN;
     }
 }
@@ -1010,8 +1010,8 @@ PP(pp_modulo)
 #endif
 
 	    /* Backward-compatibility clause: */
-	    dright = floor(dright + 0.5);
-	    dleft  = floor(dleft + 0.5);
+	    dright = Perl_floor(dright + 0.5);
+	    dleft  = Perl_floor(dleft + 0.5);
 
 	    if (!dright)
 		DIE(aTHX_ "Illegal modulus zero");
diff --git a/sv.c b/sv.c
index 73c15e77a2..7bb1fdd23f 100644
--- a/sv.c
+++ b/sv.c
@@ -6207,7 +6207,7 @@ Perl_sv_vcatpvfn(pTHX_ SV *sv, const char *pat, STRLEN patlen, va_list *args, SV
 	    need = 0;
 	    if (c != 'e' && c != 'E') {
 		i = PERL_INT_MIN;
-		(void)frexp(nv, &i);
+		(void)Perl_frexp(nv, &i);
 		if (i == PERL_INT_MIN)
 		    Perl_die(aTHX_ "panic: frexp");
 		if (i > 0)