Sync up with meta after backports

This includes the inevitable reordering and some typo fixes

Note to committers that change Configure: when you add scans, thos will
only be included if used/referenced. You can force those in by adding a
reference in metaconfig.h

5 files changed, 244 insertions, 254 deletions

diff --git a/Configure b/Configure
index caf8698046..91f20b84b4 100755
--- a/Configure
+++ b/Configure
@@ -471,9 +471,9 @@ d_flock=''
 d_flockproto=''
 d_fork=''
 d_fp_class=''
-d_fp_classify=''
 d_fp_classl=''
 d_fpclass=''
+d_fp_classify=''
 d_fpclassify=''
 d_fpclassl=''
 d_fpgetround=''
@@ -2662,11 +2662,11 @@ EOM
 		# The most common problem is -D_REENTRANT for threads.
 		# This heuristic catches that case, but gets false positives
 		# if -Dusethreads was not actually specified.  Better to
-		# bail out here with a useful message than fail 
+		# bail out here with a useful message than fail
 		# mysteriously later. Should we perhaps just try to
 		# re-invoke Configure -Dcc=gcc config_args ?
 		if $test -f usethreads.cbu; then
-			$cat >&4 <<EOM 
+			$cat >&4 <<EOM
 
 *** However, any setting of the C compiler flags (e.g. for thread support)
 *** will be lost.  It may be necessary for you to restart Configure and
@@ -2688,7 +2688,7 @@ EOM
                         echo "Cannot find myread, sorry.  Aborting." >&2
                         exit 1
                     fi
-                fi  
+                fi
                 case "$ans" in
                 [yY]*) cc=gcc; ccname=gcc; ccflags=''; despair=no;
                 esac
@@ -2704,9 +2704,9 @@ cat <<EOS >checkcc
 $startsh
 EOS
 cat <<'EOSC' >>checkcc
-case "$cc" in        
+case "$cc" in
 '') ;;
