Copy the Solaris 8 / Tru64 / IRIX 6 hints from blead,

thanks to Jarkko Hietaniemi

p4raw-id: //depot/maint-5.005/perl@22211

3 files changed, 1081 insertions, 305 deletions

diff --git a/hints/dec_osf.sh b/hints/dec_osf.sh
index 8758cbb820..114aca1df2 100644
--- a/hints/dec_osf.sh
+++ b/hints/dec_osf.sh
@@ -58,20 +58,58 @@
 # and it is called GEM. Many of the options we are going to use depend
 # on the compiler style.
 
-# do NOT, I repeat, *NOT* take away those leading tabs
+cc=${cc:-cc}
+
+case "`$cc -v 2>&1 | grep cc`" in
+*gcc*) isgcc=gcc ;;
+esac
+
+# do NOT, I repeat, *NOT* take away the leading tabs
+# Configure Black Magic (TM)
 	# reset
-	_DEC_uname_r=
 	_DEC_cc_style=
-	# set
-	_DEC_uname_r=`uname -r`
-	# _DEC_cc_style set soon below
-# Configure Black Magic (TM)
+case "$isgcc" in
+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 ($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).
+***
+*** 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.)
+
+Cannot continue, aborting.
 
-case "$cc" in
-*gcc*)	;; # pass
+EOF
+	    exit 1
+	fi
+	if test "$1" -eq 2 -a "$2" -eq 95 -a "$3" -le 2; then
+	    cat >&4 <<EOF
+
+*** Note that as of gcc 2.95.2 (19991024) and Perl 5.6.0 (March 2000)
+*** if the said Perl is compiled with the said gcc the lib/sdbm test
+*** may dump core (meaning that the SDBM_File extension is unusable).
+*** As this core dump never happens with the vendor cc, this is most
+*** probably a lingering bug in gcc.  Therefore unless you have a better
+*** gcc installation you are still better off using the vendor cc.
+
+Since you explicitly chose gcc, I assume that you know what are doing.
+
+EOF
+	fi
+        ;;
 *)	# compile something small: taint.c is fine for this.
