X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/bd7dcc1560fe205bfdd287ecf78da4eb59a80bf9..c15f899f18827e563db510796dac34fdff0db1d8:/hints/hpux.sh

diff --git a/hints/hpux.sh b/hints/hpux.sh
index c74b66a..653b5a1 100644
--- a/hints/hpux.sh
+++ b/hints/hpux.sh
@@ -78,13 +78,13 @@ case `$cc -v 2>&1`"" in
 	    ccflags="$cc_cppflags"
 	    if [ "X$gccversion" = "X" ]; then
 		# Done too late in Configure if hinted
-		gccversion=`$cc --version | sed 's/.*(GCC) *//'`
+		gccversion=`$cc -dumpversion`
 		fi
 	    case "$gccversion" in
 		[012]*) # HP-UX and gcc-2.* break UINT32_MAX :-(
 			ccflags="$ccflags -DUINT32_MAX_BROKEN"
 			;;
-               3*)     # GCC (both 32bit and 64bit) will define __STDC_EXT__
+		[34]*) # GCC (both 32bit and 64bit) will define __STDC_EXT__
                        # by default when using GCC 3.0 and newer versions of
                        # the compiler.
                        cppflags="$cc_cppflags"
@@ -94,7 +94,7 @@ case `$cc -v 2>&1`"" in
 		*64*)
 		    echo "main(){}">try.c
 		    case "$gccversion" in
-			3*)
+			[34]*)
 			    case "$archname" in
                                PA-RISC*)
                                    case "$ccflags" in
@@ -157,7 +157,7 @@ case `$cc -v 2>&1`"" in
 		done
 	    [ -z "$cc_found" ] && cc_found=`which cc`
 	    what $cc_found >&4
-	    ccversion=`which $cc_found | xargs what | awk '/Compiler/{print $2}/Itanium/{print $6,$7}'`
+	    ccversion=`what $cc_found | awk '/Compiler/{print $2}/Itanium/{print $6,$7}/for Integrity/{print $6,$7}'`
 	    case "$ccflags" in
                "-Ae "*) ;;
 		*)  ccflags="-Ae $cc_cppflags"
@@ -188,14 +188,17 @@ toke_cflags='ccflags="$ccflags -DARG_ZERO_IS_SCRIPT"'
     gcc_64native=no
 case "$ccisgcc" in
     $define|true|[Yy])
-	echo 'int main(){long l;printf("%d\\n",sizeof(l));}'>try.c
+	echo '#include <stdio.h>\nint main(){long l;printf("%d\\n",sizeof(l));}'>try.c
 	$cc -o try $ccflags $ldflags try.c
 	if [ "`try`" = "8" ]; then
-	    cat <<EOM >&4
+	    case "$use64bitall" in
+		$define|true|[Yy]) ;;
+		*)  cat <<EOM >&4
 
 *** This version of gcc uses 64 bit longs. -Duse64bitall is
 *** implicitly set to enable continuation
 EOM
+		esac
 	    use64bitall=$define
 	    gcc_64native=yes
 	    fi
@@ -215,21 +218,9 @@ case "$archname" in
 	# While here, override so=sl auto-detection
 	so='so'
 	;;
-    *)
-	case "$uselongdouble" in
-	    *) ;;
-	    $define|true|[yY]*)
-		cat <<EOM >&4
-
-*** long doubles are not (yet) supported on HP-UX (any version)
-*** Until it does, we cannot continue, aborting.
-EOM
-		exit 1 ;;
-	    esac
-	;;
     esac
 
-case "$use64bitint" in
+case "$use64bitall" in
     $define|true|[Yy])
 
 	if [ "$xxOsRevMajor" -lt 11 ]; then
@@ -242,12 +233,21 @@ EOM
 	    exit 1
 	    fi
 
+	if [ $xxOsRev -eq 1100 ]; then
+	    # HP-UX 11.00 uses only 48 bits internally in 64bit mode, not 64
+	    # force min/max to 2**47-1
+	    sGMTIME_max=140737488355327
+	    sGMTIME_min=-62167219200
+	    sLOCALTIME_max=140737488355327
+	    sLOCALTIME_min=-62167219200
+	    fi
+
 	# Set libc and the library paths
 	case "$archname" in
 	    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
@@ -263,29 +263,44 @@ EOM
 
 	case "$ccisgcc" in
 	    $define|true|[Yy])
