Bring Configure back into sync again with meta

Work done at the QAH in Rugby.
Multi-thanks to Aaron for helping out here. You're doing a great job!

4 files changed, 267 insertions, 268 deletions

diff --git a/Configure b/Configure
index 2f4ffcc5db..7a6f3261c9 100755
--- a/Configure
+++ b/Configure
@@ -666,7 +666,6 @@ d_mktime=''
 d_mmap=''
 mmaptype=''
 d_modfl=''
-d_modfl_pow32_bug=''
 d_modflproto=''
 d_mprotect=''
 d_msg=''
@@ -789,12 +788,12 @@ d_shmctl=''
 d_shmdt=''
 d_shmget=''
 d_sigaction=''
+d_siginfo_si_addr=''
+d_siginfo_si_band=''
 d_siginfo_si_errno=''
 d_siginfo_si_pid=''
-d_siginfo_si_uid=''
-d_siginfo_si_addr=''
 d_siginfo_si_status=''
-d_siginfo_si_band=''
+d_siginfo_si_uid=''
 d_siginfo_si_value=''
 d_signbit=''
 d_sigprocmask=''
@@ -937,6 +936,7 @@ ld_can_script=''
 lddlflags=''
 usedl=''
 doublesize=''
+dtraceobject=''
 ebcdic=''
 fflushNULL=''
 fflushall=''
@@ -1321,7 +1321,6 @@ use64bitall=''
 use64bitint=''
 usecbacktrace=''
 dtrace=''
-dtraceobject=''
 usedtrace=''
 usefaststdio=''
 usekernprocpathname=''
@@ -8176,33 +8175,6 @@ EOM
 	esac
 done
 
-case "$usedtrace" in
-$define)
-	case "$dtraceobject" in
-	$define|true|[yY]*)
-		dtraceobject=$define
-		;;
-	' '|'')
-		$dtrace -h -s ../perldtrace.d -o perldtrace.h
-		$cat >try.c <<EOM
-#include "perldtrace.h"
-int main(void) {
-    PERL_LOADED_FILE("dummy");
-    return 0;
-}
-EOM
-		dtraceobject=$undef
-		if $cc -c -o try.o $optimize $ccflags try.c \
-                    && $dtrace -G -s ../perldtrace.d try.o >/dev/null 2>&1; then
-		        dtraceobject=$define
-			echo "Your dtrace builds an object file"
-		fi
-		$rm -f try.c try.o perldtrace.o
-		;;
-	*) dtraceobject=$undef ;;
-	esac
-esac
-
 : See if we want extra modules installed
 echo " "
 case "$extras" in
@@ -10797,25 +10769,6 @@ set $varname;
 eval $setvar;
 $rm_try'
 
-: Define hasfield_t macro for Configure internal use
-hasfield_t='varname=$1; struct=$2; type=$3; field=$4; shift; shift; shift; shift;
-while $test $# -ge 2; do
-	case "$1" in
-	$define) echo "#include <$2>";;
-	esac ;
-    shift 2;
-done > try.c;
-echo "int main () { $struct foo; $type bar = foo.$field; }" >> try.c;
-set try;
-if eval $compile; then
-	val="$define";
-else
-	val="$undef";
-fi;
-set $varname;
-eval $setvar;
-$rm_try'
-
 : see if we should include time.h, sys/time.h, or both
 echo " "
 if test "X$timeincl" = X; then
@@ -14174,6 +14127,18 @@ $rm_try
 set d_fpos64_t
 eval $setvar
 
+: see if newlocale exists
+set newlocale d_newlocale
+eval $inlibc
+
+: see if freelocale exists
+set freelocale d_freelocale
+eval $inlibc
+
+: see if uselocale exists
+set uselocale d_uselocale
+eval $inlibc
+
 : see if frexpl exists
 set frexpl d_frexpl
 eval $inlibc
@@ -16438,69 +16403,6 @@ echo " "
 set d_modflproto modfl $i_math math.h
 eval $hasproto
 