+	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 /tmp/taint$$.o 2>&1`" in
+       	case "`cc -v -I. -c taint.c -o taint$$.o 2>&1`" in
 	*/gemc_cc*)	# we have the new DEC GEM CC
 			_DEC_cc_style=new
 			;;
@@ -80,13 +118,13 @@ case "$cc" in
 			;;
 	esac
 	# cleanup
-	rm -f /tmp/taint$$.o
+	rm -f taint$$.o
 	;;
 esac
 
 # be nauseatingly ANSI
-case "$cc" in
-*gcc*)	ccflags="$ccflags -ansi"
+case "$isgcc" in
+gcc)	ccflags="$ccflags -ansi"
 	;;
 *)	ccflags="$ccflags -std"
 	;;
@@ -98,13 +136,10 @@ esac
 # we want optimisation
 
 case "$optimize" in
-'')	case "$cc" in 
-	*gcc*)	
-		optimize='-O3'				;;
+'')	case "$isgcc" in
+	gcc)	optimize='-O3'				;;
 	*)	case "$_DEC_cc_style" in
-		new)	optimize='-O4'
-			ccflags="$ccflags -fprm d -ieee"
-			;;
+		new)	optimize='-O4'			;;
 		old)	optimize='-O2 -Olimit 3200'	;;
 	    	esac
 		ccflags="$ccflags -D_INTRINSICS"
@@ -113,6 +148,51 @@ 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)	;;
+*)	case "$_DEC_cc_style" in
+	new)	ccflags="$ccflags -fprm d -ieee"	;;
+	esac
+	;;
+esac
+
 # Make glibpth agree with the compiler suite.  Note that /shlib
 # is not here.  That's on purpose.  Even though that's where libc
 # really lives from V4.0 on, the linker (and /sbin/loader) won't
@@ -145,27 +225,47 @@ 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 "$_DEC_uname_r" in
+case "`uname -r`" in
 *[123].*)	# old loader
 		lddlflags="$lddlflags -O3"
 		;;
-*)		lddlflags="$lddlflags $optimize -msym"
-		# -msym: If using a sufficiently recent /sbin/loader,
-		# keep the module symbols with the modules.
+*)            if $test "X$optimize" = "X$undef"; then
+                      lddlflags="$lddlflags -msym"
+              else
+		  case "$myosvers" 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 -std"
+              fi
 		;;
 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.
 # As noted above the -DDEBUGGING is added automagically by Configure if -g.
 case "$optimize" in
 	*-g*) ;; # left intentionally blank
-*)	case "$_DEC_uname_r" in
+*)	case "`uname -r`" in
 	*[123].*)
 		case "$useshrplib" in
 		false|undef|'')	lddlflags="$lddlflags -s"	;;
@@ -187,38 +287,178 @@ case "$_DEC_cc_style.$useshrplib" in
 	new.)	useshrplib="$define"	;;
 esac
 
+# The EFF_ONLY_OK from <sys/access.h> is present but dysfunctional for
+# [RWX]_OK as of Digital UNIX 4.0[A-D]?.  If and when this gets fixed,
+# please adjust this appropriately.  See also pp_sys.c just before the
+# emulate_eaccess().
+
+# Fixed in V5.0A.
+case "$myosvers" in
+*5.0[A-Z]*|*5.[1-9]*|*[6-9].[0-9]*)
+	: ok
+	;;
+*)
+# V5.0 or previous
+pp_sys_cflags='ccflags="$ccflags -DNO_EFF_ONLY_OK"'
+	;;
+esac
+
+# The off_t is already 8 bytes, so we do have largefileness.
+
+cat > UU/usethreads.cbu <<'EOCBU'
 # 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 changed with V4.0.
-        case "`uname -r`" in
-        *[123].*)
-	    libswanted="$libswanted pthreads mach exc c_r"
-  	    ccflags="-threads $ccflags"
+	# 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"
 	    ;;
-        *)
-	    libswanted="$libswanted pthread exc"
-    	    ccflags="-pthread $ccflags"
+	*)  case "`uname -r`" in
+	    *[123].*)	ccflags="-threads $ccflags" ;;
+	    *)          ccflags="-pthread $ccflags" ;;
+	    esac
 	    ;;
-        esac
+	esac    
+	case "`uname -r`" in
+	*[123].*) libswanted="$libswanted pthreads mach exc c_r" ;;
+	*)        libswanted="$libswanted pthread exc" ;;
+	esac
 
-        usemymalloc='n'
+	case "$usemymalloc" in
+	'')
+		usemymalloc='n'
+		;;
+	esac
+	# These symbols are renamed in <time.h> so
+	# that the Configure hasproto doesn't see them.
+	d_asctime_r_proto="$define"
+	d_ctime_r_proto="$define"
+	d_gmtime_r_proto="$define"
+	d_localtime_r_proto="$define"
 	;;
 esac
 EOCBU
 
+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 "$myosvers" in
+	*[1-4].0*)	cat >&4 <<EOF
+
+***
+*** Sorry, you cannot use long doubles in pre-V5.0 releases of Tru64.
+***
+
+Cannot continue, aborting.
+
+EOF
+		exit 1
+		;;
+	*)
+		# Test whether libc's been fixed yet.
+		cat >try.c <<\TRY
+#include <stdio.h>
+int main(int argc, char **argv)
+{
+	unsigned long uvmax = ~0UL;
+	long double ld = uvmax + 0.0L;
+	char buf1[30], buf2[30];
+
+	(void) sprintf(buf1, "%lu", uvmax);
+	(void) sprintf(buf2, "%.0Lf", ld);
+	return strcmp(buf1, buf2) != 0;
+}
+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
+		then
+			: ok
+		else
+			cat <<\UGLY >&4
+!
+Warning!  Your libc has not yet been patched so that its "%Lf" format for
+printing long doubles shows all the significant digits.  You will get errors
+in the t/op/numconvert test because of this.  (The data is still good
+internally, and the "%e" format of printf() or sprintf() in perl will still
+produce valid results.)  See README.tru64 for additional details.
+
+Continuing anyway.
+!
+UGLY
+		fi
+		$rm -f try try.c
+	esac
+	;;
+esac
+EOCBU
+
+case "$myosvers" in
+*[1-4].0*) d_modfl=undef ;; # must wait till 5.0
+esac
+
+# Keep that leading tab.
+	old_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
+for p in $loclibpth
+do
+	if test -d $p; then
+	    echo "Appending $p to LD_LIBRARY_PATH." >& 4
+	    case "$LD_LIBRARY_PATH" in
+	    '') LD_LIBRARY_PATH=$p                  ;;
+	    *)  LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$p ;;
+	    esac
+	fi	
+done
+case "$LD_LIBRARY_PATH" in
+"$old_LD_LIBRARY_PATH") ;;
+*) echo "LD_LIBRARY_PATH is now $LD_LIBRARY_PATH." >& 4 ;;
+esac
+case "$LD_LIBRARY_PATH" in
+'') ;;
+* ) export LD_LIBRARY_PATH ;;
+esac
+
 #
 # Unset temporary variables no more needed.
 #
 
 unset _DEC_cc_style
-unset _DEC_uname_r
     
 #
 # History:
 #
+# perl5.005_51:
+#
+#	September-1998 Jarkko Hietaniemi <jhi@iki.fi>
+#
+#	* Added the -DNO_EFF_ONLY_OK flag ('use filetest;' support).
+#
 # perl5.004_57:
 #
 #	19-Dec-1997 Spider Boardman <spider@Orb.Nashua.NH.US>
diff --git a/hints/irix_6.sh b/hints/irix_6.sh
index 3250fc7d4a..51a4d75bc1 100644
--- a/hints/irix_6.sh
+++ b/hints/irix_6.sh
@@ -3,7 +3,7 @@
 # original from Krishna Sethuraman, krishna@sgi.com
 #
 # Modified Mon Jul 22 14:52:25 EDT 1996
-# 	Andy Dougherty <doughera@lafcol.lafayette.edu>
+# 	Andy Dougherty <doughera@lafayette.edu>
 # 	with help from Dean Roehrich <roehrich@cray.com>.
 #   cc -n32 update info from Krishna Sethuraman, krishna@sgi.com.
 #       additional update from Scott Henry, scotth@sgi.com
@@ -13,9 +13,8 @@
 #    - tries to check for various compiler versions and do the right 
 #      thing when it can
 #    - warnings turned off (-n32 messages):
-#       1116 - non-void function should return a value
-#       1048 - cast between pointer-to-object and pointer-to-function
-#       1042 - operand types are incompatible
+#       1184 - "=" is used where where "==" may have been intended
+#       1552 - variable "foo" set but never used
 
 # Tweaked by Chip Salzenberg <chip@perl.com> on 5/13/97
 #    - don't assume 'cc -n32' if the n32 libm.so is missing
@@ -25,25 +24,204 @@
 
 # gcc-enabled by Kurt Starsinic <kstar@isinet.com> on 3/24/1998
 
+# 64-bitty by Jarkko Hietaniemi on 9/1998
+
 # Use   sh Configure -Dcc='cc -n32' to try compiling with -n32.
 #     or -Dcc='cc -n32 -mips3' (or -mips4) to force (non)portability
 # Don't bother with -n32 unless you have the 7.1 or later compilers.
 #     But there's no quick and light-weight way to check in 6.2.
 
+# NOTE: some IRIX cc versions, e.g. 7.3.1.1m (try cc -version) have
+# been known to have issues (coredumps) when compiling perl.c.
+# If you've used -OPT:fast_io=ON and this happens, try removing it.
+# If that fails, or you didn't use that, then try adjusting other
+# optimization options (-LNO, -INLINE, -O3 to -O2, etcetera).
+# The compiler bug has been reported to SGI.
+# -- Allen Smith <allens@cpan.org>
+
+case "$use64bitall" in
+$define|true|[yY]*)
+    case "`uname -s`" in
+       IRIX)
+           cat <<END >&2
+You have asked for use64bitall but you aren't running on 64-bit IRIX.
+I'll try changing it to use64bitint.
+END
+       use64bitall="$undef"
+
+       case "`uname -r`" in
+           [1-5]*|6.[01])
+               cat <<END >&2
+Sorry, can't do use64bitint either. Try upgrading to IRIX 6.2 or later.
+END
+               use64bitint="$undef"
+           ;;
+           *) use64bitint="$define"
+           ;;
+       esac
+       ;;
+    esac
+    ;;
+esac
+
+# Until we figure out what to be probed for in Configure (ditto for hpux.sh)
+case "$usemorebits" in # Need to expand this now, then.
+$define|true|[yY]*)
+    case "`uname -r`" in
+           [1-5]*|6.[01])
+               uselongdouble="$define"
+               ;;
+           *) use64bitint="$define" uselongdouble="$define" ;;
+    esac
+esac
+
 # Let's assume we want to use 'cc -n32' by default, unless the
 # necessary libm is missing (which has happened at least twice)
 case "$cc" in
-'')
-    if test -f /usr/lib32/libm.so
-    then
-	cc='cc -n32'
-    fi ;;
+'') case "$use64bitall" in
+    "$define"|true|[yY]*) test -f /usr/lib64/libm.so && cc='cc -64' ;;
+    *) test -f /usr/lib32/libm.so && cc='cc -n32' ;;
+    esac    	
+esac
+
+case "$use64bitint" in
+    "$define"|true|[yY]*) ;;
+    *)  d_casti32="$undef" ;;
+esac
+
+cc=${cc:-cc}
+cat=${cat:-cat}
+
+$cat > UU/cc.cbu <<'EOCCBU'
+# This script UU/cc.cbu will get 'called-back' by Configure after it
+# has prompted the user for the C compiler to use.
+
+case "$cc" in
+*gcc*) ;;
+*) ccversion=`cc -version 2>&1` ;;
 esac
 
 # Check for which compiler we're using
 
 case "$cc" in
 *"cc -n32"*)
+    test -z "$ldlibpthname" && ldlibpthname='LD_LIBRARYN32_PATH'
+
+	# If a library is requested to link against, make sure the
+	# objects in the library are of the same ABI we are compiling
+	# against. Albert Chin-A-Young <china@thewrittenword.com>
+
+       # In other words, you no longer have to worry regarding having old
+       # library paths (/usr/lib) in the searchpath for -n32 or -64; thank
+       # you very much, Albert! Now if we could just get more module authors
+       # to use something like this... - Allen
+
+	libscheck='case "$xxx" in
+*.a) /bin/ar p $xxx `/bin/ar t $xxx | sed q` >$$.o;
+  case "`/usr/bin/file $$.o`" in
+  *N32*) rm -f $$.o ;;
+  *) rm -f $$.o; xxx=/no/n32$xxx ;;
+  esac ;;
+*) case "`/usr/bin/file $xxx`" in
+  *N32*) ;;
+  *) xxx=/no/n32$xxx ;;
+  esac ;;
+esac'
+
+	# NOTE: -L/usr/lib32 -L/lib32 are automatically selected by the linker
+       test -z "$ldflags" && ldflags=' -L/usr/local/lib32 -L/usr/local/lib'
+	cccdlflags=' '
+    # From: David Billinghurst <David.Billinghurst@riotinto.com.au>
+    # If you get complaints about so_locations then change the following
+    # line to something like:
+    #	lddlflags="-n32 -shared -check_registry /usr/lib32/so_locations"
+       test -z "$lddlflags" && lddlflags="-n32 -shared"
+       test -z "$libc" && libc='/usr/lib32/libc.so'
+       test -z "$plibpth" && plibpth='/usr/lib32 /lib32 /usr/ccs/lib'
+	;;
+*"cc -64"*)
+    case "`uname -s`" in
+    IRIX)
+	$cat >&4 <<EOM
+You cannot use cc -64 or -Duse64bitall in 32-bit IRIX, sorry.
+Cannot continue, aborting.
+EOM
+       exit 1
+       ;;
+    esac
+       test -z "$ldlibpthname" && ldlibpthname='LD_LIBRARY64_PATH'
+       test -z "$use64bitall" && use64bitall="$define"
+       test -z "$use64bitint" && use64bitint="$define"
+	loclibpth="$loclibpth /usr/lib64"
+	libscheck='case "`/usr/bin/file $xxx`" in
+*64-bit*) ;;
+*) xxx=/no/64-bit$xxx ;;
+esac'
+	# NOTE: -L/usr/lib64 -L/lib64 are automatically selected by the linker
+       test -z "$ldflags" && ldflags=' -L/usr/local/lib64 -L/usr/local/lib'
+	cccdlflags=' '
+       test -z "$archname64" && archname64='64all'
+    # From: David Billinghurst <David.Billinghurst@riotinto.com.au>
+    # If you get complaints about so_locations then change the following
+    # line to something like:
+    #	lddlflags="-64 -shared -check_registry /usr/lib64/so_locations"
+       test -z lddlflags="-64 -shared"
+       test -z "$libc" && libc='/usr/lib64/libc.so'
+       test -z "$plibpth" && plibpth='/usr/lib64 /lib64 /usr/ccs/lib'
+	;;
+*gcc*)
+	ccflags="$ccflags -D_BSD_TYPES -D_BSD_TIME"
+       test -z "$optimize" && optimize="-O3"
+	usenm='undef'
+	case "`uname -s`" in
+	# Without the -mabi=64 gcc in 64-bit IRIX has problems passing
+	# and returning small structures.  This affects inet_*() and semctl().
+	# See http://reality.sgi.com/ariel/freeware/gcc-2.8.1-notes.html
+	# for more information.  Reported by Lionel Cons <lionel.cons@cern.ch>.
+	IRIX64)	ccflags="$ccflags -mabi=64"
+		ldflags="$ldflags -mabi=64 -L/usr/lib64"
+		lddlflags="$lddlflags -mabi=64"
+		;;
+	*)	ccflags="$ccflags -DIRIX32_SEMUN_BROKEN_BY_GCC"
+		;;
+	esac
+	;;
+*)
+	# this is needed to force the old-32 paths
+	#  since the system default can be changed.
+	ccflags="$ccflags -32 -D_BSD_TYPES -D_BSD_TIME -Olimit 3100"
+	optimize='-O'	  
+	;;
+esac
+
+# Settings common to both native compiler modes.
+case "$cc" in
+*"cc -n32"*|*"cc -64"*)
+       test -z "$ld" && ld=$cc
+
+	# perl's malloc can return improperly aligned buffer
+	# which (under 5.6.0RC1) leads into really bizarre bus errors
+	# and freak test failures (lib/safe1 #18, for example),
+	# even more so with -Duse64bitall: for example lib/io_linenumtb.
+	# fails under the harness but succeeds when run separately,
+	# under make test pragma/warnings #98 fails, and lib/io_dir
+	# apparently coredumps (the last two don't happen under
+    	# the harness.  Helmut Jarausch is seeing bus errors from
+        # miniperl, as was Scott Henry with snapshots from just before
+	# the RC1. --jhi
+	usemymalloc='undef'
+
+       # Was at the first of the line - Allen
+       #malloc_cflags='ccflags="-DSTRICT_ALIGNMENT $ccflags"'
+
+       nm_opt="$nm_opt -p"
+       nm_so_opt="$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.
@@ -52,28 +230,49 @@ 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,1184 -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,1184 -OPT:Olimit=0"
-	     optimize='-O3'
-# This is a temporary fix for 5.005.
-# Leave pp_ctl_cflags  line at left margin for Configure.  See 
-# hints/README.hints, especially the section 
-# =head2 Propagating variables to config.sh
-pp_ctl_cflags='optimize=-O'
+            ccflags="$ccflags -D_BSD_TYPES -D_BSD_TIME -woff $woff"
+            case "$optimize" in
+               '') optimize='-O3 -OPT:Olimit=0' ;;
+               '-O') optimize='-O3 -OPT:Olimit=0' ;;
+               *) ;;
+            esac
+
+           # This is a temporary fix for 5.005+.
+           # See hints/README.hints, especially the section
+           # =head2 Propagating variables to config.sh
+
+           # Note the part about case statements not working without
+           # weirdness like the below echo statement... and, since
+           # we're in a callback unit, it's to config.sh, not UU/config.sh
+           # - Allen
+
+
+           pp_ctl_cflags="$pp_ctl_flags optimize=\"$optimize -O1\""
+           echo "pp_ctl_cflags=\"$pp_ctl_flags optimize=\\\"\$optimize -O1\\\"\"" >> config.sh
 	     ;;
+
+
+
+# XXX What is space=ON doing in here? Could someone ask Scott Henry? - Allen
+
 	*7.*)                         # Mongoose 7.2.1+
-	     ccflags="$ccflags -D_BSD_TYPES -D_BSD_TIME -woff 1009,1110,1184 -OPT:Olimit=0:space=ON"
-	     optimize='-O3'
+            ccflags="$ccflags -D_BSD_TYPES -D_BSD_TIME -woff $woff"
+            case "$optimize" in
+               '') optimize='-O3 -OPT:Olimit=0:space=ON' ;;
+               '-O') optimize='-O3 -OPT:Olimit=0:space=ON' ;;
+               *) ;;
+            esac
 	     ;;
 	*6.2*)                        # Ragnarok 6.2
-	     ccflags="$ccflags -D_BSD_TYPES -D_BSD_TIME -woff 1009,1110,1184"
+	     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,1184 -OPT:Olimit=0"
+	     ccflags="$ccflags -D_BSD_TYPES -D_BSD_TIME -woff $woff"
 	     optimize='none'
 	     ;;
 	esac
@@ -89,56 +288,53 @@ pp_ctl_cflags='optimize=-O'
 # absolute paths (again, see the pthread.h change below). 
 # -- krishna@sgi.com, 8/23/98
 
-if [ "X${TOOLROOT}" != "X" ]; then
-# we cant set cppflags because it gets overwritten
-# we dont actually need $TOOLROOT/usr/include on the cc line cuz the 
-# modules functionality already includes it but
-# XXX - how do I change cppflags in the hints file?
-	ccflags="$ccflags -I${TOOLROOT}/usr/include"
+	if [ "X${TOOLROOT}" != "X" ]; then
+	# we cant set cppflags because it gets overwritten
+	# we dont actually need $TOOLROOT/usr/include on the cc line cuz the 
+	# modules functionality already includes it but
+	# XXX - how do I change cppflags in the hints file?
+		ccflags="$ccflags -I${TOOLROOT}/usr/include"
 	usrinc="${TOOLROOT}/usr/include"
-fi
+        fi
 
-	ld=$cc
-	# perl's malloc can return improperly aligned buffer
-	# usemymalloc='undef'
-malloc_cflags='ccflags="-DSTRICT_ALIGNMENT $ccflags"'
-	# NOTE: -L/usr/lib32 -L/lib32 are automatically selected by the linker
-	ldflags=' -L/usr/local/lib32 -L/usr/local/lib'
-	cccdlflags=' '
-    # From: David Billinghurst <David.Billinghurst@riotinto.com.au>
-    # If you get complaints about so_locations then change the following
-    # line to something like:
-    #	lddlflags="-n32 -shared -check_registry /usr/lib32/so_locations"
-	lddlflags="-n32 -shared"
-	libc='/usr/lib32/libc.so'
-	plibpth='/usr/lib32 /lib32 /usr/ccs/lib'
-	nm_opt='-p'
-	nm_so_opt='-p'
-	;;
-*gcc*)
-	ccflags="$ccflags -D_BSD_TYPES -D_BSD_TIME -D_POSIX_C_SOURCE"
-	optimize="-O3"
-	usenm='undef'
-	;;
-*)
-	# this is needed to force the old-32 paths
-	#  since the system default can be changed.
-	ccflags="$ccflags -32 -D_BSD_TYPES -D_BSD_TIME -Olimit 3100"
-	optimize='-O'	  
 	;;
 esac
 
+# workaround for an optimizer bug
+# Made to work via UU/config.sh thing (or, rather, config.sh, since we're in
+# a callback) from README.hints, plus further stuff; doesn't handle -g still,
+# unfortunately - Allen
+case "`$cc -version 2>&1`" in
+*7.2.*)
+    test -z "$op_cflags" && echo "op_cflags=\"optimize=\\\"\$optimize -O1\\\"\"" >> config.sh
+    test -z "$op_cflags" && op_cflags="optimize=\"\$optimize -O1\""
+    test -z "$opmini_cflags" && echo "opmini_cflags=\"optimize=\\\"\$optimize -O1\\\"\"" >> config.sh
+    test -z "$opmini_cflags" && opmini_cflags="optimize=\"\$optimize -O1\""
+    ;;
+*7.3.1.*)
+    test -z "$op_cflags" && echo "op_cflags=\"optimize=\\\"\$optimize -O2\\\"\"" >> config.sh
+    test -z "$op_cflags" && op_cflags="$op_cflags optimize=\"\$optimize -O2\""
+    test -z "$opmini_cflags" && echo "opmini_cflags=\"optimize=\\\"\$optimize -O2\\\"\"" >> config.sh
+    test -z "$opmini_cflags" && opmini_cflags="optimize=\"\$optimize -O2\""
+    ;;
+esac
+
+EOCCBU
+
+# End of cc.cbu callback unit. - Allen
+
 # We don't want these libraries.
 # Socket networking is in libc, these are not installed by default,
 # and just slow perl down. (scotth@sgi.com)
-set `echo X "$libswanted "|sed -e 's/ socket / /' -e 's/ nsl / /' -e 's/ dl / /'`
+# librt contains nothing we need (some places need it for Time::HiRes) --jhi
+set `echo X "$libswanted "|sed -e 's/ socket / /' -e 's/ nsl / /' -e 's/ dl / /' -e 's/ rt / /'`
 shift
 libswanted="$*"
 
 # I have conflicting reports about the sun, crypt, bsd, and PW
 # libraries on Irix 6.2.
 #
-# One user rerports:
+# One user reports:
 # Don't need sun crypt bsd PW under 6.2.  You *may* need to link
 # with these if you want to run perl built under 6.2 on a 5.3 machine
 # (I haven't checked)
@@ -159,9 +355,35 @@ set `echo X "$libswanted "|sed -e 's/ sun / /' -e 's/ crypt / /' -e 's/ bsd / /'
 shift
 libswanted="$*"
 
