Sync the configure hints files with bleadperl.

p4raw-id: //depot/maint-5.6/perl-5.6.2@21455

7 files changed, 42 insertions, 16 deletions

diff --git a/hints/aix.sh b/hints/aix.sh
index bf1667bd4f..04c83c04e7 100644
--- a/hints/aix.sh
+++ b/hints/aix.sh
@@ -145,7 +145,7 @@ case "$cc" in
      gccversion=`$cc --version | sed 's/.*(GCC) *//'`
      fi
    ;;
-*) ccversion=`lslpp -L | grep 'C for AIX Compiler$' | grep -v '\.msg\.[A-Za-z_]*\.' | awk '{print $1,$2}'`
+*) ccversion=`lslpp -L | grep 'C for AIX Compiler$' | grep -v '\.msg\.[A-Za-z_]*\.' | head -1 | awk '{print $1,$2}'`
    case "$ccversion" in
      '') ccversion=`lslpp -L | grep 'IBM C and C++ Compilers LUM$'`
 	 ;;
@@ -403,10 +403,10 @@ libswanted_uselargefiles="`getconf XBS5_ILP32_OFFBIG_LIBS 2>/dev/null|sed -e 's@
 	esac
 	case "$gccversion" in
 	'') ;;
-	*) # Remove xlc-spefific -qflags.
+	*) # Remove xlc-specific -qflags.
 	   ccflags="`echo $ccflags | sed -e 's@ -q[^ ]*@ @g' -e 's@^-q[^ ]* @@g'`"
 	   ldflags="`echo $ldflags | sed -e 's@ -q[^ ]*@ @g' -e 's@^-q[^ ]* @@g'`"
-	   # Move xld-spefific -bflags.
+	   # Move xlc-specific -bflags.
 	   ccflags="`echo $ccflags | sed -e 's@ -b@ -Wl,-b@g'`"
 	   ldflags="`echo ' '$ldflags | sed -e 's@ -b@ -Wl,-b@g'`"
 	   lddlflags="`echo ' '$lddlflags | sed -e 's@ -b@ -Wl,-b@g'`"
diff --git a/hints/darwin.sh b/hints/darwin.sh
index 6d2c11244a..f3e7ff9842 100644
--- a/hints/darwin.sh
+++ b/hints/darwin.sh
@@ -13,6 +13,12 @@ perl_version=`awk '/define[ 	]+PERL_VERSION/ {print $3}' $src/patchlevel.h`
 perl_subversion=`awk '/define[ 	]+PERL_SUBVERSION/ {print $3}' $src/patchlevel.h`
 version="${perl_revision}.${perl_version}.${perl_subversion}"
 
+# Pretend that Darwin doesn't know about those system calls [perl #24122]
+d_setregid='undef'
+d_setreuid='undef'
+d_setrgid='undef'
+d_setruid='undef'
+
 # This was previously used in all but causes three cases
 # (no -Ddprefix=, -Dprefix=/usr, -Dprefix=/some/thing/else)
 # but that caused too much grief.
diff --git a/hints/freebsd.sh b/hints/freebsd.sh
index 396abdd4d9..28e22ac62c 100644
--- a/hints/freebsd.sh
+++ b/hints/freebsd.sh
@@ -263,8 +263,9 @@ EOM
 
 	# Even with the malloc mutexes the Perl malloc does not
 	# seem to be threadsafe in FreeBSD?
-	usemymalloc=n
-
+	case "$usemymalloc" in
+	'') usemymalloc=n ;;
+	esac
 esac
 EOCBU
 
diff --git a/hints/linux.sh b/hints/linux.sh
index caf380a5ab..bc7d49ad82 100644
--- a/hints/linux.sh
+++ b/hints/linux.sh
@@ -67,6 +67,18 @@ case "$usemymalloc" in
 '') usemymalloc='n' ;;
 esac
 
+# Check if we're about to use Intel's ICC compiler
+case "`${cc:-cc} -V 2>&1`" in
+*"Intel(R) C++ Compiler"*)
+    # This is needed for Configure's prototype checks to work correctly
+    ccflags="-we147 $ccflags"
+    # If we're using ICC, we usually want the best performance
+    case "$optimize" in
+    '') optimize='-O3' ;;
+    esac
+    ;;
+esac
+
 case "$optimize" in
 '') # If we have modern enough gcc and well-supported enough CPU,
     # crank up the optimization level.