-d_modfl_pow32_bug="$undef"
-
-case "$d_longdbl$d_modfl" in
-$define$define)
-	$cat <<EOM
-Checking to see whether your modfl() is okay for large values...
-EOM
-$cat >try.c <<EOCP
-#include <math.h>
-#include <stdio.h>
-EOCP
-if $test "X$d_modflproto" != "X$define"; then
-	$cat >>try.c <<EOCP
-/* Sigh. many current glibcs provide the function, but do not prototype it. */
-long double modfl (long double, long double *);
-EOCP
-fi
-$cat >>try.c <<EOCP
-int main() {
-    long double nv = 4294967303.15;
-    long double v, w;
-    v = modfl(nv, &w);
-#ifdef __GLIBC__
-    printf("glibc");
-#endif
-    printf(" %"$sPRIfldbl" %"$sPRIfldbl" %"$sPRIfldbl"\n", nv, v, w);
-    return 0;
-}
-EOCP
-	case "$osname:$gccversion" in
-	aix:)	saveccflags="$ccflags"
-		ccflags="$ccflags -qlongdouble" ;; # to avoid core dump
-	esac
-	set try
-	if eval $compile; then
-		foo=`$run ./try`
-		case "$foo" in
-		*" 4294967303.150000 1.150000 4294967302.000000")
-			echo >&4 "Your modfl() is broken for large values."
-			d_modfl_pow32_bug="$define"
-			case "$foo" in
-			glibc)	echo >&4 "You should upgrade your glibc to at least 2.2.2 to get a fixed modfl()."
-			;;
-			esac
-			;;
-		*" 4294967303.150000 0.150000 4294967303.000000")
-			echo >&4 "Your modfl() seems okay for large values."
-			;;
-		*)	echo >&4 "I don't understand your modfl() at all."
-			d_modfl="$undef"
-			;;
-		esac
-		$rm_try
-	else
-		echo "I cannot figure out whether your modfl() is okay, assuming it isn't."
-		d_modfl="$undef"
-	fi
-	case "$osname:$gccversion" in
-	aix:)	ccflags="$saveccflags" ;; # restore
-	esac
-	;;
-esac
-
 if $test "$uselongdouble" = "$define"; then
     message=""
     if $test "$d_sqrtl" != "$define"; then
@@ -16626,18 +16528,6 @@ eval $inlibc
 set nearbyint d_nearbyint
 eval $inlibc
 
-: see if newlocale exists
-set newlocale d_newlocale
-eval $inlibc
-
-: see if freelocale exists
-set freelocale d_freelocale
-eval $inlibc
-
-: see if uselocale exists
-set uselocale d_uselocale
-eval $inlibc
-
 : see if nextafter exists
 set nextafter d_nextafter
 eval $inlibc
@@ -18688,6 +18578,97 @@ fi
 set d_sigaction; eval $setvar
 $rm_try
 
+: see what type pids are declared as in the kernel
+rp="What is the type of process ids on this system?"
+set pid_t pidtype int stdio.h sys/types.h
+eval $typedef_ask
+
+: see what type uids are declared as in the kernel
+echo " "
+echo "Looking for the type for user ids returned by getuid()."
+set uid_t uidtype xxx stdio.h sys/types.h
+eval $typedef
+case "$uidtype" in
+xxx)
+	xxx=`./findhdr sys/user.h`
+	set `grep '_ruid;' "$xxx" 2>/dev/null` unsigned short
+	case $1 in
+	unsigned) dflt="$1 $2" ;;
+	*) dflt="$1" ;;
+	esac
+	;;
+*) dflt="$uidtype";;
+esac
+case "$uidtype" in
+uid_t)	echo "uid_t found." ;;
+*)	rp="What is the type for user ids returned by getuid()?"
+	. ./myread
+	uidtype="$ans"
+	;;
+esac
+
+: Define hasfield_t macro for Configure internal use
+hasfield_t='varname=$1; struct=$2; type=$3; field=$4; shift; shift; shift; shift;
+while $test $# -ge 2; do
+    case "$1" in
+	$define) echo "#include <$2>";;
+    esac ;
+    shift 2;
+done > try.c;
+echo "int main () { $struct foo; $type bar = foo.$field; }" >> try.c;
+set try;
+if eval $compile; then
+	val="$define";
+else
+	val="$undef";
+fi;
+set $varname;
+eval $setvar;
+$rm_try'
+
+: see what siginfo fields we have
+case "$d_sigaction" in
+"$define")
+	echo "Checking if your siginfo_t has si_errno field...">&4
+	set d_siginfo_si_errno siginfo_t int si_errno $d_sigaction signal.h
+	eval $hasfield_t;
+
+	echo "Checking if your siginfo_t has si_pid field...">&4
+	set d_siginfo_si_pid siginfo_t $pidtype si_pid $d_sigaction signal.h
+	eval $hasfield_t;
+
+	echo "Checking if your siginfo_t has si_uid field...">&4
+	set d_siginfo_si_uid siginfo_t $uidtype si_uid $d_sigaction signal.h
+	eval $hasfield_t;
+
+	echo "Checking if your siginfo_t has si_addr field...">&4
+	set d_siginfo_si_addr siginfo_t "void *" si_addr $d_sigaction signal.h
+	eval $hasfield_t;
+
+	echo "Checking if your siginfo_t has si_status field...">&4
+	set d_siginfo_si_status siginfo_t int si_status $d_sigaction signal.h
+	eval $hasfield_t;
+
+	echo "Checking if your siginfo_t has si_band field...">&4
+	set d_siginfo_si_band siginfo_t long si_band $d_sigaction signal.h
+	eval $hasfield_t;
+
+	echo "Checking if your siginfo_t has si_value field...">&4
+	set d_siginfo_si_value siginfo_t "union sigval" si_value $d_sigaction signal.h
+	eval $hasfield_t;
+
+	;;
+*)
+	d_siginfo_si_errno="$undef"
+	d_siginfo_si_pid="$undef"
+	d_siginfo_si_uid="$undef"
+	d_siginfo_si_addr="$undef"
+	d_siginfo_si_status="$undef"
+	d_siginfo_si_band="$undef"
+	d_siginfo_si_value="$undef"
+	;;
+esac
+
 : see if this is a sunmath.h system
 set sunmath.h i_sunmath
 eval $inhdr