-*)  $rm -f try try.*              
+*)  $rm -f try try.*
     $cat >try.c <<EOM
 int main(int argc, char *argv[]) {
   return 0;
@@ -2718,7 +2718,7 @@ EOM
         if $test X"$despair" = Xyes; then
            echo "Uh-oh, the C compiler '$cc' doesn't seem to be working." >&4
         fi
-        $cat >&4 <<EOM         
+        $cat >&4 <<EOM
 You need to find a working C compiler.
 Either (purchase and) install the C compiler supplied by your OS vendor,
 or for a free C compiler try http://gcc.gnu.org/
@@ -5759,10 +5759,6 @@ do set $yyy; var=$2; eval "was=\$$2";
 	set $yyy; shift; shift; yyy=$@;
 done'
 
-: see if stdint is available
-set stdint.h i_stdint
-eval $inhdr
-
 : see if stdlib is available
 set stdlib.h i_stdlib
 eval $inhdr
@@ -6760,10 +6756,6 @@ EOCP
 esac
 $rm_try
 
-: see if this is a fenv.h system
-set fenv.h i_fenv
-eval $inhdr
-
 : see if this is a float.h system
 set float.h i_float
 eval $inhdr
@@ -7913,12 +7905,12 @@ case "$prototype" in
 	cat <<EOM >&4
 
 $me:  FATAL ERROR:
-This version of $package can only be compiled by a compiler that 
-understands function prototypes.  Unfortunately, your C compiler 
+This version of $package can only be compiled by a compiler that
+understands function prototypes.  Unfortunately, your C compiler
 	$cc $ccflags
 doesn't seem to understand them.  Sorry about that.
 
-If GNU cc is available for your system, perhaps you could try that instead.  
+If GNU cc is available for your system, perhaps you could try that instead.
 
 Eventually, we hope to support building Perl with pre-ANSI compilers.
 If you would like to help in that effort, please contact <perlbug@perl.org>.
@@ -13715,6 +13707,35 @@ eval $hasproto
 set fp_class d_fp_class
 eval $inlibc
 
+: see if this is a math.h system
+set math.h i_math
+eval $inhdr
+
+: check for fpclassify
+echo "Checking to see if you have fpclassify..." >&4
+$cat >try.c <<EOCP
+#$i_math I_MATH
+#ifdef I_MATH
+#include <math.h>
+#endif
+int main() { return fpclassify(1.0) == FP_NORMAL ? 0 : 1; }
+EOCP
+set try
+if eval $compile; then
+	val="$define"
+	echo "You have fpclassify."
+else
+	val="$undef"
+	echo "You do not have fpclassify."
+fi
+$rm_try
+set d_fpclassify
+eval $setvar
+
+: see if fp_classify exists
+set fp_classify d_fp_classify
+eval $inlibc
+
 : see if fp_classl exists
 set fp_classl d_fp_classl
 eval $inlibc
@@ -13731,10 +13752,6 @@ eval $inlibc
 set fpclass d_fpclass
 eval $inlibc
 
-: see if fp_classify exists
-set fp_classify d_fp_classify
-eval $inlibc
-
 : see if fpclassl exists
 set fpclassl d_fpclassl
 eval $inlibc
@@ -15472,14 +15489,77 @@ set d_isblank
 eval $setvar
 $rm -f isblank*
 
+: check for isfinite
+echo "Checking to see if you have isfinite..." >&4
+$cat >try.c <<EOCP
+#$i_math I_MATH
+#ifdef I_MATH
+#include <math.h>
+#endif
+int main() { return isfinite(0.0); }
+EOCP
+set try
+if eval $compile; then
+	val="$define"
+	echo "You have isfinite."
+else
+	val="$undef"
+	echo "You do not have isfinite."
+fi
+$rm_try
+set d_isfinite
+eval $setvar
+
 : see if isfinitel exists
 set isfinitel d_isfinitel
 eval $inlibc
 
+: check for isinf
+echo "Checking to see if you have isinf..." >&4
+$cat >try.c <<EOCP
+#$i_math I_MATH
+#ifdef I_MATH
+#include <math.h>
+#endif
+int main() { return isinf(0.0); }
+EOCP
+set try
+if eval $compile; then
+	val="$define"
+	echo "You have isinf."
+else
+	val="$undef"
+	echo "You do not have isinf."
+fi
+$rm_try
+set d_isinf
+eval $setvar
+
 : see if isinfl exists
 set isinfl d_isinfl
 eval $inlibc
 
+: check for isnan
+echo "Checking to see if you have isnan..." >&4
+$cat >try.c <<EOCP
+#$i_math I_MATH
+#ifdef I_MATH
+#include <math.h>
+#endif
+int main() { return isnan(0.0); }
+EOCP
+set try
+if eval $compile; then
+	val="$define"
+	echo "You have isnan."
+else
+	val="$undef"
+	echo "You do not have isnan."
+fi
+$rm_try
+set d_isnan
+eval $setvar
+
 : see if isnanl exists
 set isnanl d_isnanl
 eval $inlibc
@@ -15555,10 +15635,6 @@ $rm -f ldbl_dig.?
 set d_ldbl_dig
 eval $setvar
 
-: see if this is a math.h system
-set math.h i_math
-eval $inhdr
-
 : check to see if math.h defines _LIB_VERSION
 d_libm_lib_version="$undef"
 case $i_math in
@@ -15587,94 +15663,6 @@ EOCP
 
     esac
 
-: check for fpclassify
-echo " "
-echo "Checking to see if you have fpclassify..." >&4
-$cat >try.c <<EOCP
-#$i_math I_MATH
-#ifdef I_MATH
-#include <math.h>
-#endif
-int main() { return fpclassify(1.0) == FP_NORMAL ? 0 : 1; }
-EOCP
-set try
-if eval $compile; then
-	val="$define"
-	echo "You have fpclassify."
-else
-	val="$undef"
-	echo "You do not have fpclassify."
-fi
-$rm_try
-set d_fpclassify
-eval $setvar
-
-: check for isfinite
-echo " "
-echo "Checking to see if you have isfinite..." >&4
-$cat >try.c <<EOCP
-#$i_math I_MATH
-#ifdef I_MATH
-#include <math.h>
-#endif
-int main() { return isfinite(0.0); }
-EOCP
-set try
-if eval $compile; then
-	val="$define"
-	echo "You have isfinite."
-else
-	val="$undef"
-	echo "You do not have isfinite."
-fi
-$rm_try
-set d_isfinite
-eval $setvar
-
-: check for isinf
-echo " "
-echo "Checking to see if you have isinf..." >&4
-$cat >try.c <<EOCP
-#$i_math I_MATH
-#ifdef I_MATH
-#include <math.h>
-#endif
-int main() { return isinf(0.0); }
-EOCP
-set try
-if eval $compile; then
-	val="$define"
-	echo "You have isinf."
-else
-	val="$undef"
-	echo "You do not have isinf."
-fi
-$rm_try
-set d_isinf
-eval $setvar
-
-: check for isnan
-echo " "
-echo "Checking to see if you have isnan..." >&4
-$cat >try.c <<EOCP
-#$i_math I_MATH
-#ifdef I_MATH
-#include <math.h>
-#endif
-int main() { return isnan(0.0); }
-EOCP
-set try
-if eval $compile; then
-	val="$define"
-	echo "You have isnan."
-else
-	val="$undef"
-	echo "You do not have isnan."
-fi
-$rm_try
-set d_isnan
-eval $setvar
-
 : see if link exists
 set link d_link
 eval $inlibc
@@ -20661,7 +20649,7 @@ rp="What is the type used for the length parameter for string functions?"
 set size_t sizetype 'unsigned int' stdio.h sys/types.h
 eval $typedef_ask
 
-: check for type of arguments to gethostbyaddr. 
+: check for type of arguments to gethostbyaddr.
 if test "X$netdb_host_type" = X -o "X$netdb_hlen_type" = X; then
 	case "$d_gethbyaddr" in
 	$define)