diff --git a/hints/powerux.sh b/hints/powerux.sh
index c95e0e9ef5..28dcf0cb21 100644
--- a/hints/powerux.sh
+++ b/hints/powerux.sh
@@ -52,11 +52,11 @@ d_csh='undef'
 # of perl (there are probably more of these that might be useful, but
 # for the extensions I build, this turned out to be enough). The -uldexp
 # makes sure the custom ldexp.o I add to archobjs actually gets pulled
-# into perl from libperl.a
+# into perl from libperl.a.  The -unanosleep makes Timer::HiRes happy.
 #
 cc='/usr/ccs/bin/ec'
 cccdlflags='-Zpic'
-ccdlflags='-Zlink=dynamic -Wl,-usys_nerr -Wl,-uldexp -Wl,-Bexport'
+ccdlflags='-Zlink=dynamic -Wl,-usys_nerr -Wl,-uldexp -Wl,-unanosleep -Wl,-Bexport'
 lddlflags='-Zlink=so'
 
 # Sigh... Various versions of Power MAX went out with a broken ldexp runtime
diff --git a/hints/solaris_2.sh b/hints/solaris_2.sh
index 5d643deffd..5763ee2596 100644
--- a/hints/solaris_2.sh
+++ b/hints/solaris_2.sh
@@ -24,7 +24,7 @@
 d_suidsafe=${d_suidsafe:-define}
 
 # Be paranoid about nm failing to find symbols
-mistrustnm=run
+mistrustnm=${mistrustnm:-run}
 
 # Several people reported problems with perl's malloc, especially
 # when use64bitall is defined or when using gcc.
@@ -210,7 +210,7 @@ if echo "$verbose" | grep '^Reading specs from' >/dev/null 2>&1; then
 	#
 	# Using gcc.
 	#
-	ccversion='gcc'
+	cc_name='gcc'
 
 	# 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
@@ -294,9 +294,12 @@ return(0);
 EOM
 	tryworkshopcc="${cc:-cc} try.c -o try"
 	if $tryworkshopcc >/dev/null 2>&1; then
-		ccversion=`./try`
-		if test "$ccversion" = "workshop" -a ! "$use64bitall_done"; then
-			loclibpth="/usr/lib /usr/ccs/lib `$getworkshoplibs` $loclibpth"
+		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
 
@@ -567,7 +570,7 @@ cat > UU/uselongdouble.cbu <<'EOCBU'
 # after it has prompted the user for whether to use long doubles.
 case "$uselongdouble" in
 "$define"|true|[yY]*)
-	if test "$ccversion" = "workshop"; then
+	if test "$cc_name" = "workshop"; then
 		cat > try.c << 'EOM'
 #include <sunmath.h>
 int main() { (void) powl(2, 256); return(0); }
diff --git a/hints/svr4.sh b/hints/svr4.sh
index aa1008da80..cbc2d9549f 100644
--- a/hints/svr4.sh
+++ b/hints/svr4.sh
@@ -153,13 +153,17 @@ esac
 # _mwoflocheckl issue (see ext/POSIX/hints/svr4.pl) would be appreciated.
 #
 if test -f /etc/issue -a -f /etc/.relid; then
+    # libcrypt contains nothing libc wouldn't have.
+    libswanted=`echo " $libswanted " | sed -e 's/ crypt / /'`
     # With the NCR High Performance C Compiler R3.0c, miniperl fails
-    # t/op/regexp.t test 461 unless we compile with optimize=-g.
+    # t/op/regexp.t test 461 unless we compile with optimize=-O0.
     # Volunteers are needed to determine just which files need special
-    # treatment.  For now, use optimize=-g for everything.
+    # treatment.  For now, use optimize=-O0 for everything.
     #
+    d_usleep='undef'
+    d_ualarm='undef'
     case "$optimize" in
-    '') optimize='-g' ;;
+    '') optimize='-O0' ;;
     esac
 fi