@@ -20751,6 +20732,35 @@ seedfunc="Perl_drand48_init"
 randbits=48
 randseedtype=U32
 
+: Probe whether dtrace builds an object, as newer Illumos requires an input
+: object file that uses at least one of the probes defined in the .d file
+case "$usedtrace" in
+$define)
+    case "$dtraceobject" in
+    $define|true|[yY]*)
+        dtraceobject=$define
+        ;;
+    ' '|'')
+        $dtrace -h -s ../perldtrace.d -o perldtrace.h
+        $cat >try.c <<EOM
+#include "perldtrace.h"
+int main(void) {
+    PERL_LOADED_FILE("dummy");
+    return 0;
+}
+EOM
+        dtraceobject=$undef
+        if $cc -c -o try.o $optimize $ccflags try.c \
+                    && $dtrace -G -s ../perldtrace.d try.o >/dev/null 2>&1; then
+                dtraceobject=$define
+            echo "Your dtrace builds an object file"
+        fi
+        $rm -f try.c try.o perldtrace.o
+        ;;
+    *) dtraceobject=$undef ;;
+    esac
+esac
+
 : Determine if this is an EBCDIC system
 echo " "
 echo "Determining whether or not we are on an EBCDIC system..." >&4
@@ -21734,11 +21744,6 @@ rp='What pager is used on your system?'
 . ./getfile
 pager="$ans"
 
-: see what type pids are declared as in the kernel
-rp="What is the type of process ids on this system?"
-set pid_t pidtype int stdio.h sys/types.h
-eval $typedef_ask
-
 : see if ar generates random libraries by itself
 echo " "
 echo "Checking how to generate random libraries on your machine..." >&4
@@ -22343,8 +22348,12 @@ $rm -f signal.c signal$_exe signal$_o signal.nsg signal.ls1
 EOS
 chmod a+x signal_cmd
 $eunicefix signal_cmd
+;;
+esac
 
 : generate list of signal names
+case "$sig_num_init" in
+'')
 echo " "
 case "$sig_name_init" in
 '') doinit=yes ;;
@@ -22626,30 +22635,6 @@ else
 fi
 $rm -f stdioh
 
-: see what type uids are declared as in the kernel
-echo " "
-echo "Looking for the type for user ids returned by getuid()."
-set uid_t uidtype xxx stdio.h sys/types.h
-eval $typedef
-case "$uidtype" in
-xxx)
-	xxx=`./findhdr sys/user.h`
-	set `grep '_ruid;' "$xxx" 2>/dev/null` unsigned short
-	case $1 in
-	unsigned) dflt="$1 $2" ;;
-	*) dflt="$1" ;;
-	esac
-	;;
-*) dflt="$uidtype";;
-esac
-case "$uidtype" in
-uid_t)	echo "uid_t found." ;;
-*)	rp="What is the type for user ids returned by getuid()?"
-	. ./myread
-	uidtype="$ans"
-	;;
-esac
-
 : Check size of UID
 echo " "
 case "$uidtype" in
@@ -22762,49 +22747,6 @@ case "$uidsign" in
 	;;
 esac
 