+# libbind.{so|a} would be from a BIND/named installation - IRIX 6.5.* has
+# pretty much everything that would be useful in libbind in libc, including
+# accessing a local caching server (nsd) that will also look in /etc/hosts,
+# NIS (yuck!), etcetera. libbind also doesn't have the _r (thread-safe
+# reentrant) functions.
+# - Allen <easmith@beatrice.rutgers.edu>
+
+case "`uname -r`" in
+6.5)
+    set `echo X "$libswanted "|sed -e 's/ bind / /'`
+    shift
+    libswanted="$*"
+    ;;
+esac
+
+# Don't groan about unused libraries.
+case "$ldflags" in
+    *-Wl,-woff,84*) ;;
+    *) ldflags="$ldflags -Wl,-woff,84" ;;
+esac
+
+# Irix 6.5.6 seems to have a broken header <sys/mode.h>
+# don't include that (it doesn't contain S_IFMT, S_IFREG, et al)
+
+i_sysmode="$undef"
+
+$cat > UU/usethreads.cbu <<'EOCBU'
 # 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]*)
         if test ! -f ${TOOLROOT}/usr/include/pthread.h -o ! -f /usr/lib/libpthread.so; then
@@ -200,12 +422,194 @@ EOM
             exit 1
         fi
         set `echo X "$libswanted "| sed -e 's/ c / pthread /'`