@@ -20670,8 +20658,8 @@ if test "X$netdb_host_type" = X -o "X$netdb_hlen_type" = X; then
 Checking to see what type of arguments are accepted by gethostbyaddr().
 EOM
 		hdrs="$define sys/types.h
-			$d_socket sys/socket.h 
-			$i_niin netinet/in.h 
+			$d_socket sys/socket.h
+			$i_niin netinet/in.h
 			$i_netdb netdb.h
 			$i_unistd unistd.h"
 		: The first arg can 'char *' or 'void *'
@@ -20708,12 +20696,12 @@ EOM
 		netdb_hlen_type="$sizetype"
 		;;
 	esac
-	# Remove the "const" if needed. -- but then we'll have a 
+	# Remove the "const" if needed. -- but then we'll have a
 	# prototype clash!
 	# netdb_host_type=`echo "$netdb_host_type" | sed 's/^const //'`
 fi
 
-: check for type of argument to gethostbyname. 
+: check for type of argument to gethostbyname.
 if test "X$netdb_name_type" = X ; then
 	case "$d_gethbyname" in
 	$define)
@@ -20722,8 +20710,8 @@ if test "X$netdb_name_type" = X ; then
 Checking to see what type of argument is accepted by gethostbyname().
 EOM
 		hdrs="$define sys/types.h
-			$d_socket sys/socket.h 
-			$i_niin netinet/in.h 
+			$d_socket sys/socket.h
+			$i_niin netinet/in.h
 			$i_netdb netdb.h
 			$i_unistd unistd.h"
 		for xxx in "const char *" "char *"; do
@@ -20751,7 +20739,7 @@ EOM
 	esac
 fi
 
-: check for type of 1st argument to getnetbyaddr. 
+: check for type of 1st argument to getnetbyaddr.
 if test "X$netdb_net_type" = X ; then
 	case "$d_getnbyaddr" in
 	$define)
@@ -20760,8 +20748,8 @@ if test "X$netdb_net_type" = X ; then
 Checking to see what type of 1st argument is accepted by getnetbyaddr().
 EOM
 		hdrs="$define sys/types.h
-			$d_socket sys/socket.h 
-			$i_niin netinet/in.h 
+			$d_socket sys/socket.h
+			$i_niin netinet/in.h
 			$i_netdb netdb.h
 			$i_unistd unistd.h"
 		for xxx in in_addr_t "unsigned long" long "unsigned int" int; do