-: see what siginfo fields we have
-case "$d_sigaction" in
-"$define")
-	echo "Checking if your siginfo_t has si_errno field...">&4
-	set d_siginfo_si_errno siginfo_t int si_errno $d_sigaction signal.h
-	eval $hasfield_t;
-
-	echo "Checking if your siginfo_t has si_pid field...">&4
-	set d_siginfo_si_pid siginfo_t $pidtype si_pid $d_sigaction signal.h
-	eval $hasfield_t;
-
-	echo "Checking if your siginfo_t has si_uid field...">&4
-	set d_siginfo_si_uid siginfo_t $uidtype si_uid $d_sigaction signal.h
-	eval $hasfield_t;
-
-	echo "Checking if your siginfo_t has si_addr field...">&4
-	set d_siginfo_si_addr siginfo_t "void *" si_addr $d_sigaction signal.h
-	eval $hasfield_t;
-
-	echo "Checking if your siginfo_t has si_status field...">&4
-	set d_siginfo_si_status siginfo_t int si_status $d_sigaction signal.h
-	eval $hasfield_t;
-
-	echo "Checking if your siginfo_t has si_band field...">&4
-	set d_siginfo_si_band siginfo_t long si_band $d_sigaction signal.h
-	eval $hasfield_t;
-
-	echo "Checking if your siginfo_t has si_value field...">&4
-	set d_siginfo_si_value siginfo_t "union sigval" si_value $d_sigaction signal.h
-	eval $hasfield_t;
-
-	;;
-*)
-	d_siginfo_si_errno="$undef"
-	d_siginfo_si_pid="$undef"
-	d_siginfo_si_uid="$undef"
-	d_siginfo_si_addr="$undef"
-	d_siginfo_si_status="$undef"
-	d_siginfo_si_band="$undef"
-	d_siginfo_si_value="$undef"
-	;;
-esac
-
 : Determine if we can use sysctl with KERN_PROC_PATHNAME to find executing program
 echo " "
 echo "Determining whether we can use sysctl with KERN_PROC_PATHNAME to find executing program..." >&4
@@ -23311,7 +23253,7 @@ case "$osname-$gccversion" in
 irix-) ccflags="\$ccflags -woff 1178" ;;
 os2-*) ccflags="\$ccflags -Zlinker /PM:VIO" ;;
 esac
-$cc -o try -Dcpp_stuff=$cpp_stuff $optimize \$ccflags $ldflags try.c $libs 2>/dev/null && $run ./try  | $sed 's/ /\\\\ /g'
+$cc -o try -Dcpp_stuff=$cpp_stuff $optimize \$ccflags $ldflags try.c $libs 2>/dev/null && $run ./try | $sed 's/ /\\\\ /g'
 EOSH
 chmod +x Cppsym.try
 $eunicefix Cppsym.try
@@ -24502,7 +24444,6 @@ d_mktime64='$d_mktime64'
 d_mktime='$d_mktime'
 d_mmap='$d_mmap'
 d_modfl='$d_modfl'
-d_modfl_pow32_bug='$d_modfl_pow32_bug'
 d_modflproto='$d_modflproto'
 d_mprotect='$d_mprotect'
 d_msg='$d_msg'
@@ -24634,12 +24575,12 @@ d_shmctl='$d_shmctl'
 d_shmdt='$d_shmdt'
 d_shmget='$d_shmget'
 d_sigaction='$d_sigaction'
+d_siginfo_si_addr='$d_siginfo_si_addr'
+d_siginfo_si_band='$d_siginfo_si_band'
 d_siginfo_si_errno='$d_siginfo_si_errno'
 d_siginfo_si_pid='$d_siginfo_si_pid'
-d_siginfo_si_uid='$d_siginfo_si_uid'
-d_siginfo_si_addr='$d_siginfo_si_addr'
 d_siginfo_si_status='$d_siginfo_si_status'
-d_siginfo_si_band='$d_siginfo_si_band'
+d_siginfo_si_uid='$d_siginfo_si_uid'
 d_siginfo_si_value='$d_siginfo_si_value'
 d_signbit='$d_signbit'
 d_sigprocmask='$d_sigprocmask'
diff --git a/Porting/Glossary b/Porting/Glossary
index b5e7544f64..a1713f059e 100644
--- a/Porting/Glossary
+++ b/Porting/Glossary
@@ -834,6 +834,10 @@ d_fd_set (d_fd_set.U):
 	This variable contains the eventual value of the HAS_FD_SET symbol,
 	which indicates if your C compiler knows about the fd_set typedef.
 
+d_fdclose (d_fdclose.U):
+	This variable conditionally defines the HAS_FDCLOSE symbol, which
+	indicates to the C program that the fdclose() routine is available.
+
 d_fdim (d_fdim.U):
 	This variable conditionally defines the HAS_FDIM symbol, which
 	indicates to the C program that the fdim() routine is available.