-        ld="${cc:-cc}"
         shift
         libswanted="$*"
 
         usemymalloc='n'
+
+	# These are hidden behind a _POSIX1C ifdef that would
+	# require including <pthread.h> for the Configure hasproto
+	# to see these.
+
+#      d_asctime_r_proto="$define"
+#      d_ctime_r_proto="$define"
+#      d_gmtime_r_proto="$define"
+#      d_localtime_r_proto="$define"
+
+       # Safer just to go ahead and include it, for other ifdefs like them
+       # (there are a lot, such as in netdb.h). - Allen
+       ccflags="$ccflags -DPTHREAD_H_FIRST"
+
+       pthread_h_first="$define"
+       echo "pthread_h_first='define'" >> config.sh
+
 	;;
+
+esac
+EOCBU
+
+# The -n32 makes off_t to be 8 bytes, so we should have largefileness.
+
+$cat > UU/use64bitint.cbu <<'EOCBU'
+# This script UU/use64bitint.cbu will get 'called-back' by Configure
+# after it has prompted the user for whether to use 64 bit integers.
+
+case "$use64bitint" in
+$define|true|[yY]*)
+           case "`uname -r`" in
+           [1-5]*|6.[01])
+               cat >&4 <<EOM
+IRIX `uname -r` does not support 64-bit types.
+You should upgrade to at least IRIX 6.2.
+Cannot continue, aborting.
+EOM
+               exit 1
+               ;;
+            esac
+    usemymalloc="$undef"
+    ;;
+*) d_casti32="$undef" ;;
+esac
+
+EOCBU
+
+$cat > UU/use64bitall.cbu <<'EOCBU'
+# This script UU/use64bitall.cbu will get 'called-back' by Configure
+# after it has prompted the user for whether to be maximally 64 bitty.
+
+case "$use64bitall" in
+$define|true|[yY]*)
+    case "$cc" in
+       *-n32*|*-32*)
+           cat >&4 <<EOM
+You cannot use a non-64 bit cc for -Duse64bitall, sorry.
+Cannot continue, aborting.
+EOM
+           exit 1
+       ;;
+    esac
+    ;;
+esac
+
+EOCBU
+
+$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.
+
+# This script is designed to test IRIX (and other machines, once it's put into
+# Configure) for a bug in which they fail to round correctly when using
+# sprintf/printf/etcetera on a long double with precision specified (%.0Lf or
+# whatever). Sometimes, this only happens when the number in question is
+# between 1 and -1, weirdly enough. - Allen
+
+case "$uselongdouble" in
+$define|true|[yY]*)
+
+case "$d_PRIfldbl" in
+$define|true|[yY]*)
+
+    echo " " >try.c
+    $cat >>try.c <<EOP
+#include <stdio.h>
+
+#define sPRIfldbl $sPRIfldbl
+
+#define I_STDLIB $i_stdlib
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
+
+int main()
+{ 
+        char buf1[64];
+ 	char buf2[64];
+        buf1[63] = '\0';
+	buf2[63] = '\0';
+
+	(void)sprintf(buf1,"%.0"sPRIfldbl,(long double)0.6L);
+	(void)sprintf(buf2,"%.0f",(double)0.6);
+	if (strcmp(buf1,buf2)) {
+	    exit(1);
+	}
+	(void)sprintf(buf1,"%.0"sPRIfldbl,(long double)-0.6L);
+	(void)sprintf(buf2,"%.0f",(double)-0.6);
+	if (strcmp(buf1,buf2)) {
+	    exit(1);
+	} else {
+	    exit(0);
+	}
+}
+
+EOP
+
+    set try
+    if eval $compile && $run ./try; then
+	rm -f try try.* >/dev/null
+    else
+	rm -f try try.* core a.out >/dev/null
+	ccflags="$ccflags -DHAS_LDBL_SPRINTF_BUG"
+	cppflags="$cppflags -DHAS_LDBL_SPRINTF_BUG"
+
+        echo " " >try.c
+    $cat >>try.c <<EOP
+#include <stdio.h>
+
+#define sPRIfldbl $sPRIfldbl
+
+#define I_STDLIB $i_stdlib
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
+
+int main()
+{ 
+        char buf1[64];
+ 	char buf2[64];
+        buf1[63] = '\0';
+	buf2[63] = '\0';
+
+	(void)sprintf(buf1,"%.0"sPRIfldbl,(long double)1.6L);
+	(void)sprintf(buf2,"%.0f",(double)1.6);
+	if (strcmp(buf1,buf2)) {
+	    exit(1);
+	}
+	(void)sprintf(buf1,"%.0"sPRIfldbl,(long double)-1.6L);
+	(void)sprintf(buf2,"%.0f",(double)-1.6);
+	if (strcmp(buf1,buf2)) {
+	    exit(1);
+	} else {
+	    exit(0);
+	}
+}
+
+EOP
+
+	set try
+	if eval $compile && $run ./try; then
+	    rm -f try try.c >/dev/null
+	    ccflags="$ccflags -DHAS_LDBL_SPRINTF_BUG_LESS1"
+	    cppflags="$cppflags -DHAS_LDBL_SPRINTF_BUG_LESS1"
+	else
+	    rm -f try try.c core try.o a.out >/dev/null
+	fi
+    fi
+;;
+*) # Can't tell!
+   ccflags="$ccflags -DHAS_LDBL_SPRINTF_BUG"
+   cppflags="$cppflags -DHAS_LDBL_SPRINTF_BUG"
+   ;;
 esac