@@ -22125,6 +22113,10 @@ eval $inhdr
 set execinfo.h i_execinfo
 eval $inhdr
 
+: see if this is a fenv.h system
+set fenv.h i_fenv
+eval $inhdr
+
 : see if this is a fp.h system
 set fp.h i_fp
 eval $inhdr
@@ -22547,6 +22539,10 @@ eval $setvar
 set stddef.h i_stddef
 eval $inhdr
 
+: see if stdint is available
+set stdint.h i_stdint
+eval $inhdr
+
 : see if sys/access.h is available
 set sys/access.h i_sysaccess
 eval $inhdr
diff --git a/Porting/Glossary b/Porting/Glossary
index 9847c83859..143ec5712e 100644
--- a/Porting/Glossary
+++ b/Porting/Glossary
@@ -846,14 +846,14 @@ d_fp_class (d_fp_class.U):
 	This variable conditionally defines the HAS_FP_CLASS symbol, which
 	indicates to the C program that the fp_class() routine is available.
 
-d_fp_class_l (d_fp_classl.U):
-	This variable conditionally defines the HAS_FP_CLASSL symbol, which
-	indicates to the C program that the fp_classl() routine is available.
-
-d_fp_classify (d_fp_classify.U):
+d_fp_classify (d_fpclassify.U):
 	This variable conditionally defines the HAS_FP_CLASSIFY symbol, which
 	indicates to the C program that the fp_classify() routine is available.
 
+d_fp_classl (d_fp_classl.U):
+	This variable conditionally defines the HAS_FP_CLASSL symbol, which
+	indicates to the C program that the fp_classl() routine is available.
+
 d_fpathconf (d_pathconf.U):
 	This variable conditionally defines the HAS_FPATHCONF symbol, which
 	indicates to the C program that the pathconf() routine is available
@@ -873,8 +873,8 @@ d_fpclassl (d_fpclassl.U):
 	indicates to the C program that the fpclassl() routine is available.
 
 d_fpgetround (d_fpgetround.U):
-	This variable conditionally defines HAS_FPGETROUND if fpgetround() is
-	available to get the floating point rounding mode.
+	This variable conditionally defines HAS_FPGETROUND if fpgetround()
+	is available to get the floating point rounding mode.
 
 d_fpos64_t (d_fpos64_t.U):
 	This symbol will be defined if the C compiler supports fpos64_t.
@@ -1350,12 +1350,10 @@ d_isnanl (d_isnanl.U):
 	indicates to the C program that the isnanl() routine is available.
 
 d_j0 (d_j0.U):
-
 	This variable conditionally defines the HAS_J0 symbol, which
 	indicates to the C program that the j0() routine is available.
 
-d_j0l (d_j0l.U):
-
+d_j0l (d_j0.U):
 	This variable conditionally defines the HAS_J0L symbol, which
 	indicates to the C program that the j0l() routine is available.
 
@@ -3124,6 +3122,11 @@ i_fcntl (i_fcntl.U):
 	This variable controls the value of I_FCNTL (which tells
 	the C program to include <fcntl.h>).
 
+i_fenv (i_fenv.U):
+	This variable conditionally defines the I_FENV symbol, which
+	indicates to the C program that <fenv.h> exists and should
+	be included.
+
 i_float (i_float.U):
 	This variable conditionally defines the I_FLOAT symbol, and indicates
 	whether a C program may include <float.h> to get symbols like DBL_MAX
diff --git a/config_h.SH b/config_h.SH
index 3c48f93ba7..a05b779578 100755
--- a/config_h.SH
+++ b/config_h.SH
@@ -162,12 +162,6 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 #$d_fcntl HAS_FCNTL		/**/
 
-/* HAS_FEGETROUND:
- *	This symbol, if defined, indicates that the fegetround routine is
- *	available to get the floating point rounding mode.
- */
-#$d_fegetround HAS_FEGETROUND	/**/
-
 /* HAS_FGETPOS:
  *	This symbol, if defined, indicates that the fgetpos routine is
  *	available to get the file position indicator, similar to ftell().
@@ -248,20 +242,6 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 #$d_inetaton HAS_INET_ATON		/**/
 
