(cherry-pick): Simplification for [d58e315172]

version -> 8.6.17 for futher development

README.md

@@ -1,6 +1,6 @@
 # README:  Tcl
 
-This is the **Tcl 8.6.16** source distribution.
+This is the **Tcl 8.6.17** source distribution.
 
 You can get any source release of Tcl from [our distribution
 site](https://sourceforge.net/projects/tcl/files/Tcl/).

generic/tcl.h

@@ -56,10 +56,10 @@ extern "C" {
 #endif
 #define TCL_MINOR_VERSION   6
 #define TCL_RELEASE_LEVEL   TCL_FINAL_RELEASE
-#define TCL_RELEASE_SERIAL  16
+#define TCL_RELEASE_SERIAL  17
 
 #define TCL_VERSION	    "8.6"
-#define TCL_PATCH_LEVEL	    "8.6.16"
+#define TCL_PATCH_LEVEL	    "8.6.17"
 
 /*
  *----------------------------------------------------------------------------

library/init.tcl

@@ -18,7 +18,7 @@
 if {[info commands package] == ""} {
     error "version mismatch: library\nscripts expect Tcl version 7.5b1 or later but the loaded version is\nonly [info patchlevel]"
 }
-package require -exact Tcl 8.6.16
+package require -exact Tcl 8.6.17
 
 # Compute the auto path to use in this interpreter.
 # The values on the path come from several locations:

unix/Makefile.in

@@ -1966,9 +1966,6 @@ ZIPNAME	 = tcl${MAJOR_VERSION}${MINOR_VERSION}${PATCH_LEVEL}-src.zip
 DISTDIR	 = $(DISTROOT)/$(DISTNAME)
 BUILTIN_PACKAGE_LIST = http1.0 http opt msgcat reg dde tcltest platform
 
-$(UNIX_DIR)/configure: $(UNIX_DIR)/configure.in $(UNIX_DIR)/tcl.m4 \
-		$(UNIX_DIR)/aclocal.m4
-	cd $(UNIX_DIR); autoconf
 $(MAC_OSX_DIR)/configure: $(MAC_OSX_DIR)/configure.ac $(UNIX_DIR)/configure
 	cd $(MAC_OSX_DIR); autoconf
 $(UNIX_DIR)/tclConfig.h.in: $(MAC_OSX_DIR)/configure

unix/configure

@@ -1335,7 +1335,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 TCL_VERSION=8.6
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=6
-TCL_PATCH_LEVEL=".16"
+TCL_PATCH_LEVEL=".17"
 VERSION=${TCL_VERSION}
 
 EXTRA_INSTALL_BINARIES=${EXTRA_INSTALL_BINARIES:-"@:"}

unix/configure.in

@@ -26,7 +26,7 @@ m4_ifdef([SC_USE_CONFIG_HEADERS], [
 TCL_VERSION=8.6
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=6
-TCL_PATCH_LEVEL=".16"
+TCL_PATCH_LEVEL=".17"
 VERSION=${TCL_VERSION}
 
 EXTRA_INSTALL_BINARIES=${EXTRA_INSTALL_BINARIES:-"@:"}

unix/tcl.spec

@@ -4,7 +4,7 @@
 
 Name:          tcl
 Summary:       Tcl scripting language development environment
-Version:       8.6.16
+Version:       8.6.17
 Release:       2
 License:       BSD
 Group:         Development/Languages

win/configure

@@ -1325,7 +1325,7 @@ SHELL=/bin/sh
 TCL_VERSION=8.6
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=6
-TCL_PATCH_LEVEL=".16"
+TCL_PATCH_LEVEL=".17"
 VER=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION
 
 TCL_DDE_VERSION=1.4
@@ -4949,10 +4949,9 @@ fi
 
 # See if the compiler supports cpuid header.
 
-if test "${GCC}" = "yes" ; then
-  echo "$as_me:$LINENO: checking for cpuid-header support in compiler" >&5
-echo $ECHO_N "checking for cpuid-header support in compiler... $ECHO_C" >&6
-if test "${tcl_cv_cpuidhead+set}" = set; then
+echo "$as_me:$LINENO: checking for cpuid.h" >&5
+echo $ECHO_N "checking for cpuid.h... $ECHO_C" >&6
+if test "${tcl_cv_cpuid_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -4962,24 +4961,21 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-  #if defined (__clang__) || ((__GNUC__)  && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 8))))
-  #   include <cpuid.h>
-  #endif
+#include <cpuid.h>
 
 int
 main ()
 {
 
-    unsigned int regs;
-    __get_cpuid(0, &regs, &regs, &regs, &regs);
+    __get_cpuid(0, 0, 0, 0, 0);
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -4993,32 +4989,30 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+	 { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  tcl_cv_cpuidhead=yes
+  tcl_cv_cpuid_h=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-tcl_cv_cpuidhead=no
+tcl_cv_cpuid_h=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_cpuidhead" >&5
-echo "${ECHO_T}$tcl_cv_cpuidhead" >&6
-  if test "$tcl_cv_cpuidhead" = "yes"; then
+echo "$as_me:$LINENO: result: $tcl_cv_cpuid_h" >&5
+echo "${ECHO_T}$tcl_cv_cpuid_h" >&6
+if test "$tcl_cv_cpuid_h" = "yes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_CPUID_H 1
 _ACEOF
 
-  fi
 fi
 
 # See if the <wspiapi.h> header file is present

win/configure.in

@@ -15,7 +15,7 @@ SHELL=/bin/sh
 TCL_VERSION=8.6
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=6
-TCL_PATCH_LEVEL=".16"
+TCL_PATCH_LEVEL=".17"
 VER=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION
 
 TCL_DDE_VERSION=1.4
@@ -249,24 +249,19 @@ fi
 
 # See if the compiler supports cpuid header.
 
-if test "${GCC}" = "yes" ; then
-  AC_CACHE_CHECK(for cpuid-header support in compiler,
-    tcl_cv_cpuidhead,
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-  #if defined (__clang__) || ((__GNUC__)  && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 8))))
-  #   include <cpuid.h>
-  #endif
-  ]], [[
-    unsigned int regs;
-    __get_cpuid(0, &regs, &regs, &regs, &regs);
+AC_CACHE_CHECK(for cpuid.h,
+    tcl_cv_cpuid_h,
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#include <cpuid.h>
+]], [[
+    __get_cpuid(0, 0, 0, 0, 0);
   ]])],
-    [tcl_cv_cpuidhead=yes],
-    [tcl_cv_cpuidhead=no])
-  )
-  if test "$tcl_cv_cpuidhead" = "yes"; then
+    [tcl_cv_cpuid_h=yes],
+    [tcl_cv_cpuid_h=no])
+)
+if test "$tcl_cv_cpuid_h" = "yes"; then
     AC_DEFINE(HAVE_CPUID_H, 1,
-	    [Defined when the compilers supports cpuid header])
-  fi
+	    [Defined when cpuid.h exists])
 fi
 
 # See if the <wspiapi.h> header file is present