Remove warnings against WHOA THERE warnings from the hints files.

[p5sagit/p5-mst-13.2.git] / hints / hpux.sh

diff --git a/hints/hpux.sh b/hints/hpux.sh
index 11b3449..be1a51e 100644 (file)
--- a/hints/hpux.sh
+++ b/hints/hpux.sh
@@ -157,7 +157,7 @@ case `$cc -v 2>&1`"" in
                done
            [ -z "$cc_found" ] && cc_found=`which cc`
            what $cc_found >&4
-           ccversion=`what $cc_found | awk '/Compiler/{print $2}/Itanium/{print $6,$7}'`
+           ccversion=`what $cc_found | awk '/Compiler/{print $2}/Itanium/{print $6,$7}/for Integrity/{print $7}'`
            case "$ccflags" in
                "-Ae "*) ;;
                *)  ccflags="-Ae $cc_cppflags"
@@ -247,7 +247,7 @@ EOM
            PA-RISC*)
                loclibpth="$loclibpth /lib/pa20_64"
                libc='/lib/pa20_64/libc.sl' ;;
-           IA64*) 
+           IA64*)
                loclibpth="$loclibpth /usr/lib/hpux64"
                libc='/usr/lib/hpux64/libc.so' ;;
            esac
@@ -305,7 +305,7 @@ EOM
        case "$archname" in
            PA-RISC*)
                libc='/lib/libc.sl' ;;
-           IA64*) 
+           IA64*)
                loclibpth="$loclibpth /usr/lib/hpux32"
                libc='/usr/lib/hpux32/libc.so' ;;
            esac
@@ -342,7 +342,7 @@ int main ()
 {
     struct rlimit rl;
     int i = getrlimit (RLIMIT_DATA, &rl);
-    printf ("%d\n", rl.rlim_cur / (1024 * 1024));
+    printf ("%d\n", (int)(rl.rlim_cur / (1024 * 1024)));
     } /* main */
 EOF
 $cc -o try $ccflags $ldflags try.c
@@ -365,7 +365,7 @@ doop_cflags=''
 
 case "$ccisgcc" in
     $define|true|[Yy])
-       
+
        case "$optimize" in
            "")           optimize="-g -O" ;;
            *O[3456789]*) optimize=`echo "$optimize" | sed -e 's/O[3-9]/O2/'` ;;
@@ -410,15 +410,24 @@ case "$ccisgcc" in
            *)      opt="$optimize"
                    ;;
            esac
-       if [ $maxdsiz -le 64 ]; then
-           toke_cflags="$toke_cflags;optimize=\"$opt\""
-           regexec_cflags="optimize=\"$opt\""
-           fi
        case "$archname" in
            IA64*)
-               doop_cflags="optimize=\"$opt\""
+               case "$ccversion" in
+                   B3910B*A.06.0[12345])
+                       # > cc --version
+                       # cc: HP aC++/ANSI C B3910B A.06.05 [Jul 25 2005]
+                       # Has optimizing problems with -O2 and up for both
+                       # maint (5.8.8+) and blead (5.9.3+)
+                       # -O1/+O1 passed all tests (m)'05 [ 10 Jan 2005 ]
+                       optimize="$opt"                 ;;
+                   *)  doop_cflags="optimize=\"$opt\"" ;;
+                   esac
                ;;
            esac
+       if [ $maxdsiz -le 64 ]; then
+           toke_cflags="$toke_cflags;optimize=\"$opt\""
+           regexec_cflags="optimize=\"$opt\""
+           fi
        ld=/usr/bin/ld
        cccdlflags='+Z'
        lddlflags='-b +vnocompatwarnings'
@@ -431,7 +440,7 @@ if [ $xxOsRev -lt 1020 ]; then
     fi
 
 #case "$uselargefiles-$ccisgcc" in
-#    "$define-$define"|'-define') 
+#    "$define-$define"|'-define')
 #      cat <<EOM >&4
 #
 #*** I'm ignoring large files for this build because
@@ -495,7 +504,7 @@ EOF
 EOCBU
 
 cat >UU/uselargefiles.cbu <<'EOCBU'
-# This script UU/uselargefiles.cbu will get 'called-back' by Configure 
+# This script UU/uselargefiles.cbu will get 'called-back' by Configure
 # after it has prompted the user for whether to use large files.
 case "$uselargefiles" in
     ""|$define|true|[yY]*)
@@ -522,7 +531,7 @@ EOCBU
 
 # THREADING
 
-# This script UU/usethreads.cbu will get 'called-back' by Configure 
+# This script UU/usethreads.cbu will get 'called-back' by Configure
 # after it has prompted the user for whether to use threads.
 cat >UU/usethreads.cbu <<'EOCBU'
 case "$usethreads" in
@@ -590,7 +599,7 @@ pthread_h_first="$define"
                    localtime_r_proto='REENTRANT_PROTO_I_TS'
 
                    # Avoid the poisonous conflicting (and irrelevant)
-                   # prototypes of setkey(). 
+                   # prototypes of setkey ().
                    i_crypt="$undef"
 
                    # CMA redefines select to cma_select, and cma_select
@@ -636,26 +645,12 @@ EOM
     esac
 EOCBU
 
-# The mysterious io_xs memory corruption in 11.00 32bit seems to get
-# fixed by not using Perl's malloc.  Flip side is performance loss.
-# So we want mymalloc for all situations possible
-usemymalloc='y'
-case "$usethreads" in
-    $define|true|[yY]*) usemymalloc='n' ;;
-    *)  case "$ccisgcc" in
-           $undef|false|[nN]*)
-               case "$use64bitint" in
-                   $undef|false|[nN]*)
-                       case "$ccflags" in
-                           *-DDEBUGGING*) ;;
-                           *) usemymalloc='n' ;;
-                           esac
-                       ;;
-                   esac
-               ;;
-           esac
-       ;;
-    esac
+# There used to be:
+#  The mysterious io_xs memory corruption in 11.00 32bit seems to get
+#  fixed by not using Perl's malloc.  Flip side is performance loss.
+#  So we want mymalloc for all situations possible
+# That set usemymalloc to 'n' for threaded builds and non-gcc 32bit
+#  non-debugging builds and 'y' for all others
 
 usemymalloc='n'
 case "$useperlio" in
@@ -664,10 +659,10 @@ case "$useperlio" in
 
 # malloc wrap works
 case "$usemallocwrap" in
-'') usemallocwrap='define' ;;
-esac
+    '') usemallocwrap='define' ;;
+    esac
 
-# ctime_r() and asctime_r() seem to have issues for versions before
+# ctime_r () and asctime_r () seem to have issues for versions before
 # HP-UX 11
 if [ $xxOsRevMajor -lt 11 ]; then
     d_ctime_r="$undef"
@@ -675,7 +670,7 @@ if [ $xxOsRevMajor -lt 11 ]; then
     fi
 
 
-# fpclassify() is a macro, the library call is Fpclassify
+# fpclassify () is a macro, the library call is Fpclassify
 # Similarly with the others below.
 d_fpclassify='define'
 d_isnan='define'