-/* HAS_J0:
- *	This symbol, if defined, indicates to the C program that the
- *	j0() function is available for Bessel functions of the first
- *	kind of the order zero.
- */
-#$d_j0 HAS_J0		/**/
-
-/* HAS_J0L:
- *	This symbol, if defined, indicates to the C program that the
- *	j0l() function is available for Bessel functions of the first
- *	kind of the order zero, for long doubles.
- */
-#$d_j0l HAS_J0L		/**/
-
 /* HAS_KILLPG:
  *	This symbol, if defined, indicates that the killpg routine is available
  *	to kill process groups.  If unavailable, you probably should use kill
@@ -714,12 +694,6 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 #$i_fcntl I_FCNTL	/**/
 
-/* I_FENV:
- *	This symbol, if defined, indicates to the C program that it should
- *	include <fenv.h> to get the floating point environment definitions.
- */
-#$i_fenv I_FENV		/**/
-
 /* I_FLOAT:
  *	This symbol, if defined, indicates to the C program that it should
  *	include <float.h> to get definition of symbols like DBL_MAX or
@@ -770,12 +744,6 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 #$i_stddef I_STDDEF	/**/
 
-/* I_STDINT:
- *	This symbol, if defined, indicates that <stdint.h> exists and should
- *	be included.
- */
-#$i_stdint I_STDINT		/**/
-
 /* I_STDLIB:
  *	This symbol, if defined, indicates that <stdlib.h> exists and should
  *	be included.
@@ -3446,7 +3414,7 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
 
 /* HAS_ACOSH:
  *	This symbol, if defined, indicates that the acosh routine is
- *	available.
+ *	available to do the inverse hyperbolic cosine function.
  */
 #$d_acosh HAS_ACOSH		/**/
 
@@ -3560,6 +3528,13 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 #$d_fcntl_can_lock FCNTL_CAN_LOCK		/**/
 
+/* HAS_FEGETROUND:
+ *	This symbol, if defined, indicates that the fegetround routine is
+ *	available to return the macro corresponding to the current rounding
+ *	mode.
+ */
+#$d_fegetround HAS_FEGETROUND	/**/
+
 /* HAS_FINITE:
  *	This symbol, if defined, indicates that the finite routine is
  *	available to check whether a double is finite (non-infinity non-NaN).
@@ -3601,25 +3576,11 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
 
 /* HAS_FP_CLASSL:
  *	This symbol, if defined, indicates that the fp_classl routine is
- *	available to classify doubles.  Available for example in Digital UNIX.
- *	See HAS_FP_CLASS.
- *
+ *	available to classify long doubles.  Available for example in
+ *	Digital UNIX.  See for possible values HAS_FP_CLASS.
  */
 #$d_fp_classl HAS_FP_CLASSL		/**/
 
-/* HAS_FP_CLASSIFY:
- *	This symbol, if defined, indicates that the fp_classify routine is
- *	available to classify doubles.
- *	The returned values are defined in <math.h> and are:
- *
- *	FP_NAN
- *	FP_INFINITE
- *	FP_NORMAL
- *	FP_SUBNORMAL
- *	FP_ZERO
- */
-#$d_fp_classify HAS_FP_CLASSIFY		/**/
-
 /* HAS_FPCLASS:
  *	This symbol, if defined, indicates that the fpclass routine is
  *	available to classify doubles.  Available for example in Solaris/SVR4.
@@ -3650,7 +3611,19 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  *           FP_NAN        NaN
  *
  */