+
+# end of case statement for how to print ldbl with 'f'
+;;
+*) ;;
+esac
+
+# end of case statement for whether to do long doubles
+
 EOCBU
 
+# Helmut Jarausch reports that Perl's malloc is rather unusable
+# with IRIX, and SGI confirms the problem.
+usemymalloc=${usemymalloc:-false}
diff --git a/hints/solaris_2.sh b/hints/solaris_2.sh
index 935f00d877..7ffc53c6ef 100644
--- a/hints/solaris_2.sh
+++ b/hints/solaris_2.sh
@@ -1,32 +1,50 @@
 # hints/solaris_2.sh
-# Last modified:  Wed May 27 13:04:45 EDT 1998
-# Andy Dougherty  <doughera@lafcol.lafayette.edu>
-# Based on input from lots of folks, especially
-# Dean Roehrich <roehrich@ironwood-fddi.cray.com>
+# Contributions by (in alphabetical order) Alan Burlison, Andy Dougherty,
+# Dean Roehrich, Jarkko Hietaniemi, Lupe Christoph, Richard Soderberg and
+# many others.
+#
+# See README.solaris for additional information.
+#
+# For consistency with gcc, we do not adopt Sun Marketing's
+# removal of the '2.' prefix from the Solaris version number.
+# (Configure tries to detect an old fixincludes and needs
+# this information.)
 
 # If perl fails tests that involve dynamic loading of extensions, and
 # you are using gcc, be sure that you are NOT using GNU as and ld.  One
 # way to do that is to invoke Configure with
-# 
+#
 #     sh Configure -Dcc='gcc -B/usr/ccs/bin/'
-# 
- 
-# See man vfork.
-usevfork=false
+#
+#  (Note that the trailing slash is *required*.)
+#  gcc will occasionally emit warnings about "unused prefix", but
+#  these ought to be harmless.  See below for more details.
+
+# Solaris has secure SUID scripts
+d_suidsafe=${d_suidsafe:-define}
+
+# Be paranoid about nm failing to find symbols
+mistrustnm=${mistrustnm:-run}
 
-d_suidsafe=define
+# Several people reported problems with perl's malloc, especially
+# when use64bitall is defined or when using gcc.
+#     http://www.xray.mpe.mpg.de/mailing-lists/perl5-porters/2001-01/msg01318.html
+#     http://www.xray.mpe.mpg.de/mailing-lists/perl5-porters/2001-01/msg00465.html
+usemymalloc=${usemymalloc:-false}
 
 # Avoid all libraries in /usr/ucblib.
-set `echo $glibpth | sed -e 's@/usr/ucblib@@'`
+# /lib is just a symlink to /usr/lib
+set `echo $glibpth | sed -e 's@/usr/ucblib@@' -e 's@ /lib @ @'`
 glibpth="$*"
 
-# Remove bad libraries.  -lucb contains incompatible routines.
-# -lld doesn't do anything useful.
+# Remove unwanted libraries.  -lucb contains incompatible routines.
+# -lld and -lsec don't do anything useful. -lcrypt does not
+# really provide anything we need over -lc, so we drop it, too.
 # -lmalloc can cause a problem with GNU CC & Solaris.  Specifically,
 # libmalloc.a may allocate memory that is only 4 byte aligned, but
 # GNU CC on the Sparc assumes that doubles are 8 byte aligned.
 # Thanks to  Hallvard B. Furuseth <h.b.furuseth@usit.uio.no>
-set `echo " $libswanted " | sed -e 's@ ld @ @' -e 's@ malloc @ @' -e 's@ ucb @ @'`
+set `echo " $libswanted " | sed -e 's@ ld @ @' -e 's@ malloc @ @' -e 's@ ucb @ @' -e 's@ sec @ @' -e 's@ crypt @ @'`
 libswanted="$*"
 
 # Look for architecture name.  We want to suggest a useful default.
@@ -42,21 +60,49 @@ case "$archname" in
     ;;
 esac
 
+#
+# This extracts the library directories that will be searched by the Sun
+# Workshop compiler, given the command-line supplied in $tryworkshopcc.
+# Use thusly: loclibpth="`$getworkshoplibs` $loclibpth"
+#
+	getworkshoplibs=`cat <<'END'
+eval $tryworkshopcc -### 2>&1 | \
+sed -n '/ -Y /s!.* -Y "P,\([^"]*\)".*!\1!p' | tr ':' ' ' | \
+sed -e 's!/usr/lib/sparcv9!!' -e 's!/usr/ccs/lib/sparcv9!!' \
+    -e 's!/usr/lib!!g' -e 's!/usr/ccs/lib!!g'
+END
+`
+
+case "$cc" in
+'')	if test -f /opt/SUNWspro/bin/cc; then
+		cc=/opt/SUNWspro/bin/cc
+		cat <<EOF >&4	
+
+You specified no cc but you seem to have the Workshop compiler
+($cc) installed, using that.
+If you want something else, specify that in the command line,
+e.g. Configure -Dcc=gcc
+
+EOF
+	fi
+	;;
+esac
+
 ######################################################
 # General sanity testing.  See below for excerpts from the Solaris FAQ.
-
+#
 # From roehrich@ironwood-fddi.cray.com Wed Sep 27 12:51:46 1995
 # Date: Thu, 7 Sep 1995 16:31:40 -0500
 # From: Dean Roehrich <roehrich@ironwood-fddi.cray.com>
 # To: perl5-porters@africa.nicoh.com
 # Subject: Re: On perl5/solaris/gcc
-
-# Here's another draft of the perl5/solaris/gcc sanity-checker. 
+#
+# Here's another draft of the perl5/solaris/gcc sanity-checker.
 
 case `type ${cc:-cc}` in
 */usr/ucb/cc*) cat <<END >&4
 
-NOTE:  Some people have reported problems with /usr/ucb/cc.  
+NOTE:  Some people have reported problems with /usr/ucb/cc.
 If you have difficulties, please make sure the directory
 containing your C compiler is before /usr/ucb in your PATH.
 
@@ -67,7 +113,7 @@ esac
 
 # Check that /dev/fd is mounted.  If it is not mounted, let the
 # user know that suid scripts may not work.
-/usr/bin/df /dev/fd 2>&1 > /dev/null
+mount | grep '^/dev/fd ' 2>&1 > /dev/null
 case $? in
 0) ;;
 *)
@@ -114,7 +160,7 @@ if grep GNU make.vers > /dev/null 2>&1; then
     case "`/usr/bin/ls -lL $tmp`" in
     ??????s*)
 	    cat <<END >&2
-	
+
 NOTE: Your PATH points to GNU make, and your GNU make has the set-group-id
 bit set.  You must either rearrange your PATH to put /usr/ccs/bin before the
 GNU utilities or you must ask your system administrator to disable the
@@ -126,22 +172,37 @@ END
 fi
 rm -f make.vers
 
