X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=hints%2Firix_6.sh;h=61eac6e214f0fd8fd183da9478652de1e768054c;hb=0fa156b9cc6e57c94350bf8b3486af3d1c7dd41d;hp=32335a0bb8bb699b4c1026c319583e1b28fe157c;hpb=5e4c82f0b212f41e66aea601d969c4106295d48c;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/hints/irix_6.sh b/hints/irix_6.sh
index 32335a0..61eac6e 100644
--- a/hints/irix_6.sh
+++ b/hints/irix_6.sh
@@ -53,7 +53,7 @@ cc=${cc:-cc}
 
 case "$cc" in
 *gcc*) ;;
-*) ccversion=`cc -version` ;;
+*) ccversion=`cc -version 2>&1` ;;
 esac
 
 case "$use64bitint" in
@@ -117,7 +117,7 @@ esac'
 	libc='/usr/lib32/libc.so'
 	plibpth='/usr/lib32 /lib32 /usr/ccs/lib'
 	;;
-*"cc -64")
+*"cc -64"*)
 
 	loclibpth="$loclibpth /usr/lib64"
 	libscheck='case "`/usr/bin/file $xxx`" in
@@ -162,7 +162,7 @@ esac
 
 # Settings common to both native compiler modes.
 case "$cc" in
-*"cc -n32"|*"cc -64")
+*"cc -n32"*|*"cc -64"*)
 	ld=$cc
 
 	# perl's malloc can return improperly aligned buffer
@@ -181,6 +181,12 @@ case "$cc" in
 	nm_opt='-p'
 	nm_so_opt='-p'
 
+	# Warnings to turn off because the source code hasn't
+	# been cleaned up enough yet to satisfy the IRIX cc.
+	# 1184: "=" is used where where "==" may have been intended.
+	# 1552: The variable "foobar" is set but never used.
+	woff=1184,1552
+
 	# Perl 5.004_57 introduced new qsort code into pp_ctl.c that
 	# makes IRIX  cc prior to 7.2.1 to emit bad code.
 	# so some serious hackery follows to set pp_ctl flags correctly.
@@ -188,11 +194,11 @@ case "$cc" in
 	# Check for which version of the compiler we're running
 	case "`$cc -version 2>&1`" in
 	*7.0*)                        # Mongoose 7.0
-	     ccflags="$ccflags -D_BSD_TYPES -D_BSD_TIME -woff 1009,1042,1048,1110,1116,1174,1184,1552 -OPT:Olimit=0"
+	     ccflags="$ccflags -D_BSD_TYPES -D_BSD_TIME -woff $woff -OPT:Olimit=0"
 	     optimize='none'
 	     ;;
 	*7.1*|*7.2|*7.20)             # Mongoose 7.1+
-	     ccflags="$ccflags -D_BSD_TYPES -D_BSD_TIME -woff 1009,1110,1174,1184,1552 -OPT:Olimit=0"
+	     ccflags="$ccflags -D_BSD_TYPES -D_BSD_TIME -woff $woff -OPT:Olimit=0"
 	     optimize='-O3'
 # This is a temporary fix for 5.005.
 # Leave pp_ctl_cflags  line at left margin for Configure.  See 
@@ -201,15 +207,15 @@ case "$cc" in
 pp_ctl_cflags='optimize=-O'
 	     ;;
 	*7.*)                         # Mongoose 7.2.1+
-	     ccflags="$ccflags -D_BSD_TYPES -D_BSD_TIME -woff 1009,1110,1174,1184,1552 -OPT:Olimit=0:space=ON"
+	     ccflags="$ccflags -D_BSD_TYPES -D_BSD_TIME -woff $woff -OPT:Olimit=0:space=ON"
 	     optimize='-O3'
 	     ;;
 	*6.2*)                        # Ragnarok 6.2
-	     ccflags="$ccflags -D_BSD_TYPES -D_BSD_TIME -woff 1009,1110,1174,1184,1552"
+	     ccflags="$ccflags -D_BSD_TYPES -D_BSD_TIME -woff $woff"
 	     optimize='none'
 	     ;;
 	*)                            # Be safe and not optimize
-	     ccflags="$ccflags -D_BSD_TYPES -D_BSD_TIME -woff 1009,1110,1174,1184,1552 -OPT:Olimit=0"
+	     ccflags="$ccflags -D_BSD_TYPES -D_BSD_TIME -woff $woff -OPT:Olimit=0"
 	     optimize='none'
 	     ;;
 	esac
@@ -334,3 +340,15 @@ EOCBU
 
 # The -n32 makes off_t to be 8 bytes, so we should have largefileness.
 
+# Until we figure out what to be probe for in Configure (ditto for hpux.sh)
+case "$usemorebits" in # Need to expand this now, then.
+$define|true|[yY]*) use64bitint="$define"; uselongdouble="$define" ;;
+esac
+case "$use64bitint" in
+$define|true|[yY]*) ;;
+*) d_casti32='undef' ;;
+esac
+
+# Helmut Jarausch reports that Perl's malloc is rather unusable
+# with IRIX, and SGI confirms the problem.
+usemymalloc=${usemymalloc:-false}