@@ -1405,6 +1409,10 @@ d_isinfl (d_isinfl.U):
 	This variable conditionally defines the HAS_ISINFL symbol, which
 	indicates to the C program that the isinfl() routine is available.
 
+d_isless (d_isless.U):
+	This variable conditionally defines the HAS_ISLESS symbol, which
+	indicates to the C program that the isless() routine is available.
+
 d_isnan (d_isnan.U):
 	This variable conditionally defines the HAS_ISNAN symbol, which
 	indicates to the C program that the isnan() routine is available.
@@ -1477,14 +1485,14 @@ d_link (d_link.U):
 d_llrint (d_llrint.U):
 	This variable conditionally defines the HAS_LLRINT symbol, which
 	indicates to the C program that the llrint() routine is available
-	to return the long long value closest to (according to the current
-	rounding mode) to x.
+	to return the long long value closest to a double (according
+	to the current rounding mode).
 
 d_llrintl (d_llrintl.U):
 	This variable conditionally defines the HAS_LLRINTL symbol, which
 	indicates to the C program that the llrintl() routine is available
-	to return the long long value closest to (according to the current
-	rounding mode) to long double x.
+	to return the long long value closest to a long double (according
+	to the current rounding mode).
 
 d_llround (d_llround.U):
 	This variable conditionally defines the HAS_LLROUND symbol, which
@@ -1494,7 +1502,7 @@ d_llround (d_llround.U):
 d_llroundl (d_llroundl.U):
 	This variable conditionally defines the HAS_LLROUNDL symbol, which
 	indicates to the C program that the llroundl() routine is available
-	to return the long long value nearest to long double x.
+	to return the long long value nearest to x away from zero.
 
 d_localtime64 (d_timefuncs64.U):
 	This variable conditionally defines the HAS_LOCALTIME64 symbol, which
@@ -1543,14 +1551,14 @@ d_longlong (d_longlong.U):
 d_lrint (d_lrint.U):
 	This variable conditionally defines the HAS_LRINT symbol, which
 	indicates to the C program that the lrint() routine is available
-	to return the integral value closest to (according to the current
-	rounding mode) to x.
+	to return the integral value closest to a double (according
+	to the current rounding mode).
 
 d_lrintl (d_lrintl.U):
 	This variable conditionally defines the HAS_LRINTL symbol, which
 	indicates to the C program that the lrintl() routine is available
-	to return the integral value closest to (according to the current
-	rounding mode) to long double x.
+	to return the integral value closest to a long double (according
+	to the current rounding mode).
 
 d_lround (d_lround.U):
 	This variable conditionally defines the HAS_LROUND symbol, which
@@ -1560,7 +1568,7 @@ d_lround (d_lround.U):
 d_lroundl (d_lroundl.U):
 	This variable conditionally defines the HAS_LROUNDL symbol, which
 	indicates to the C program that the lroundl() routine is available
-	to return the integral value nearest to x of the long double argument.
+	to return the integral value nearest to x away from zero.
 
 d_lseekproto (d_lseekproto.U):
 	This variable conditionally defines the HAS_LSEEK_PROTO symbol,
@@ -1685,6 +1693,31 @@ d_msg (d_msg.U):
 	This variable conditionally defines the HAS_MSG symbol, which
 	indicates that the entire msg*(2) library is present.
 
+d_msg_ctrunc (d_socket.U):
+	This variable conditionally defines the HAS_MSG_CTRUNC symbol,
+	which indicates that the MSG_CTRUNC is available.  #ifdef is
+	not enough because it may be an enum, glibc has been known to do this.
+
+d_msg_dontroute (d_socket.U):
+	This variable conditionally defines the HAS_MSG_DONTROUTE symbol,
+	which indicates that the MSG_DONTROUTE is available.  #ifdef is
+	not enough because it may be an enum, glibc has been known to do this.
+
+d_msg_oob (d_socket.U):
+	This variable conditionally defines the HAS_MSG_OOB symbol,
+	which indicates that the MSG_OOB is available.  #ifdef is
+	not enough because it may be an enum, glibc has been known to do this.
+
+d_msg_peek (d_socket.U):
+	This variable conditionally defines the HAS_MSG_PEEK symbol,
+	which indicates that the MSG_PEEK is available.  #ifdef is
+	not enough because it may be an enum, glibc has been known to do this.
+
+d_msg_proxy (d_socket.U):
+	This variable conditionally defines the HAS_MSG_PROXY symbol,
+	which indicates that the MSG_PROXY is available.  #ifdef is
+	not enough because it may be an enum, glibc has been known to do this.
+
 d_msgctl (d_msgctl.U):
 	This variable conditionally defines the HAS_MSGCTL symbol, which
 	indicates to the C program that the msgctl() routine is available.
