X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=hints%2Fdec_osf.sh;h=336e0ef99ef782ee1f887912ba3fbffcdc07e962;hb=78d00c47260f2671ebe392f1c5ac1e1403ecbceb;hp=851ac24ad79d945f49598c407df875de4c15a681;hpb=da0b61dd4c6bf78c70cbb82bfd7d9e2c4748080a;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/hints/dec_osf.sh b/hints/dec_osf.sh
index 851ac24..336e0ef 100644
--- a/hints/dec_osf.sh
+++ b/hints/dec_osf.sh
@@ -84,7 +84,7 @@ gcc)	if [ "X$gccversion" = "X" ]; then
 ***
 *** Therefore, I strongly suggest upgrading your gcc.  (Why don't you use
 *** the vendor cc is also a good question.  It comes with the operating
-*** system and produces good code.)
+*** system, produces good code, and is very ANSI C fastidious.)
 
 Cannot continue, aborting.
 
@@ -105,11 +105,16 @@ Since you explicitly chose gcc, I assume that you know what are doing.
 
 EOF
 	fi
+	# -ansi is fine for gcc in Tru64 (-ansi is not universally so).
+	_ccflags_strict_ansi="-ansi"
         ;;
-*)	# compile something small: taint.c is fine for this.
+*)	# compile something.
+	cat >try.c <<EOF
+int main() { return 0; }
+EOF
 	ccversion=`cc -V | awk '/(Compaq|DEC) C/ {print $3}' | grep '^V'`
     	# the main point is the '-v' flag of 'cc'.
-       	case "`cc -v -I. -c taint.c -o taint$$.o 2>&1`" in
+       	case "`cc -v -c try.c 2>&1`" in
 	*/gemc_cc*)	# we have the new DEC GEM CC
 			_DEC_cc_style=new
 			;;
@@ -117,17 +122,54 @@ EOF
 			_DEC_cc_style=old
 			;;
 	esac
-	# cleanup
-	rm -f taint$$.o
+	# We need to figure out whether -c99 is a valid flag to use.
+	# If it is, we can use it for being nauseatingly C99 ANSI --
+	# but even then the lddlflags needs to stay -std1.
+	# If it is not, we must use -std1 for both flags.
+	#
+       	case "`cc -c99 try.c 2>&1`" in
+	*"-c99: Unknown flag"*)
+		_ccflags_strict_ansi="-std1"
+		;;
+	*)	# However, use the -c99 only if compiling for
+		# -DPERL_MEM_LOG, where the C99 feature __func__
+		# is useful to have.  Otherwise use the good old
+		# -std1 so that we stay C89 strict, which the goal
+		# of the Perl C code base (no //, no code between
+		# declarations, etc).  Moreover, the Tru64 cc is
+		# not fully C99, and most probably never will be.
+		#
+		# The -DPERL_MEM_LOG can be either in ccflags
+		# (if using an old config.sh) or in the command line
+		# (which has been stowed away in UU/cmdline.opt).
+		#
+		case "$ccflags `cat UU/cmdline.opt`" in
+		*-DPERL_MEM_LOG*)	_ccflags_strict_ansi="-c99"  ;;
+		*)			_ccflags_strict_ansi="-std1" ;;
+		esac
+		;;
+	esac
+	_lddlflags_strict_ansi="-std1"
+	# -no_ansi_alias because Perl code is not that strict
+	# (also gcc uses by default -fno-strict-aliasing).
+	_ccflags_strict_ansi="$_ccflags_strict_ansi -no_ansi_alias"
+	# Cleanup.
+	rm -f try.c try.o
 	;;
 esac
 
-# be nauseatingly ANSI
-case "$isgcc" in
-gcc)	ccflags="$ccflags -ansi"
-	;;
-*)	ccflags="$ccflags -std"
-	;;
+# Be nauseatingly ANSI
+ccflags="$ccflags $_ccflags_strict_ansi"
+
+# g++ needs a lot of definitions to see the same set of
+# prototypes from <unistd.h> et alia as cxx/cc see.
+# Note that we cannot define _XOPEN_SOURCE_EXTENDED or
+# its moral equivalent, _XOPEN_SOURCE=500 (which would
+# define a lot of the required prototypes for us), because
+# the gcc-processed version of <sys/wait.h> contains fatally
+# conflicting prototypes for wait3().
+case "$cc" in
+*g++*) ccflags="$ccflags -D_XOPEN_SOURCE -D_OSF_SOURCE -D_AES_SOURCE -D_BSD -D_POSIX_C_SOURCE=199309L -D_POSIX_PII_SOCKET" ;;
 esac
 
 # for gcc the Configure knows about the -fpic:
@@ -148,10 +190,21 @@ case "$optimize" in
 	;;
 esac
 
+case "$isgcc" in
+gcc)	;;
+*)	case "$optimize" in
+	*-O*)	# With both -O and -g, the -g must be -g3.
+		optimize="`echo $optimize | sed 's/-g[1-4]*/-g3/'`"
+		;;
+	esac
+	;;
+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 <stdio.h>
 #include <sys/resource.h>
 
 int main ()
@@ -184,6 +237,17 @@ toke_cflags='optimize=-O2'
 ;;
 esac
 
+# The patch 23787
+# http://public.activestate.com/cgi-bin/perlbrowse?patch=23787
+# broke things for gcc (at least gcc 3.3) so that many of the pack()
+# checksum tests for formats L, j, J, especially when combined
+# with the < and > specifiers, started to fail if compiled with plain -O3.
+case "$isgcc" in
+gcc)
+pp_pack_cflags='optimize="-O3 -fno-cse-skip-blocks"'
+;;
+esac
+
 # we want dynamic fp rounding mode, and we want ieee exception semantics
 case "$isgcc" in
 gcc)	;;
@@ -248,7 +312,7 @@ case "`uname -r`" in
 		  esac
 		  # -msym: If using a sufficiently recent /sbin/loader,
 		  # keep the module symbols with the modules.
-                  lddlflags="$lddlflags -msym -std"
+                  lddlflags="$lddlflags -msym $_lddlflags_strict_ansi"
               fi
 		;;
 esac
@@ -317,7 +381,7 @@ $define|true|[yY]*)
 extern int foo;	
 EOF
 	$cc -c pthread.c 2> pthread.err
-	if grep -q "unrecognized compiler" pthread.err; then
+	if egrep -q "unrecognized compiler|syntax error" pthread.err; then
 	    cat >&4 <<EOF
 ***
 *** I'm sorry but your C compiler ($cc) cannot be used to
@@ -385,7 +449,7 @@ EOF
 		exit 1
 		;;
 	*)
-		# Test whether libc's been fixed yet.
+		# Test whether libc's been fixed yet for long doubles.
 		cat >try.c <<\TRY
 #include <stdio.h>
 int main(int argc, char **argv)
@@ -402,7 +466,7 @@ TRY
 		# Don't bother trying to work with Configure's idea of
 		# cc and the various flags.  This might not work as-is
 		# with gcc -- but we're testing libc, not the compiler.
-		if cc -o try -std try.c && ./try
+		if cc -o try $_ccflags_strict_ansi try.c && ./try
 		then
 			: ok
 		else
@@ -584,3 +648,4 @@ unset _DEC_cc_style
 #	* Set -Olimit to 3200 because perl_yylex.c got too big
 #	  for the optimizer.
 #
+