X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=hints%2Fdec_osf.sh;h=5eb7e80968d5d7afd883211796c107dcdf220c0f;hb=878143fbd9fc1c2bef489be4fd428b8d222cc108;hp=c6c09e5bf1509b9638733b1dac58008b4a611fd2;hpb=e7bbb9dcdfd0092ed53ead5e7e72d530ed63e639;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/hints/dec_osf.sh b/hints/dec_osf.sh
index c6c09e5..5eb7e80 100644
--- a/hints/dec_osf.sh
+++ b/hints/dec_osf.sh
@@ -58,11 +58,13 @@
 # and it is called GEM. Many of the options we are going to use depend
 # on the compiler style.
 
+cc=${cc:-cc}
+
 # do NOT, I repeat, *NOT* take away the leading tabs
 # Configure Black Magic (TM)
 	# reset
 	_DEC_cc_style=
-case "$cc" in
+case "`$cc -v 2>&1 | grep cc`" in
 *gcc*)	;; # pass
 *)	# compile something small: taint.c is fine for this.
     	# the main point is the '-v' flag of 'cc'.
@@ -80,7 +82,7 @@ case "$cc" in
 esac
 
 # be nauseatingly ANSI
-case "$cc" in
+case "`$cc -v 2>&1 | grep gcc`" in
 *gcc*)	ccflags="$ccflags -ansi"
 	;;
 *)	ccflags="$ccflags -std"
@@ -93,7 +95,7 @@ esac
 # we want optimisation
 
 case "$optimize" in
-'')	case "$cc" in 
+'')	case "`$cc -v 2>&1 | grep gcc`" in
 	*gcc*)	
 		optimize='-O3'				;;
 	*)	case "$_DEC_cc_style" in
@@ -149,10 +151,19 @@ case "`uname -r`" in
 *)            if $test "X$optimize" = "X$undef"; then
                       lddlflags="$lddlflags -msym"
               else
-                      lddlflags="$lddlflags $optimize -msym"
+		  case "`sizer -v`" in
+		  *4.0D*)
+		      # QAR 56761: -O4 + .so may produce broken code,
+		      # fixed in 4.0E or better.
+		      ;;
+		  *)    
+                      lddlflags="$lddlflags $optimize"
+		      ;;
+		  esac
+		  # -msym: If using a sufficiently recent /sbin/loader,
+		  # keep the module symbols with the modules.
+                  lddlflags="$lddlflags -msym"
               fi
-		# -msym: If using a sufficiently recent /sbin/loader,
-		# keep the module symbols with the modules.
 		;;
 esac
 # Yes, the above loses if gcc does not use the system linker.
@@ -193,23 +204,27 @@ esac
 
 pp_sys_cflags='ccflags="$ccflags -DNO_EFF_ONLY_OK"'
 
+# The off_t is already 8 bytes, so we do have largefileness.
+
 # 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
 $define|true|[yY]*)
-        # Threads interfaces and flags changed with V4.0.
-        case "`uname -r`" in
-        *[123].*)
-	    libswanted="$libswanted pthreads mach exc c_r"
-  	    ccflags="-threads $ccflags"
+	# Threads interfaces changed with V4.0.
+	case "`$cc -v 2>&1 | grep gcc`" in
+	*gcc*)ccflags="-D_REENTRANT $ccflags" ;;
+	*)  case "`uname -r`" in
+	    *[123].*)	ccflags="-threads $ccflags" ;;
+	    *)          ccflags="-pthread $ccflags" ;;
+	    esac
 	    ;;
-        *)
-	    libswanted="$libswanted pthread exc"
-    	    ccflags="-pthread $ccflags"
-	    ;;
-        esac
-  	ccflags="-D_REENTRANT $ccflags"
+	esac    
+	case "`uname -r`" in
+	*[123].*) libswanted="$libswanted pthreads mach exc c_r" ;;
+	*)        libswanted="$libswanted pthread exc" ;;
+	esac
+
         usemymalloc='n'
 	;;
 esac
@@ -350,5 +365,3 @@ unset _DEC_cc_style
 #	* Set -Olimit to 3200 because perl_yylex.c got too big
 #	  for the optimizer.
 #
-
-