@@ -2083,6 +2116,11 @@ d_sched_yield (d_pthread_y.U):
 	symbol if the sched_yield routine is available to yield
 	the execution of the current thread.
 
+d_scm_rights (d_socket.U):
+	This variable conditionally defines the HAS_SCM_RIGHTS symbol,
+	which indicates that the SCM_RIGHTS is available.  #ifdef is
+	not enough because it may be an enum, glibc has been known to do this.
+
 d_SCNfldbl (longdblfio.U):
 	This variable conditionally defines the PERL_PRIfldbl symbol, which
 	indicates that stdio has a symbol to scan long doubles.
@@ -2304,6 +2342,34 @@ d_sigaction (d_sigaction.U):
 	This variable conditionally defines the HAS_SIGACTION symbol, which
 	indicates that the Vr4 sigaction() routine is available.
 
+d_siginfo_si_addr (d_siginfo_si.U):
+	This variable conditionally defines the HAS_SIGINFO_SI_ADDR symbol,
+	which indicates that the siginfo_t struct has the si_addr member.
+
+d_siginfo_si_band (d_siginfo_si.U):
+	This variable conditionally defines the HAS_SIGINFO_SI_BAND symbol,
+	which indicates that the siginfo_t struct has the si_band member.
+
+d_siginfo_si_errno (d_siginfo_si.U):
+	This variable conditionally defines the HAS_SIGINFO_SI_ERRNO symbol,
+	which indicates that the siginfo_t struct has the si_errno member.
+
+d_siginfo_si_pid (d_siginfo_si.U):
+	This variable conditionally defines the HAS_SIGINFO_SI_PID symbol,
+	which indicates that the siginfo_t struct has the si_pid member.
+
+d_siginfo_si_status (d_siginfo_si.U):
+	This variable conditionally defines the HAS_SIGINFO_SI_STATUS symbol,
+	which indicates that the siginfo_t struct has the si_status member.
+
+d_siginfo_si_uid (d_siginfo_si.U):
+	This variable conditionally defines the HAS_SIGINFO_SI_UID symbol,
+	which indicates that the siginfo_t struct has the si_uid member.
+
+d_siginfo_si_value (d_siginfo_si.U):
+	This variable conditionally defines the HAS_SIGINFO_SI_VALUE symbol,
+	which indicates that the siginfo_t struct has the si_value member.
+
 d_signbit (d_signbit.U):
 	This variable conditionally defines the HAS_SIGNBIT symbol, which
 	indicates to the C program that the signbit() routine is available
@@ -2871,7 +2937,7 @@ drand48_r_proto (d_drand48_r.U):
 dtrace (usedtrace.U):
 	This variable holds the location of the dtrace executable.
 
-dtraceobject (usedtrace.U):
+dtraceobject (dtraceobject.U):
 	Whether we need to build an object file with the dtrace tool.
 
 dynamic_ext (Extensions.U):
@@ -4084,12 +4150,18 @@ longdblinfbytes (infnan.U):
 
 longdblkind (d_longdbl.U):
 	This variable, if defined, encodes the type of a long double:
-	0 = double, 1 = IEEE 754 128-bit little endian,
-	2 = IEEE 754 128-bit big endian, 3 = x86 80-bit little endian,
-	4 = x86 80-bit big endian, 5 = double-double 128-bit little endian,
-	6 = double-double 128-bit big endian, -1 = unknown format.
+	0 = double,
+	1 = IEEE 754 128-bit little endian,
+	2 = IEEE 754 128-bit big endian,
+	3 = x86 80-bit little endian,
+	4 = x86 80-bit big endian,
+	5 = double-double 128-bit little endian,
+	6 = double-double 128-bit big endian,
+	7 = 128-bit mixed double-double (64-bit LEs in BE),
+	8 = 128-bit mixed double-double (64-bit BEs in LE),
+	-1 = unknown format.
 
-longdblmantbits (longdblmant.U):
+longdblmantbits (mantbits.U):
 	This symbol, if defined, tells how many mantissa bits
 	there are in long double precision floating point format.
 	Note that this can be LDBL_MANT_DIG minus one,
diff --git a/config_h.SH b/config_h.SH
index 6bd7c30beb..4cce7468f5 100755
--- a/config_h.SH
+++ b/config_h.SH
@@ -1989,9 +1989,8 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
 #define LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_LE_BE	7
 #define LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_BE_LE	8
 #define LONG_DOUBLE_IS_UNKNOWN_FORMAT			-1
