Regenerate Configure and frieds after backport

4 files changed, 38 insertions, 33 deletions

diff --git a/Configure b/Configure
index 2d2f22fc08..3fd076682a 100755
--- a/Configure
+++ b/Configure
@@ -6894,9 +6894,9 @@ int main() {
      * The Motorola 68881 had another "extended precision" format:
      * sign:1 exp:15 zero:16 integer:1 mantissa:63
      * for total of 96 bits of bytes.  The zero bits were unused.
-     * See "M68000 FAMILY PROGRAMMER’S REFERENCE MANUAL" for more details.
-     * If it ever becomes relevant, this format should be allocated
-     * a new doublekind code since it's quite different from the Intel x87.
+     * See "M68000 FAMILY PROGRAMMER'S REFERENCE MANUAL" for more details.
+     * If it ever becomes relevant, this format should be allocated a
+     * new doublekind code since it is quite different from the Intel x87.
      */
     printf("4\n");
     exit(0);
@@ -10380,7 +10380,7 @@ void lencheck(int expect, int got)
 		printf("%s length mismatch:  Expected %d, got %d\n",
 			myname, expect, got);
 		exit(1);
-        }
+	}
 }
 
 int main()
@@ -10455,8 +10455,8 @@ int main()
 	else
 	    checkit("1e+34", buf);
 
-        /* Test for an Ubuntu/Debian bug in gcvt and qgcvt. See:        *
-         * https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/1899553 */
+	/* Test for an Ubuntu/Debian bug in gcvt and qgcvt. See:        *
+	 * https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/1899553 */
 
 	Gconvert((DOUBLETYPE)0.4, 53, 0, buf);
 	lencheck(55, (int)strlen(buf));
@@ -14278,19 +14278,19 @@ EOCP
 val=
 set try
 if eval $compile_ok; then
-        $run ./try
-        rc=$?
-        case "$rc" in
-            0) echo "getenv() didn't destroy another thread's buffer" >&4
-	       val=$define
-               ;;
-            1) echo "getenv() does destroy another thread's buffer" >&4
-	       val=$undef
-               ;;
-            *) echo "Couldn't determine if getenv() destroys another thread's return value (code=$rc); assuming it does" >&4
-	       val=$undef
-               ;;
-        esac
+    $run ./try
+    rc=$?
+    case "$rc" in
+	0) echo "getenv() didn't destroy another thread's buffer" >&4
+	   val=$define
+	   ;;
+	1) echo "getenv() does destroy another thread's buffer" >&4
+	   val=$undef
+	   ;;
+	*) echo "Couldn't determine if getenv() destroys another thread's return value (code=$rc); assuming it does" >&4
+	   val=$undef
+	   ;;
+    esac
 else
     echo "(I can't seem to compile the test program.)" >&4
     echo "Assuming that your C library's getenv destroys another thread's return value." >&4
diff --git a/Porting/Glossary b/Porting/Glossary
index 0f7523a762..d28e8c58c8 100644
--- a/Porting/Glossary
+++ b/Porting/Glossary
@@ -1075,6 +1075,11 @@ d_getcwd (d_getcwd.U):
 	indicates to the C program that the getcwd() routine is available
 	to get the current working directory.
 
+d_getenv_preserves_other_thread (d_getenv_thread.U):
+	This variable conditionally defines the GETENV_PRESERVES_OTHER_THREAD
+	symbol, which indicates to the C program that the getenv() system call
+	does not zap the static buffer in a different thread.
+
 d_getespwnam (d_getespwnam.U):
 	This variable conditionally defines HAS_GETESPWNAM if getespwnam() is
 	available to retrieve enhanced (shadow) password entries by name.
@@ -5550,7 +5555,7 @@ usecrosscompile (Cross.U):
 usedefaultstrict (usedefaultstrict.U):
 	This setting provides a mechanism for perl developers to enable
 	strict by default. These defaults do not apply when perl is run
-    via -e or -E.
+	via -e or -E.
 
 usedevel (Devel.U):
 	This variable indicates that Perl was configured with development
diff --git a/config_h.SH b/config_h.SH
index dceb480e1f..8264f91dce 100755
--- a/config_h.SH
+++ b/config_h.SH
@@ -3603,12 +3603,6 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 #$default_inc_excludes_dot DEFAULT_INC_EXCLUDES_DOT	/**/
 
-/* USE_STRICT_BY_DEFAULT:
- *	This symbol, if defined, enables additional defaults.
- *	At this time it only enables implicit strict by default.
- */
-#$usedefaultstrict USE_STRICT_BY_DEFAULT	/* use strict by default */
-
 /* USE_DYNAMIC_LOADING:
  *	This symbol, if defined, indicates that dynamic loading of
  *	some sort is available.
@@ -4255,6 +4249,12 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 #$usecbacktrace USE_C_BACKTRACE		/**/
 
+/* USE_STRICT_BY_DEFAULT:
+ *	This symbol, if defined, enables additional defaults.
+ *	At this time it only enables implicit strict by default.
+ */
+#$usedefaultstrict USE_STRICT_BY_DEFAULT	/* use strict by default */
+
 /* USE_DTRACE:
  *	This symbol, if defined, indicates that Perl should
  *	be built with support for DTrace.
diff --git a/uconfig.h b/uconfig.h
index 9df1564005..d38a004130 100644
--- a/uconfig.h
+++ b/uconfig.h
@@ -3568,12 +3568,6 @@
  */
 /*#define DEFAULT_INC_EXCLUDES_DOT	/ **/
 
-/* USE_STRICT_BY_DEFAULT:
- *	This symbol, if defined, enables additional defaults.
- *	At this time it only enables implicit strict by default.
- */
-/*#define USE_STRICT_BY_DEFAULT	/ * use strict by default */
-
 /* USE_DYNAMIC_LOADING:
  *	This symbol, if defined, indicates that dynamic loading of
  *	some sort is available.
@@ -4220,6 +4214,12 @@
  */
 /*#define USE_C_BACKTRACE		/ **/
 
+/* USE_STRICT_BY_DEFAULT:
+ *	This symbol, if defined, enables additional defaults.
+ *	At this time it only enables implicit strict by default.
+ */
+/*#define USE_STRICT_BY_DEFAULT	/ * use strict by default */
+
 /* USE_DTRACE:
  *	This symbol, if defined, indicates that Perl should
  *	be built with support for DTrace.
@@ -5282,6 +5282,6 @@
 #endif
 
 /* Generated from:
- * 53ec858c462f9fa2669095834b3d350458c955777a07a0ad7a3a73162ff8ef0e config_h.SH
+ * 6edd641b187b02d0daa8cb53f5d22f2dcca115a0d3e744f51b0292d2db484ca5 config_h.SH
  * b53784d20c0f250807f47a3130cdc8e01a92da948e6747af87ebc24f11904722 uconfig.sh
  * ex: set ro: */