-#$d_fpclassify HAS_FPCLASSIFY		/**/
+/* HAS_FP_CLASSIFY:
+ *	This symbol, if defined, indicates that the fp_classify routine is
+ *	available to classify doubles. The values are defined in <math.h>
+ *
+ *           FP_NORMAL     Normalized
+ *           FP_ZERO       Zero
+ *           FP_INFINITE   Infinity
+ *           FP_SUBNORMAL  Denormalized
+ *           FP_NAN        NaN
+ *
+ */
+#$d_fpclassify	HAS_FPCLASSIFY		/**/
+#$d_fp_classify	HAS_FP_CLASSIFY		/**/
 
 /* HAS_FPCLASSL:
  *	This symbol, if defined, indicates that the fpclassl routine is
@@ -3829,8 +3802,8 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
 #$d_isfinite HAS_ISFINITE		/**/
 
 /* HAS_ISFINITEL:
- *	This symbol, if defined, indicates that the isfinite routine is
- *	available to check whether a long double is finitel
+ *	This symbol, if defined, indicates that the isfinitel routine is
+ *	available to check whether a long double is finite.
  *	(non-infinity non-NaN).
  */
 #$d_isfinitel HAS_ISFINITEL		/**/
@@ -3841,8 +3814,8 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 #$d_isinf HAS_ISINF		/**/
 
-/* HAS_ISINF:
- *	This symbol, if defined, indicates that the isinf routine is
+/* HAS_ISINFL:
+ *	This symbol, if defined, indicates that the isinfl routine is
  *	available to check whether a long double is an infinity.
  */
 #$d_isinfl HAS_ISINFL		/**/
@@ -3859,6 +3832,19 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 #$d_isnanl HAS_ISNANL		/**/
 
+/* HAS_J0:
+ *	This symbol, if defined, indicates to the C program that the
+ *	j0() function is available for Bessel functions of the first
+ *	kind of the order zero, for doubles.
+ */
+/* HAS_J0L:
+ *	This symbol, if defined, indicates to the C program that the
+ *	j0l() function is available for Bessel functions of the first
+ *	kind of the order zero, for long doubles.
+ */
+#$d_j0	HAS_J0		/**/
+#$d_j0l	HAS_J0L		/**/
+
 /* HAS_LDBL_DIG:
  *	This symbol, if defined, indicates that this system's <float.h>
  *	or <limits.h> defines the symbol LDBL_DIG, which is the number
@@ -4372,6 +4358,12 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
 #define DB_VERSION_MINOR_CFG	$db_version_minor  	/**/
 #define DB_VERSION_PATCH_CFG	$db_version_patch  	/**/
 
+/* I_FENV:
+ *	This symbol, if defined, indicates to the C program that it should
+ *	include <fenv.h> to get the floating point environment definitions.
+ */
+#$i_fenv I_FENV		/**/
+
 /* I_FP:
  *	This symbol, if defined, indicates that <fp.h> exists and
  *	should be included.
@@ -4456,6 +4448,12 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 #$i_stdbool	I_STDBOOL		/**/
 
+/* I_STDINT:
+ *	This symbol, if defined, indicates that <stdint.h> exists and
+ *	should be included.
+ */
+#$i_stdint I_STDINT		/**/
+
 /* I_SUNMATH:
  *	This symbol, if defined, indicates that <sunmath.h> exists and
  *	should be included.
diff --git a/metaconfig.h b/metaconfig.h
index 72f73e3dba..8c32690f51 100644
--- a/metaconfig.h
+++ b/metaconfig.h
@@ -11,31 +11,26 @@
  * in Configure, this is the way to force them into availability.
  *
  * BOOTSTRAP_CHARSET
- * CHARBITS
+ * HAS_ACOSH
  * HAS_ASCTIME64
- * HAS_BACKTRACE
  * HAS_CTIME64
  * HAS_DIFFTIME64
  * HAS_DLADDR
+ * HAS_FEGETROUND
+ * HAS_FPCLASSIFY
  * HAS_GMTIME64
- * HAS_ISBLANK
+ * HAS_ISFINITEL
+ * HAS_ISINFL
+ * HAS_J0
  * HAS_LOCALTIME64
- * HAS_IP_MREQ
- * HAS_IP_MREQ_SOURCE
- * HAS_IPV6_MREQ
- * HAS_IPV6_MREQ_SOURCE
  * HAS_MKTIME64
  * HAS_PRCTL
  * HAS_PSEUDOFORK
  * HAS_TIMEGM
- * HAS_SOCKADDR_IN6
  * I16SIZE
  * I64SIZE
  * I8SIZE
  * LOCALTIME_R_NEEDS_TZSET
  * U8SIZE
  * USE_CBACKTRACE
- * USE_KERN_PROC_PATHNAME
- * USE_NSGETEXECUTABLEPATH
- *
  */