-/* Backward compat. */
-#define LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_LITTLE_ENDIAN	LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_LE_LE
-#define LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_BIG_ENDIAN	LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_BE_BE
+#define LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_LITTLE_ENDIAN	LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_LE_LE /* back-compat */
+#define LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_BIG_ENDIAN	LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_BE_BE /* back-compat */
 #endif
 
 /* HAS_LONG_LONG:
@@ -2331,43 +2330,37 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  *	This symbol, if defined, indicates that siginfo_t has the
  *	si_errno member
  */
-#$d_siginfo_si_errno HAS_SIGINFO_SI_ERRNO	/**/
-
 /* HAS_SIGINFO_SI_PID:
  *	This symbol, if defined, indicates that siginfo_t has the
  *	si_pid member
  */
-#$d_siginfo_si_pid HAS_SIGINFO_SI_PID	/**/
-
 /* HAS_SIGINFO_SI_UID:
  *	This symbol, if defined, indicates that siginfo_t has the
  *	si_uid member
  */
-#$d_siginfo_si_uid HAS_SIGINFO_SI_UID	/**/
-
 /* HAS_SIGINFO_SI_ADDR:
  *	This symbol, if defined, indicates that siginfo_t has the
  *	si_addr member
  */
-#$d_siginfo_si_addr HAS_SIGINFO_SI_ADDR	/**/
-
 /* HAS_SIGINFO_SI_STATUS:
  *	This symbol, if defined, indicates that siginfo_t has the
  *	si_status member
  */
-#$d_siginfo_si_status HAS_SIGINFO_SI_STATUS	/**/
-
 /* HAS_SIGINFO_SI_BAND:
  *	This symbol, if defined, indicates that siginfo_t has the
  *	si_band member
  */
-#$d_siginfo_si_band HAS_SIGINFO_SI_BAND	/**/
-
 /* HAS_SIGINFO_SI_VALUE:
  *	This symbol, if defined, indicates that siginfo_t has the
  *	si_value member
  */
-#$d_siginfo_si_value HAS_SIGINFO_SI_VALUE	/**/
+#$d_siginfo_si_errno	HAS_SIGINFO_SI_ERRNO	/**/
+#$d_siginfo_si_pid	HAS_SIGINFO_SI_PID	/**/
+#$d_siginfo_si_uid	HAS_SIGINFO_SI_UID	/**/
+#$d_siginfo_si_addr	HAS_SIGINFO_SI_ADDR	/**/
+#$d_siginfo_si_status	HAS_SIGINFO_SI_STATUS	/**/
+#$d_siginfo_si_band	HAS_SIGINFO_SI_BAND	/**/
+#$d_siginfo_si_value	HAS_SIGINFO_SI_VALUE	/**/
 
 /* HAS_SIGSETJMP:
  *	This variable indicates to the C program that the sigsetjmp()
@@ -4011,15 +4004,15 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
 
 /* HAS_LLRINT:
  *	This symbol, if defined, indicates that the llrint routine is
- *	available to return the closest long long value according to
- *	the current rounding mode.
+ *	available to return the long long value closest to a double
+ *	(according to the current rounding mode).
  */
 #$d_llrint HAS_LLRINT		/**/
 
 /* HAS_LLRINTL:
  *	This symbol, if defined, indicates that the llrintl routine is
- *	available to return the closest long long value of the long double
- *	argument according to the current rounding mode.
+ *	available to return the long long value closest to a long double
+ *	(according to the current rounding mode).
  */
 #$d_llrintl HAS_LLRINTL		/**/
 
@@ -4056,15 +4049,15 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
 
 /* HAS_LRINT:
  *	This symbol, if defined, indicates that the lrint routine is
- *	available to return the closest integral value according to
- *	the current rounding mode.
+ *	available to return the integral value closest to a double
+ *	(according to the current rounding mode).
  */
 #$d_lrint HAS_LRINT		/**/
 
 /* HAS_LRINTL:
  *	This symbol, if defined, indicates that the lrintl routine is
- *	available to return the closest integral value of the long double
- *	argument according to the current rounding mode.
+ *	available to return the integral value closest to a long double
+ *	(according to the current rounding mode).
  */
 #$d_lrintl HAS_LRINTL		/**/
 
diff --git a/uconfig.h b/uconfig.h
index e14589ea9e..a501e920e2 100644
--- a/uconfig.h
+++ b/uconfig.h
@@ -1954,9 +1954,8 @@
 #define LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_LE_BE	7
 #define LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_BE_LE	8
 #define LONG_DOUBLE_IS_UNKNOWN_FORMAT			-1