+		# The fixed socket.h header file is wrong for gcc-4.x
+		# on PA-RISC2.0W, so Sock_type_t is size_t which is
+		# unsigned long which is 64bit which is too long
+		case "$gccversion" in
+		    4*) case "$archname" in
+			    PA-RISC*) socksizetype=int ;;
+			    esac
+			;;
+		    esac
+
 		# For the moment, don't care that it ain't supported (yet)
 		# by gcc (up to and including 2.95.3), cause it'll crash
 		# anyway. Expect auto-detection of 64-bit enabled gcc on
 		# HP-UX soon, including a user-friendly exit
 		case $gcc_64native in
 		    no) case "$gccversion" in
-			    [123]*) ccflags="$ccflags -mlp64"
-				    case "$archname" in
-					PA-RISC*)
-					    ldflags="$ldflags -Wl,+DD64"
-					    ;;
-					IA64*)
-					    ldflags="$ldflags -mlp64"
-					    ;;
-					esac
-				    ;;
+			    [1234]*)
+				ccflags="$ccflags -mlp64"
+				case "$archname" in
+				    PA-RISC*)
+					ldflags="$ldflags -Wl,+DD64"
+					;;
+				    IA64*)
+					ldflags="$ldflags -mlp64"
+					;;
+				    esac
+				;;
 			    esac
 			;;
 		    esac
 		;;
 	    *)
-		ccflags="$ccflags +DD64"
-		ldflags="$ldflags +DD64"
+		case "$use64bitall" in
+		    $define|true|[yY]*)
+			ccflags="$ccflags +DD64"
+			ldflags="$ldflags +DD64"
+			;;
+		    esac
 		;;
 	    esac
 
@@ -304,7 +319,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
@@ -335,13 +350,14 @@ else
 
 ## Optimization limits
 cat >try.c <<EOF
+#include <stdio.h>
 #include <sys/resource.h>
 
 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
@@ -360,11 +376,12 @@ to at least 0x08000000 (128 Mb) and rebuild your kernel.
 EOM
 regexec_cflags=''
 doop_cflags=''
+op_cflags=''
     fi
 
 case "$ccisgcc" in
     $define|true|[Yy])
-	
+
 	case "$optimize" in
 	    "")           optimize="-g -O" ;;
 	    *O[3456789]*) optimize=`echo "$optimize" | sed -e 's/O[3-9]/O2/'` ;;
@@ -397,7 +414,7 @@ case "$ccisgcc" in
 	    fi
 	;;
 
-    *)	# HP's compiler cannot combine -g and -O
+    *)
 	case "$optimize" in
 	    "")           optimize="+O2 +Onolimit" ;;
 	    *O[3456789]*) optimize=`echo "$optimize" | sed -e 's/O[3-9]/O2/'` ;;
@@ -409,15 +426,38 @@ 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"			;;
+			B3910B*A.06.15)
+			# > cc --version
+			# cc: HP C/aC++ B3910B A.06.15 [May 16 2007]
+			# Has optimizing problems with +O2 for blead (5.15.5),
+			# see https://rt.perl.org:443/rt3/Ticket/Display.html?id=103668.
+			#
+			# +O2 +Onolimit +Onoprocelim  +Ostore_ordering \
+			# +Onolibcalls=strcmp
+			# passes all tests (with/without -DDEBUGGING) [Nov 17 2011]
+			case "$optimize" in
+				*O2*) optimize="$optimize +Onoprocelim +Ostore_ordering +Onolibcalls=strcmp" ;;
+				esac
+			;;
+		    *)  doop_cflags="optimize=\"$opt\""
+			op_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'
@@ -430,7 +470,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
@@ -494,7 +534,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]*)
@@ -521,7 +561,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
@@ -589,7 +629,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
@@ -617,7 +657,7 @@ Either you must upgrade to HP-UX 11 or install a posix thread library:
 
 or
 
-    PTH package from e.g. http://hpux.tn.tudelft.nl/hppd/hpux/alpha.html
+    PTH package from e.g. http://hpux.connect.org.uk/hppd/hpux/Gnu/pth-2.0.7/
 
 Cannot continue, aborting.
 EOM
@@ -629,32 +669,24 @@ EOM
 	    set `echo X "$libswanted "| sed -e 's/ c / pthread c /'`
 	    shift
 	    libswanted="$*"
-	    fi
 
+	    # HP-UX 11.X seems to have no easy
+	    # way of detecting these *time_r protos.
+	    d_gmtime_r_proto='define'
+	    gmtime_r_proto='REENTRANT_PROTO_S_TS'
+	    d_localtime_r_proto='define'
+	    localtime_r_proto='REENTRANT_PROTO_S_TS'
+	    fi
 	;;
     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
@@ -663,10 +695,17 @@ 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
+# HP-UX 11
+if [ $xxOsRevMajor -lt 11 ]; then
+    d_ctime_r="$undef"
+    d_asctime_r="$undef"
+    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'