diff --git a/uconfig.h b/uconfig.h
index 186a2291f0..734d657e7b 100644
--- a/uconfig.h
+++ b/uconfig.h
@@ -127,12 +127,6 @@
  */
 /*#define HAS_FCNTL		/ **/
 
-/* HAS_FEGETROUND:
- *	This symbol, if defined, indicates that the fegetround routine is
- *	available to get the floating point rounding mode.
- */
-/*#define HAS_FEGETROUND	/ **/
-
 /* HAS_FGETPOS:
  *	This symbol, if defined, indicates that the fgetpos routine is
  *	available to get the file position indicator, similar to ftell().
@@ -213,20 +207,6 @@
  */
 /*#define HAS_INET_ATON		/ **/
 
-/* HAS_J0:
- *	This symbol, if defined, indicates to the C program that the
- *	j0() function is available for Bessel functions of the first
- *	kind of the order zero.
- */
-/*#define HAS_J0		/ **/
-
-/* HAS_J0L:
- *	This symbol, if defined, indicates to the C program that the
- *	j0l() function is available for Bessel functions of the first
- *	kind of the order zero, for long doubles.
- */
-/*#define HAS_J0L		/ **/
-
 /* HAS_KILLPG:
  *	This symbol, if defined, indicates that the killpg routine is available
  *	to kill process groups.  If unavailable, you probably should use kill
@@ -679,12 +659,6 @@
  */
 /*#define I_FCNTL	/ **/
 
-/* I_FENV:
- *	This symbol, if defined, indicates to the C program that it should
- *	include <fenv.h> to get the floating point environment definitions.
- */
-/*#define I_FENV		/ **/
-
 /* I_FLOAT:
  *	This symbol, if defined, indicates to the C program that it should
  *	include <float.h> to get definition of symbols like DBL_MAX or
@@ -735,12 +709,6 @@
  */
 #define I_STDDEF	/**/
 
-/* I_STDINT:
- *	This symbol, if defined, indicates that <stdint.h> exists and should
- *	be included.
- */
-/*#define I_STDINT		/ **/
-
 /* I_STDLIB:
  *	This symbol, if defined, indicates that <stdlib.h> exists and should
  *	be included.
@@ -3411,7 +3379,7 @@
 
 /* HAS_ACOSH:
  *	This symbol, if defined, indicates that the acosh routine is
- *	available.
+ *	available to do the inverse hyperbolic cosine function.
  */
 /*#define HAS_ACOSH		/ **/
 
@@ -3525,6 +3493,13 @@
  */
 /*#define FCNTL_CAN_LOCK		/ **/
 
+/* HAS_FEGETROUND:
+ *	This symbol, if defined, indicates that the fegetround routine is
+ *	available to return the macro corresponding to the current rounding
+ *	mode.
+ */
+/*#define HAS_FEGETROUND	/ **/
+
 /* HAS_FINITE:
  *	This symbol, if defined, indicates that the finite routine is
  *	available to check whether a double is finite (non-infinity non-NaN).
@@ -3566,25 +3541,11 @@
 
 /* HAS_FP_CLASSL:
  *	This symbol, if defined, indicates that the fp_classl routine is
- *	available to classify doubles.  Available for example in Digital UNIX.
- *	See HAS_FP_CLASS.
- *
+ *	available to classify long doubles.  Available for example in
+ *	Digital UNIX.  See for possible values HAS_FP_CLASS.
  */
 /*#define HAS_FP_CLASSL		/ **/
 
-/* HAS_FP_CLASSIFY:
- *	This symbol, if defined, indicates that the fp_classify routine is
- *	available to classify doubles.
- *	The returned values are defined in <math.h> and are:
- *
- *	FP_NAN
- *	FP_INFINITE
- *	FP_NORMAL
- *	FP_SUBNORMAL
- *	FP_ZERO
- */
-/*#define HAS_FP_CLASSIFY		/ **/
-
 /* HAS_FPCLASS:
  *	This symbol, if defined, indicates that the fpclass routine is
  *	available to classify doubles.  Available for example in Solaris/SVR4.
@@ -3615,7 +3576,19 @@
  *           FP_NAN        NaN
  *
  */