-# XXX EXPERIMENTAL  A.D.  2/27/1998
-# XXX This script UU/cc.cbu will get 'called-back' by Configure after it
-# XXX has prompted the user for the C compiler to use.
-cat > UU/cc.cbu <<'EOSH'
+cat > UU/cc.cbu <<'EOCBU'
+# This script UU/cc.cbu will get 'called-back' by Configure after it
+# has prompted the user for the C compiler to use.
+
 # If the C compiler is gcc:
 #   - check the fixed-includes
 #   - check as(1) and ld(1), they should not be GNU
 #	(GNU as and ld 2.8.1 and later are reportedly ok, however.)
 # If the C compiler is not gcc:
+#   - Check if it is the Workshop/Forte compiler.
+#     If it is, prepare for 64 bit and long doubles.
 #   - check as(1) and ld(1), they should not be GNU
 #	(GNU as and ld 2.8.1 and later are reportedly ok, however.)
 #
 # Watch out in case they have not set $cc.
 
+# Perl compiled with some combinations of GNU as and ld may not
+# be able to perform dynamic loading of extensions.  If you have a
+# problem with dynamic loading, be sure that you are using the Solaris
+# /usr/ccs/bin/as and /usr/ccs/bin/ld.  You can do that with
+#  		sh Configure -Dcc='gcc -B/usr/ccs/bin/'
+# (note the trailing slash is required).
+# Combinations that are known to work with the following hints:
+#
+#  gcc-2.7.2, GNU as 2.7, GNU ld 2.7
+#  egcs-1.0.3, GNU as 2.9.1 and GNU ld 2.9.1
+#	--Andy Dougherty  <doughera@lafayette.edu>
+#	Tue Apr 13 17:19:43 EDT 1999
+
 # Get gcc to share its secrets.
-echo 'main() { return 0; }' > try.c
+echo 'int main() { return 0; }' > try.c
 	# Indent to avoid propagation to config.sh
 	verbose=`${cc:-cc} -v -o try try.c 2>&1`
 
@@ -149,75 +210,105 @@ if echo "$verbose" | grep '^Reading specs from' >/dev/null 2>&1; then
 	#
 	# Using gcc.
 	#
-	#echo Using gcc
+	cc_name='gcc'
 
-	tmp=`echo "$verbose" | grep '^Reading' |
-		awk '{print $NF}'  | sed 's/specs$/include/'`
-
-	# Determine if the fixed-includes look like they'll work.
-	# Doesn't work anymore for gcc-2.7.2.
-
-	# See if as(1) is GNU as(1).  GNU as(1) won't work for this job.
+	# See if as(1) is GNU as(1).  GNU as(1) might not work for this job.
 	if echo "$verbose" | grep ' /usr/ccs/bin/as ' >/dev/null 2>&1; then
 	    :
 	else
 	    cat <<END >&2
 
-NOTE: You are using GNU as(1).  GNU as(1) will not build Perl.
-I'm arranging to use /usr/ccs/bin/as by including -B/usr/ccs/bin/
+NOTE: You are using GNU as(1).  GNU as(1) might not build Perl.  If you
+have trouble, you can use /usr/ccs/bin/as by including -B/usr/ccs/bin/
 in your ${cc:-cc} command.  (Note that the trailing "/" is required.)
 
 END
-	    cc="${cc:-cc} -B/usr/ccs/bin/"
+	    # Apparently not needed, at least for as 2.7 and later.
+	    # cc="${cc:-cc} -B/usr/ccs/bin/"
 	fi
 
-	# See if ld(1) is GNU ld(1).  GNU ld(1) won't work for this job.
+	# See if ld(1) is GNU ld(1).  GNU ld(1) might not work for this job.
 	# Recompute $verbose since we may have just changed $cc.
 	verbose=`${cc:-cc} -v -o try try.c 2>&1 | grep ld 2>&1`
+
 	if echo "$verbose" | grep ' /usr/ccs/bin/ld ' >/dev/null 2>&1; then
+	    # Ok, gcc directly calls the Solaris /usr/ccs/bin/ld.
+	    :
+	elif echo "$verbose" | grep "ld: Software Generation Utilities" >/dev/null 2>&1; then
+	    # Hmm.  gcc doesn't call /usr/ccs/bin/ld directly, but it
+	    # does appear to be using it eventually.  egcs-1.0.3's ld
+	    # wrapper does this.
+	    # All Solaris versions of ld I've seen contain the magic
+	    # string used in the grep.
 	    :
 	else
-        # It's not /usr/ccs/bin/ld - but it might be egcs's ld wrapper,
-        # which calls /usr/ccs/bin/ld in turn. Passing -V to it will
-        # make it show its true colors.
-
-	    myld=`echo $verbose| grep ld | awk '/\/ld/ {print $1}'`
-            # This assumes that gcc's output will not change, and that
-            # /full/path/to/ld will be the first word of the output.
+	    # No evidence yet of /usr/ccs/bin/ld.  Some versions
+	    # of egcs's ld wrapper call /usr/ccs/bin/ld in turn but
+	    # apparently don't reveal that unless you pass in -V.
+	    # (This may all depend on local configurations too.)
 
-            # all Solaris versions of ld I've seen contain the magic
-            # string used in the grep below.
-            if $myld -V 2>&1 | grep "ld: Software Generation Utilities" >/dev/null 2>&1; then
-                cat <<END >&2
+	    # Recompute verbose with -Wl,-v to find GNU ld if present
+	    verbose=`${cc:-cc} -v -Wl,-v -o try try.c 2>&1 | grep ld 2>&1`
 
-Aha. You're using egcs and /usr/ccs/bin/ld.
-
-END
-
-            else
-	    cat <<END >&2
+	    myld=`echo $verbose| grep ld | awk '/\/ld/ {print $1}'`
+	    # This assumes that gcc's output will not change, and that
+	    # /full/path/to/ld will be the first word of the output.
+	    # Thus myld is something like /opt/gnu/sparc-sun-solaris2.5/bin/ld
+
+	    # Allow that $myld may be '', due to changes in gcc's output 
+	    if ${myld:-ld} -V 2>&1 |
+		grep "ld: Software Generation Utilities" >/dev/null 2>&1; then
+		# Ok, /usr/ccs/bin/ld eventually does get called.
+		:
+	    else
+		echo "Found GNU ld='$myld'" >&4
+		cat <<END >&2
 
-NOTE: You are using GNU ld(1).  GNU ld(1) will not build Perl.
-I'm arranging to use /usr/ccs/bin/ld by including -B/usr/ccs/bin/
+NOTE: You are using GNU ld(1).  GNU ld(1) might not build Perl.  If you
+have trouble, you can use /usr/ccs/bin/ld by including -B/usr/ccs/bin/
 in your ${cc:-cc} command.  (Note that the trailing "/" is required.)
 
+I will try to use GNU ld by passing in the -Wl,-E flag, but if that
+doesn't work, you should use -B/usr/ccs/bin/ instead.
+
 END
-	    cc="${cc:-cc} -B/usr/ccs/bin/"
-            fi
+		ccdlflags="$ccdlflags -Wl,-E"
+		lddlflags="$lddlflags -Wl,-E -G"
+	    fi
 	fi
 
 else
 	#
 	# Not using gcc.
 	#
-	#echo Not using gcc
+	cat > try.c << 'EOM'
+#include <stdio.h>
+int main() {
+#ifdef __SUNPRO_C
+	printf("workshop\n");
+#else
+	printf("\n");
+#endif
+return(0);
+}
+EOM
+	tryworkshopcc="${cc:-cc} try.c -o try"
+	if $tryworkshopcc >/dev/null 2>&1; then
+		cc_name=`./try`
+		if test "$cc_name" = "workshop"; then
+			ccversion="`${cc:-cc} -V 2>&1|sed -n -e '1s/^cc: //p'`"
+			if test ! "$use64bitall_done"; then
+				loclibpth="/usr/lib /usr/ccs/lib `$getworkshoplibs` $loclibpth"
+			fi
+		fi
+	fi
 
-	# See if as(1) is GNU as(1).  GNU as(1) won't work for this job.
+	# See if as(1) is GNU as(1).  GNU might not work for this job.
 	case `as --version < /dev/null 2>&1` in
 	*GNU*)
 		cat <<END >&2
 