-/* Backward compat. */
-#define LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_LITTLE_ENDIAN	LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_LE_LE
-#define LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_BIG_ENDIAN	LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_BE_BE
+#define LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_LITTLE_ENDIAN	LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_LE_LE /* back-compat */
+#define LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_BIG_ENDIAN	LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_BE_BE /* back-compat */
 #endif
 
 /* HAS_LONG_LONG:
@@ -2296,43 +2295,37 @@
  *	This symbol, if defined, indicates that siginfo_t has the
  *	si_errno member
  */
-/*#define HAS_SIGINFO_SI_ERRNO	/ **/
-
 /* HAS_SIGINFO_SI_PID:
  *	This symbol, if defined, indicates that siginfo_t has the
  *	si_pid member
  */
-/*#define HAS_SIGINFO_SI_PID	/ **/
-
 /* HAS_SIGINFO_SI_UID:
  *	This symbol, if defined, indicates that siginfo_t has the
  *	si_uid member
  */
-/*#define HAS_SIGINFO_SI_UID	/ **/
-
 /* HAS_SIGINFO_SI_ADDR:
  *	This symbol, if defined, indicates that siginfo_t has the
  *	si_addr member
  */
-/*#define HAS_SIGINFO_SI_ADDR	/ **/
-
 /* HAS_SIGINFO_SI_STATUS:
  *	This symbol, if defined, indicates that siginfo_t has the
  *	si_status member
  */
-/*#define HAS_SIGINFO_SI_STATUS	/ **/
-
 /* HAS_SIGINFO_SI_BAND:
  *	This symbol, if defined, indicates that siginfo_t has the
  *	si_band member
  */
-/*#define HAS_SIGINFO_SI_BAND	/ **/
-
 /* HAS_SIGINFO_SI_VALUE:
  *	This symbol, if defined, indicates that siginfo_t has the
  *	si_value member
  */
-/*#define HAS_SIGINFO_SI_VALUE	/ **/
+/*#define	HAS_SIGINFO_SI_ERRNO	/ **/
+/*#define	HAS_SIGINFO_SI_PID	/ **/
+/*#define	HAS_SIGINFO_SI_UID	/ **/
+/*#define	HAS_SIGINFO_SI_ADDR	/ **/
+/*#define	HAS_SIGINFO_SI_STATUS	/ **/
+/*#define	HAS_SIGINFO_SI_BAND	/ **/
+/*#define	HAS_SIGINFO_SI_VALUE	/ **/
 
 /* HAS_SIGSETJMP:
  *	This variable indicates to the C program that the sigsetjmp()
@@ -3976,15 +3969,15 @@
 
 /* HAS_LLRINT:
  *	This symbol, if defined, indicates that the llrint routine is
- *	available to return the closest long long value according to
- *	the current rounding mode.
+ *	available to return the long long value closest to a double
+ *	(according to the current rounding mode).
  */
 /*#define HAS_LLRINT		/ **/
 
 /* HAS_LLRINTL:
  *	This symbol, if defined, indicates that the llrintl routine is
- *	available to return the closest long long value of the long double
- *	argument according to the current rounding mode.
+ *	available to return the long long value closest to a long double
+ *	(according to the current rounding mode).
  */
 /*#define HAS_LLRINTL		/ **/
 
@@ -4021,15 +4014,15 @@
 
 /* HAS_LRINT:
  *	This symbol, if defined, indicates that the lrint routine is
- *	available to return the closest integral value according to
- *	the current rounding mode.
+ *	available to return the integral value closest to a double
+ *	(according to the current rounding mode).
  */
 /*#define HAS_LRINT		/ **/
 
 /* HAS_LRINTL:
  *	This symbol, if defined, indicates that the lrintl routine is
- *	available to return the closest integral value of the long double
- *	argument according to the current rounding mode.
+ *	available to return the integral value closest to a long double
+ *	(according to the current rounding mode).
  */
 /*#define HAS_LRINTL		/ **/
 
@@ -5248,6 +5241,6 @@
 #endif
 
 /* Generated from:
- * dc6a0dd949dd1c707248914e2fdada06beb0e6193be5e94cb1423c6f050e65c3 config_h.SH
+ * 35e4b55654d9cf4aa7abd5caef04c5c7ac5bbfc024bb4eabfe952b6f1c48581b config_h.SH
  * fc611849cb5b1e14ec1687b255dac15414cc5e2e11b192d94e08136cfe277f75 uconfig.sh
  * ex: set ro: */