X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=hints%2Fdec_osf.sh;h=851ac24ad79d945f49598c407df875de4c15a681;hb=49117913cae2ddc0be5964d0bd7e9a81dbd4be0b;hp=7706141ff258d9a6cf0080dd6c1aa3cd48d5fce3;hpb=a4ccfa7629128e4b79e21f856eb1cbf44ef54e7e;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/hints/dec_osf.sh b/hints/dec_osf.sh
index 7706141..851ac24 100644
--- a/hints/dec_osf.sh
+++ b/hints/dec_osf.sh
@@ -69,13 +69,16 @@ esac
 	# reset
 	_DEC_cc_style=
 case "$isgcc" in
-gcc)	_gcc_version=`$cc --version 2>&1 | tr . ' '`
-	set $_gcc_version
-	if test "$1" -lt 2 -o \( "$1" -eq 2 -a \( "$2" -lt 95 -o \( "$2" -eq 95 -a "$3" -lt 2 \) \) \); then
+gcc)	if [ "X$gccversion" = "X" ]; then
+	    # Done too late in Configure if hinted
+	    gccversion=`$cc --version | sed 's/.*(GCC) *//'`
+	fi
+	set $gccversion
+	if test "$1" -lt 2 -o \( "$1" -eq 2 -a \( "$2" -lt 95 -o \( "$2" -eq 95 -a "$3" -lt 3 \) \) \); then
 	    cat >&4 <<EOF
 
-*** Your cc seems to be gcc and its version ($_gcc_version) seems to be
-*** less than 2.95.2.  This is not a good idea since old versions of gcc
+*** Your cc seems to be gcc and its version ($gccversion) seems to be
+*** less than 2.95.3.  This is not a good idea since old versions of gcc
 *** are known to produce buggy code when compiling Perl (and no doubt for
 *** other programs, too).
 ***
@@ -145,6 +148,42 @@ case "$optimize" in
 	;;
 esac
 
+## Optimization limits
+case "$isgcc" in
+gcc) #  gcc 3.2.1 wants a lot of memory for -O3'ing toke.c
+cat >try.c <<EOF
+#include <sys/resource.h>
+
+int main ()
+{
+    struct rlimit rl;
+    int i = getrlimit (RLIMIT_DATA, &rl);
+    printf ("%d\n", rl.rlim_cur / (1024 * 1024));
+    } /* main */
+EOF
+$cc -o try $ccflags $ldflags try.c
+	maxdsiz=`./try`
+rm -f try try.c core
+if [ $maxdsiz -lt 256 ]; then
+    # less than 256 MB is probably not enough to optimize toke.c with gcc -O3
+    cat <<EOM >&4
+
+Your process datasize is limited to $maxdsiz MB, which is (sadly) not
+always enough to fully optimize some source code files of Perl,
+at least 256 MB seems to be necessary as of Perl 5.8.0.  I'll try to
+use a lower optimization level for those parts.  You could either try
+using your shell's ulimit/limit/limits command to raise your datasize
+(assuming the system-wide hard resource limits allow you to go higher),
+or if you can't go higher and if you are a sysadmin, and you *do* want
+the full optimization, you can tune the 'max_per_proc_data_size'
+kernel parameter: see man sysconfigtab, and man sys_attrs_proc.
+
+EOM
+toke_cflags='optimize=-O2'
+    fi
+;;
+esac
+
 # we want dynamic fp rounding mode, and we want ieee exception semantics
 case "$isgcc" in
 gcc)	;;
@@ -186,6 +225,9 @@ libswanted="`echo $libswanted | sed -e 's/ ndbm / /'`"
 # the basic lddlflags used always
 lddlflags='-shared -expect_unresolved "*"'
 
+# Intentional leading tab.
+	myosvers="`/usr/sbin/sizer -v 2>/dev/null || uname -r`"
+
 # Fancy compiler suites use optimising linker as well as compiler.
 # <spider@Orb.Nashua.NH.US>
 case "`uname -r`" in
@@ -195,7 +237,7 @@ case "`uname -r`" in
 *)            if $test "X$optimize" = "X$undef"; then
                       lddlflags="$lddlflags -msym"
               else
-		  case "`/usr/sbin/sizer -v`" in
+		  case "$myosvers" in
 		  *4.0D*)
 		      # QAR 56761: -O4 + .so may produce broken code,
 		      # fixed in 4.0E or better.