-NOTE: You are using GNU as(1).  GNU as(1) will not build Perl.
+NOTE: You are using GNU as(1).  GNU as(1) might not build Perl.
 You must arrange to use /usr/ccs/bin/as, perhaps by adding /usr/ccs/bin
 to the beginning of your PATH.
 
@@ -225,51 +316,37 @@ END
 		;;
 	esac
 
-	# See if ld(1) is GNU ld(1).  GNU ld(1) won't work for this job.
+	# See if ld(1) is GNU ld(1).  GNU ld(1) might not work for this job.
 	# ld --version doesn't properly report itself as a GNU tool,
 	# as of ld version 2.6, so we need to be more strict. TWP 9/5/96
-	gnu_ld=false
-	case `ld --version < /dev/null 2>&1` in
-	*GNU*|ld\ version\ 2*)
-		gnu_ld=true ;;
-	*) ;;
-	esac
-	if $gnu_ld ; then :
+	# Sun's ld always emits the "Software Generation Utilities" string.
+	if ld -V 2>&1 | grep "ld: Software Generation Utilities" >/dev/null 2>&1; then
+	    # Ok, ld is /usr/ccs/bin/ld.
+	    :
 	else
-		# Try to guess from path
-		case `type ld | awk '{print $NF}'` in
-		*gnu*|*GNU*|*FSF*)
-			gnu_ld=true ;;
-		esac
-	fi
-	if $gnu_ld ; then
-		cat <<END >&2
+	    cat <<END >&2
 
-NOTE: You are apparently using GNU ld(1).  GNU ld(1) will not build Perl.
-You must arrange to use /usr/ccs/bin/ld, perhaps by adding /usr/ccs/bin
+NOTE: You are apparently using GNU ld(1).  GNU ld(1) might not build Perl.
+You should arrange to use /usr/ccs/bin/ld, perhaps by adding /usr/ccs/bin
 to the beginning of your PATH.
 
 END
 	fi
-
 fi
 
 # as --version or ld --version might dump core.
-rm -f try try.c
-rm -f core
-
-# XXX
-EOSH
+rm -f try try.c core
+EOCBU
 
-# 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'
+# This script UU/usethreads.cbu will get 'called-back' by Configure
+# after it has prompted the user for whether to use threads.
 case "$usethreads" in
 $define|true|[yY]*)
         ccflags="-D_REENTRANT $ccflags"
 
-        # sched_yield is in -lposix4
-        set `echo X "$libswanted "| sed -e 's/ c / posix4 pthread c /'`
+	sched_yield='yield'
+        set `echo X "$libswanted "| sed -e "s/ c / pthread c /"`
         shift
         libswanted="$*"
 
@@ -283,18 +360,18 @@ $define|true|[yY]*)
         cat >try.c <<'EOM'
 	/* Test for sig(set|long)jmp bug. */
 	#include <setjmp.h>
-	 
-	main()
+
+	int main()
 	{
 	    sigjmp_buf env;
 	    int ret;
-	
+
 	    ret = sigsetjmp(env, 1);
 	    if (ret) { return ret == 2; }
 	    siglongjmp(env, 2);
 	}
 EOM
-        if test "`arch`" = i86pc -a "$osvers" = 2.6 && \
+        if test "`arch`" = i86pc -a `uname -r` = 5.6 && \
            ${cc:-cc} try.c -lpthread >/dev/null 2>&1 && ./a.out; then
  	    d_sigsetjmp=$undef
 	    cat << 'EOM' >&2
@@ -305,140 +382,195 @@ for more information.
 
 EOM
         fi
+
+	# These prototypes should be visible since we using
+	# -D_REENTRANT, but that does not seem to work.
+	# It does seem to work for getnetbyaddr_r, weirdly enough,
+	# and other _r functions. (Solaris 8)
+
+	d_ctermid_r_proto="$define"
+	d_gethostbyaddr_r_proto="$define"
+	d_gethostbyname_r_proto="$define"
+	d_getnetbyname_r_proto="$define"
+	d_getprotobyname_r_proto="$define"
+	d_getprotobynumber_r_proto="$define"
+	d_getservbyname_r_proto="$define"
+	d_getservbyport_r_proto="$define"
+
+	# Ditto. (Solaris 7)
+	d_readdir_r_proto="$define"
+	d_readdir64_r_proto="$define"
+	d_tmpnam_r_proto="$define"
+	d_ttyname_r_proto="$define"
+
 	;;
 esac
 EOCBU
 
-# This is just a trick to include some useful notes.
-cat > /dev/null <<'End_of_Solaris_Notes'
-
-Here are some notes kindly contributed by Dean Roehrich.
-
------
-Generic notes about building Perl5 on Solaris:
-- Use /usr/ccs/bin/make.
-- If you use GNU make, remove its setgid bit.
-- Remove all instances of *ucb* from your path.
-- Make sure libucb is not in /usr/lib (it should be in /usr/ucblib).
-- Do not use GNU as or GNU ld, or any of GNU binutils or GNU libc.
-- Do not use /usr/ucb/cc.
-- Do not change Configure's default answers, except for the path names.
-- Do not use -lmalloc.
-- Do not build on SunOS 4 and expect it to work properly on SunOS 5.
-- /dev/fd must be mounted if you want set-uid scripts to work.
-
-
-Here are the gcc-related questions and answers from the Solaris 2 FAQ.  Note
-the themes:
-	- run fixincludes
-	- run fixincludes correctly
-	- don't use GNU as or GNU ld
-
-Question 5.7 covers the __builtin_va_alist problem people are always seeing.
-Question 6.1.3 covers the GNU as and GNU ld issues which are always biting
-people.
-Question 6.9 is for those who are still trying to compile Perl4.
-
-The latest Solaris 2 FAQ can be found in the following locations:
-	rtfm.mit.edu:/pub/usenet-by-group/comp.sys.sun.admin
-	ftp.fwi.uva.nl:/pub/solaris
-
-Perl5 comes with a script in the top-level directory called "myconfig" which
-will print a summary of the configuration in your config.sh.  My summary for
-Solaris 2.4 and gcc 2.6.3 follows.  I have also built with gcc 2.7.0 and the
-results are identical.  This configuration was generated with Configure's -d
-option (take all defaults, don't bother prompting me).  All tests pass for
-Perl5.001, patch.1m.
-
-Summary of my perl5 (patchlevel 1) configuration:
-  Platform:
-    osname=solaris, osver=2.4, archname=sun4-solaris
-    uname='sunos poplar 5.4 generic_101945-27 sun4d sparc '
-    hint=recommended
-  Compiler:
-    cc='gcc', optimize='-O', ld='gcc'
-    cppflags=''
-    ccflags =''
-    ldflags =''
-    stdchar='unsigned char', d_stdstdio=define, usevfork=false
-    voidflags=15, castflags=0, d_casti32=define, d_castneg=define
-    intsize=4, alignbytes=8, usemymalloc=y, randbits=15
-  Libraries:
-    so=so
-    libpth=/lib /usr/lib /usr/ccs/lib /usr/local/lib
-    libs=-lsocket -lnsl -ldl -lm -lc -lcrypt
-    libc=/usr/lib/libc.so
-  Dynamic Linking:
-    dlsrc=dl_dlopen.xs, dlext=so, d_dlsymun=undef
-    cccdlflags='-fpic', ccdlflags=' ', lddlflags='-G'
-
-
-Dean
-roehrich@cray.com
-9/7/95
-
------------
-
-From: Casper.Dik@Holland.Sun.COM (Casper H.S. Dik - Network Security Engineer)
-Subject: Solaris 2 Frequently Asked Questions (FAQ) 1.48
-Date: 25 Jul 1995 12:20:18 GMT
+cat > UU/uselargefiles.cbu <<'EOCBU'
+# This script UU/uselargefiles.cbu will get 'called-back' by Configure
+# after it has prompted the user for whether to use large files.
+case "$uselargefiles" in
+''|$define|true|[yY]*)
 