-/*#define HAS_FPCLASSIFY		/ **/
+/* HAS_FP_CLASSIFY:
+ *	This symbol, if defined, indicates that the fp_classify routine is
+ *	available to classify doubles. The values are defined in <math.h>
+ *
+ *           FP_NORMAL     Normalized
+ *           FP_ZERO       Zero
+ *           FP_INFINITE   Infinity
+ *           FP_SUBNORMAL  Denormalized
+ *           FP_NAN        NaN
+ *
+ */
+/*#define	HAS_FPCLASSIFY		/ **/
+/*#define	HAS_FP_CLASSIFY		/ **/
 
 /* HAS_FPCLASSL:
  *	This symbol, if defined, indicates that the fpclassl routine is
@@ -3794,8 +3767,8 @@
 /*#define HAS_ISFINITE		/ **/
 
 /* HAS_ISFINITEL:
- *	This symbol, if defined, indicates that the isfinite routine is
- *	available to check whether a long double is finitel
+ *	This symbol, if defined, indicates that the isfinitel routine is
+ *	available to check whether a long double is finite.
  *	(non-infinity non-NaN).
  */
 /*#define HAS_ISFINITEL		/ **/
@@ -3806,8 +3779,8 @@
  */
 /*#define HAS_ISINF		/ **/
 
-/* HAS_ISINF:
- *	This symbol, if defined, indicates that the isinf routine is
+/* HAS_ISINFL:
+ *	This symbol, if defined, indicates that the isinfl routine is
  *	available to check whether a long double is an infinity.
  */
 /*#define HAS_ISINFL		/ **/
@@ -3824,6 +3797,19 @@
  */
 /*#define HAS_ISNANL		/ **/
 
+/* HAS_J0:
+ *	This symbol, if defined, indicates to the C program that the
+ *	j0() function is available for Bessel functions of the first
+ *	kind of the order zero, for doubles.
+ */
+/* HAS_J0L:
+ *	This symbol, if defined, indicates to the C program that the
+ *	j0l() function is available for Bessel functions of the first
+ *	kind of the order zero, for long doubles.
+ */
+/*#define	HAS_J0		/ **/
+/*#define	HAS_J0L		/ **/
+
 /* HAS_LDBL_DIG:
  *	This symbol, if defined, indicates that this system's <float.h>
  *	or <limits.h> defines the symbol LDBL_DIG, which is the number
@@ -4337,6 +4323,12 @@
 #define DB_VERSION_MINOR_CFG	0  	/**/
 #define DB_VERSION_PATCH_CFG	0  	/**/
 
+/* I_FENV:
+ *	This symbol, if defined, indicates to the C program that it should
+ *	include <fenv.h> to get the floating point environment definitions.
+ */
+/*#define I_FENV		/ **/
+
 /* I_FP:
  *	This symbol, if defined, indicates that <fp.h> exists and
  *	should be included.
@@ -4421,6 +4413,12 @@
  */
 /*#define	I_STDBOOL		/ **/
 
+/* I_STDINT:
+ *	This symbol, if defined, indicates that <stdint.h> exists and
+ *	should be included.
+ */
+/*#define I_STDINT		/ **/
+
 /* I_SUNMATH:
  *	This symbol, if defined, indicates that <sunmath.h> exists and
  *	should be included.
@@ -4847,6 +4845,6 @@
 #endif
 
 /* Generated from:
- * 2f54acea42d3f924568021e83a8122d708d2beb715c56fd532dc312d69c2b3c3 config_h.SH
+ * 7e76a333a9371f1ff08dfca439fb5f6232dfaf68acc41ac20176cbce581fe5c7 config_h.SH
  * c152ea695301aeff5abcae519813f0bc4f3a875ba6f38e4a841302baa7bb5c7b uconfig.sh
  * ex: set ro: */