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

diff --git a/hints/hpux.sh b/hints/hpux.sh
index f769e51..653b5a1 100644
--- a/hints/hpux.sh
+++ b/hints/hpux.sh
@@ -78,7 +78,7 @@ 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 :-(
@@ -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 $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,6 +233,15 @@ 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*)
@@ -263,6 +263,16 @@ 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
@@ -279,14 +289,18 @@ EOM
 					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
 
@@ -336,6 +350,7 @@ else
 
 ## Optimization limits
 cat >try.c <<EOF
+#include <stdio.h>
 #include <sys/resource.h>
 
 int main ()
@@ -361,6 +376,7 @@ to at least 0x08000000 (128 Mb) and rebuild your kernel.
 EOM
 regexec_cflags=''
 doop_cflags=''
+op_cflags=''
     fi
 
 case "$ccisgcc" in
@@ -398,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/'` ;;
@@ -420,7 +436,21 @@ case "$ccisgcc" in
 			# 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\""	;;
+			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
@@ -627,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
@@ -639,8 +669,14 @@ 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
@@ -669,7 +705,6 @@ if [ $xxOsRevMajor -lt 11 ]; then
     d_asctime_r="$undef"
     fi
 
-
 # fpclassify () is a macro, the library call is Fpclassify
 # Similarly with the others below.
 d_fpclassify='define'