-5.7) Why do I get __builtin_va_alist or __builtin_va_arg_incr undefined?
+# Keep these in the left margin.
+ccflags_uselargefiles="`getconf LFS_CFLAGS 2>/dev/null`"
+ldflags_uselargefiles="`getconf LFS_LDFLAGS 2>/dev/null`"
+libswanted_uselargefiles="`getconf LFS_LIBS 2>/dev/null|sed -e 's@^-l@@' -e 's@ -l@ @g`"
 
-    You're using gcc without properly installing the gcc fixed
-    include files.  Or you ran fixincludes after installing gcc
-    w/o moving the gcc supplied varargs.h and stdarg.h files
-    out of the way and moving them back again later.  This often
-    happens when people install gcc from a binary distribution.
-    If there's a tmp directory in gcc's include directory, fixincludes
-    didn't complete.  You should have run "just-fixinc" instead.
-
-    Another possible cause is using ``gcc -I/usr/include.''
-
-6.1) Where is the C compiler or where can I get one?
+    ccflags="$ccflags $ccflags_uselargefiles"
+    ldflags="$ldflags $ldflags_uselargefiles"
+    libswanted="$libswanted $libswanted_uselargefiles"
+    ;;
+esac
+EOCBU
 
-    [...]
+# This is truly a mess.
+case "$usemorebits" in
+"$define"|true|[yY]*)
+	use64bitint="$define"
+	uselongdouble="$define"
+	;;
+esac
 
-    3) Gcc.
+if test `uname -p` = "sparc"; then
+    cat > UU/use64bitint.cbu <<'EOCBU'
+# This script UU/use64bitint.cbu will get 'called-back' by Configure
+# after it has prompted the user for whether to use 64 bit integers.
+case "$use64bitint" in
+"$define"|true|[yY]*)
+	    case "`uname -r`" in
+	    5.[0-4])
+		cat >&4 <<EOM
+Solaris `uname -r|sed -e 's/^5\./2./'` does not support 64-bit integers.
+You should upgrade to at least Solaris 2.5.
+EOM
+		exit 1
+		;;
+	    esac
+
+# gcc-2.8.1 on Solaris 8 with -Duse64bitint fails op/pat.t test 822
+# if we compile regexec.c with -O.  Turn off optimization for that one
+# file.  See hints/README.hints , especially 
+# =head2 Propagating variables to config.sh, method 3.
+#  A. Dougherty  May 24, 2002
+    case "${gccversion}-${optimize}" in
+    2.8*-O*)
+	# Honor a command-line override (rather unlikely)
+	case "$regexec_cflags" in
+	'') echo "Disabling optimization on regexec.c for gcc $gccversion" >&4
+	    regexec_cflags='optimize='
+	    echo "regexec_cflags='optimize=\"\"'" >> config.sh 
+	    ;;
+	esac
+	;;
+    esac
+    ;;
+esac
+EOCBU
 
-    Gcc is available from the GNU archives in source and binary
-    form.  Look in a directory called sparc-sun-solaris2 for
-    binaries.  You need gcc 2.3.3 or later.  You should not use
-    GNU as or GNU ld.  Make sure you run just-fixinc if you use
-    a binary distribution.  Better is to get a binary version and
-    use that to bootstrap gcc from source.
+    cat > UU/use64bitall.cbu <<'EOCBU'
+# This script UU/use64bitall.cbu will get 'called-back' by Configure
+# after it has prompted the user for whether to be maximally 64 bitty.
+case "$use64bitall-$use64bitall_done" in
+"$define-"|true-|[yY]*-)
+	    case "`uname -r`" in
+	    5.[0-6])
+		cat >&4 <<EOM
+Solaris `uname -r|sed -e 's/^5\./2./'` does not support 64-bit pointers.
+You should upgrade to at least Solaris 2.7.
+EOM
+		exit 1
+		;;
+	    esac
+	    libc='/usr/lib/sparcv9/libc.so'
+	    if test ! -f $libc; then
+		cat >&4 <<EOM
 
-    [...]
-
-    When you install gcc, don't make the mistake of installing
-    GNU binutils or GNU libc, they are not as capable as their
-    counterparts you get with Solaris 2.x.
-
-6.9) I can't get perl 4.036 to compile or run.
-
-    Run Configure, and use the solaris_2_0 hints, *don't* use
-    the solaris_2_1 hints and don't use the config.sh you may
-    already have.  First you must make sure Configure and make
-    don't find /usr/ucb/cc.  (It must use gcc or the native C
-    compiler: /opt/SUNWspro/bin/cc)
+I do not see the 64-bit libc, $libc.
+Cannot continue, aborting.
 
-    Some questions need a special answer.
+EOM
+		exit 1
+	    fi
+	    case "${cc:-cc} -v 2>/dev/null" in
+	    *gcc*)
+		echo 'int main() { return 0; }' > try.c
+		case "`${cc:-cc} -mcpu=v9 -m64 -S try.c 2>&1 | grep 'm64 is not supported by this configuration'`" in
+		*"m64 is not supported"*)
+		    cat >&4 <<EOM
 
-    Are your system (especially dbm) libraries compiled with gcc? [y] y
+Full 64-bit build is not supported by this gcc configuration.
+Check http://gcc.gnu.org/ for the latest news of availability
+of gcc for 64-bit Sparc.
 
-    yes: gcc 2.3.3 or later uses the standard calling
-    conventions, same as Sun's C.
+Cannot continue, aborting.
 
-    Any additional cc flags? [ -traditional -Dvolatile=__volatile__
-    -I/usr/ucbinclude] -traditional -Dvolatile=__volatile__
-    Remove /usr/ucbinclude.
+EOM
+		    exit 1
+		    ;;
+		esac
+	        loclibpth="/usr/lib/sparcv9 $loclibpth"
+		ccflags="$ccflags -mcpu=v9 -m64"
+		if test X`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null` != X; then
+		    # This adds in -Wa,-xarch=v9.  I suspect that's superfluous,
+		    # since the -m64 above should do that already.  Someone
+		    # with gcc-3.x.x, please test with gcc -v.   A.D. 20-Nov-2003
+		    ccflags="$ccflags -Wa,`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`"
+		fi
+		ldflags="$ldflags -m64"
+		lddlflags="$lddlflags -G -m64"
+		;;
+	    *)
+		ccflags="$ccflags `getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`"
+		ldflags="$ldflags `getconf XBS5_LP64_OFF64_LDFLAGS 2>/dev/null`"
+		lddlflags="$lddlflags -G `getconf XBS5_LP64_OFF64_LDFLAGS 2>/dev/null`"
+		echo "int main() { return(0); } " > try.c
+		tryworkshopcc="${cc:-cc} try.c -o try $ccflags"
+		loclibpth="/usr/lib/sparcv9 /usr/ccs/lib/sparcv9 `$getworkshoplibs` $loclibpth"
+		;;
+	    esac
 
-    Any additional libraries? [-lsocket -lnsl -ldbm -lmalloc -lm
-    -lucb] -lsocket -lnsl  -lm
+	    use64bitall_done=yes
+	    archname64=64
+	    ;;
+esac
+EOCBU
 
-    Don't include -ldbm, -lmalloc and -lucb.
+    # Actually, we want to run this already now, if so requested,
+    # because we need to fix up things right now.
+    case "$use64bitall" in
+    "$define"|true|[yY]*)
+	# CBUs expect to be run in UU
+	cd UU; . ./use64bitall.cbu; cd ..
+	;;
+    esac
+fi
 
-    Perl 5 compiled out of the box.
+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]*)
+	if test "$cc_name" = "workshop"; then
+		cat > try.c << 'EOM'
+#include <sunmath.h>
+int main() { (void) powl(2, 256); return(0); }
+EOM
+		if ${cc:-cc} try.c -lsunmath -o try > /dev/null 2>&1 && ./try; then
+			libswanted="$libswanted sunmath"
+		fi
+	else
+		cat >&4 <<EOM
 
-End_of_Solaris_Notes
+The Sun Workshop math library is either not available or not working,
+so I do not know how to do long doubles, sorry.
+I'm therefore disabling the use of long doubles.
+EOM
+		uselongdouble="$undef"
+	fi
+	;;
+esac
+EOCBU
 
+rm -f try.c try.o try a.out