@@ -213,6 +255,10 @@ esac
 # Yes, the above loses if gcc does not use the system linker.
 # If that happens, let me know about it. <jhi@iki.fi>
 
+# Because there is no other handy way to recognize 3.X.
+case "`uname -r`" in
+*3.*)	ccflags="$ccflags -DDEC_OSF1_3_X" ;;
+esac
 
 # If debugging or (old systems and doing shared)
 # then do not strip the lib, otherwise, strip.
@@ -247,7 +293,7 @@ esac
 # emulate_eaccess().
 
 # Fixed in V5.0A.
-case "`/usr/sbin/sizer -v`" in
+case "$myosvers" in
 *5.0[A-Z]*|*5.[1-9]*|*[6-9].[0-9]*)
 	: ok
 	;;
@@ -264,9 +310,32 @@ cat > UU/usethreads.cbu <<'EOCBU'
 # after it has prompted the user for whether to use threads.
 case "$usethreads" in
 $define|true|[yY]*)
+	# In Tru64 V5 (at least V5.1A, V5.1B) gcc (at least 3.2.2)
+	# cannot be used to compile a threaded Perl.
+	cat > pthread.c <<EOF
+#include <pthread.h>
+extern int foo;	
+EOF
+	$cc -c pthread.c 2> pthread.err
+	if grep -q "unrecognized compiler" pthread.err; then
+	    cat >&4 <<EOF
+***
+*** I'm sorry but your C compiler ($cc) cannot be used to
+*** compile Perl with threads.  The system C compiler should work.
+***
+
+Cannot continue, aborting.
+
+EOF
+	    rm -f pthread.*
+	    exit 1
+	fi
+	rm -f pthread.*
 	# Threads interfaces changed with V4.0.
 	case "$isgcc" in
-	gcc)	ccflags="-D_REENTRANT $ccflags" ;;
+	gcc)
+	    ccflags="-D_REENTRANT $ccflags"
+	    ;;
 	*)  case "`uname -r`" in
 	    *[123].*)	ccflags="-threads $ccflags" ;;
 	    *)          ccflags="-pthread $ccflags" ;;
@@ -293,12 +362,17 @@ $define|true|[yY]*)
 esac
 EOCBU
 
+# malloc wrap works
+case "$usemallocwrap" in
+'') usemallocwrap='define' ;;
+esac
+
 cat > UU/uselongdouble.cbu <<'EOCBU'
 # This script UU/uselongdouble.cbu will get 'called-back' by Configure 
 # after it has prompted the user for whether to use long doubles.
 case "$uselongdouble" in
 $define|true|[yY]*)
-	case "`/usr/sbin/sizer -v`" in
+	case "$myosvers" in
 	*[1-4].0*)	cat >&4 <<EOF
 
 ***
@@ -350,18 +424,14 @@ UGLY
 esac
 EOCBU
 
-case "`/usr/sbin/sizer -v`" in
+case "$myosvers" in
 *[1-4].0*) d_modfl=undef ;; # must wait till 5.0
 esac
 
-# Keep those leading tabs.
-	needusrshlib=''
+# Keep that leading tab.
 	old_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
 for p in $loclibpth
 do
-	if test -n "`ls $p/libdb.so* 2>/dev/null`"; then
-	    needusrshlib=yes
-	fi
 	if test -d $p; then
 	    echo "Appending $p to LD_LIBRARY_PATH." >& 4
 	    case "$LD_LIBRARY_PATH" in
@@ -374,14 +444,10 @@ case "$LD_LIBRARY_PATH" in
 "$old_LD_LIBRARY_PATH") ;;
 *) echo "LD_LIBRARY_PATH is now $LD_LIBRARY_PATH." >& 4 ;;
 esac
-# This is evil but I can't think of a nice workaround:
-# the /usr/shlib/libdb.so needs to be seen first,
-# or running Configure will fail.
-if test -n "$needusrshlib"; then
-    echo "Prepending /usr/shlib to loclibpth." >& 4
-    loclibpth="/usr/shlib $loclibpth"
-    echo "loclibpth is now $loclibpth." >& 4
-fi
+case "$LD_LIBRARY_PATH" in
+'') ;;
+* ) export LD_LIBRARY_PATH ;;
+esac
 
 #
 # Unset temporary variables no more needed.