Integrate with Sarathy.

p4raw-id: //depot/cfgperl@5449

diff --git a/Configure b/Configure
index 2230760..b788f76 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -20,7 +20,7 @@
 
 # $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $
 #
-# Generated on Thu Mar  2 19:38:01 EET 2000 [metaconfig 3.0 PL70]
+# Generated on Thu Mar  2 21:42:14 EET 2000 [metaconfig 3.0 PL70]
 # (with additional metaconfig patches by perlbug@perl.com)
 
 cat >/tmp/c1$$ <<EOF
@@ -4817,7 +4817,7 @@ case "$installstyle" in
                *) dflt='lib/perl5' ;;
        esac
        ;;
-*)     dflt='lib/perl5' ;;
+*)     dflt="$installstyle" ;;
 esac
 : Probably not worth prompting for this since we prompt for all
 : the directories individually, and the prompt would be too long and

diff --git a/hints/irix_6.sh b/hints/irix_6.sh
index d14ac93..09c5ee1 100644 (file)
--- a/hints/irix_6.sh
+++ b/hints/irix_6.sh
@@ -206,6 +206,10 @@ esac
 # Don't groan about unused libraries.
 ldflags="$ldflags -Wl,-woff,84"
 
+case "`$cc -version 2>&1`" in
+*7.2.*)        op_cflags='optimize=-O1' ;; # workaround for an optimizer bug
+esac
+
 # We don't want these libraries.
 # Socket networking is in libc, these are not installed by default,
 # and just slow perl down. (scotth@sgi.com)

diff --git a/perlapi.c b/perlapi.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/perlapi.h b/perlapi.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/pp.c b/pp.c
index d0a9959..ebfe985 100644 (file)
--- a/pp.c
+++ b/pp.c
@@ -1199,7 +1199,21 @@ PP(pp_ncmp)
     {
       dPOPTOPnnrl;
       I32 value;
+#ifdef __osf__ /* XXX fix in 5.6.1 --jhi */
+#if defined(USE_LONG_DOUBLE) && defined(HAS_LONG_DOUBLE)
+#define Perl_isnan isnanl
+#else
+#define Perl_isnan isnan
+#endif
+#endif
 
+#ifdef __osf__ /* XXX fix in 5.6.1 --jhi */
+      if (Perl_isnan(left) || Perl_isnan(right)) {
+         SETs(&PL_sv_undef);
+         RETURN;
+       }
+      value = (left > right) - (left < right);
+#else
       if (left == right)
        value = 0;
       else if (left < right)
@@ -1210,6 +1224,7 @@ PP(pp_ncmp)
        SETs(&PL_sv_undef);
        RETURN;
       }
+#endif
       SETi(value);
       RETURN;
     }

diff --git a/t/op/filetest.t b/t/op/filetest.t
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/t/op/subst_amp.t b/t/op/subst_amp.t
old mode 100755 (executable)
new mode 100644 (file)