update hints/irix_6.sh

	Message-ID: <yd890lu1nu1.fsf@hoshi.engr.sgi.com>

p4raw-id: //depot/perl@1555

diff --git a/hints/irix_6.sh b/hints/irix_6.sh
index 40d4291..676aacb 100644 (file)
--- a/hints/irix_6.sh
+++ b/hints/irix_6.sh
@@ -45,28 +45,38 @@ esac
 case "$cc" in
 *"cc -n32"*)
 
+       # Perl 5.004_57 introduced new qsort code into pp_ctl.c that
+       # makes IRIX  cc prior to 7.2.1 to emit bad code.
+       # so some serious hackery follows to set pp_ctl flags correctly.
+
        # Check for which version of the compiler we're running
        case "`$cc -version 2>&1`" in
        *7.0*)                        # Mongoose 7.0
             ccflags="$ccflags -D_BSD_TYPES -D_BSD_TIME -woff 1009,1042,1048,1110,1116,1184 -OPT:Olimit=0"
             optimize='none'      
             ;;
-       *7.*)                         # Mongoose 7.1+
+       *7.1*|*7.2)                   # Mongoose 7.1+
             ccflags="$ccflags -D_BSD_TYPES -D_BSD_TIME -woff 1009,1110,1184 -OPT:Olimit=0"
             optimize='-O3'       
+            pp_ctl_cflags='optimize=-O'
+            ;;
+       *7.*)                         # Mongoose 7.2.1+
+            ccflags="$ccflags -D_BSD_TYPES -D_BSD_TIME -woff 1009,1110,1184 -OPT:Olimit=0:space=on"
+            optimize='-O3'       
             ;;
        *6.2*)                        # Ragnarok 6.2
             ccflags="$ccflags -D_BSD_TYPES -D_BSD_TIME -woff 1009,1110,1184"
             optimize='none'      
             ;;
        *)                            # Be safe and not optimize
-       ccflags="$ccflags -D_BSD_TYPES -D_BSD_TIME -woff 1009,1110,1184 -OPT:Olimit=0"
+            ccflags="$ccflags -D_BSD_TYPES -D_BSD_TIME -woff 1009,1110,1184 -OPT:Olimit=0"
             optimize='none'
             ;;
        esac
 
        ld=ld
-       ldflags=' -L/usr/local/lib -L/usr/lib32 -L/lib32'
+       # NOTE: -L/usr/lib32 -L/lib32 are automatically selected by the linker
+       ldflags=' -L/usr/local/lib32 -L/usr/local/lib'
        cccdlflags=' '
     # From: David Billinghurst <David.Billinghurst@riotinto.com.au>
     # If you get complaints about so_locations then change the following
@@ -120,17 +130,13 @@ set `echo X "$libswanted "|sed -e 's/ sun / /' -e 's/ crypt / /' -e 's/ bsd / /'
 shift
 libswanted="$*"
 
-# Perl 5.004_57 introduced new qsort code into pp_ctl.c that
-# makes IRIX 6.2 cc to emit bad code.
-pp_ctl_cflags='optimize=-O'
-
-if [ "X$usethreads" = "X$define" ]; then
+if [ "X$usethreads" = "X$define" -o "X$usethreads" = "Xy" ]; then
     if test ! -f /usr/include/pthread.h -o ! -f /usr/lib/libpthread.so; then
        uname_r=`uname -r`
        case "`uname -r`" in
-       6.0|6.1)
+       5*|6.0|6.1)
            echo >&4 "IRIX $uname_r does not have the POSIX threads."
-           echo >&4 "You should upgrade to at least IRIX 6.3."
+           echo >&4 "You should upgrade to at least IRIX 6.2 with pthread patches."
            echo >&4 "Cannot continue, aborting."
            exit 1
            ;;
@@ -138,7 +144,7 @@ if [ "X$usethreads" = "X$define" ]; then
            echo >&4 ""
 cat >&4 <<EOF
 IRIX 6.2 $uname_r can have the POSIX threads.
-The following IRIX patches must, however, be installed:
+The following IRIX patches (or their replacements) must, however, be installed:
 
         1404 Irix 6.2 Posix 1003.1b man pages
         1645 IRIX 6.2 & 6.3 POSIX header file updates