diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-01-05 17:02:19 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-01-05 17:02:19 (GMT) |
| commit | c040d037ef8145575f4df9a31bf4d6c023e096d4 (patch) | |
| tree | 9c4b7c195abd2dbd4e1c832fc13f54395d798c84 /unix | |
| parent | 9f96f3816e86d6b0b51042e961d23652acdb059c (diff) | |
| parent | 2f9727a745138487306a89f9e976b3c6acdead7d (diff) | |
| download | tcl-c040d037ef8145575f4df9a31bf4d6c023e096d4.zip tcl-c040d037ef8145575f4df9a31bf4d6c023e096d4.tar.gz tcl-c040d037ef8145575f4df9a31bf4d6c023e096d4.tar.bz2 | |
Merge 8.5: Add 4 processor-types to Win32/Cygwin. "platform" -> 1.0.16
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 4 | ||||
| -rw-r--r-- | unix/tclUnixInit.c | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 85acc1f..a68a6f4 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -956,8 +956,8 @@ install-libraries: libraries @echo "Installing package tcltest 2.5.3 as a Tcl Module"; @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(MODULE_INSTALL_DIR)/8.5/tcltest-2.5.3.tm"; - @echo "Installing package platform 1.0.15 as a Tcl Module"; - @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(MODULE_INSTALL_DIR)/8.4/platform-1.0.15.tm"; + @echo "Installing package platform 1.0.16 as a Tcl Module"; + @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(MODULE_INSTALL_DIR)/8.4/platform-1.0.16.tm"; @echo "Installing package platform::shell 1.1.4 as a Tcl Module"; @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(MODULE_INSTALL_DIR)/8.4/platform/shell-1.1.4.tm"; diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c index 72039ac..7467938 100644 --- a/unix/tclUnixInit.c +++ b/unix/tclUnixInit.c @@ -48,10 +48,10 @@ DLLIMPORT extern __stdcall void GetSystemInfo(void *); } #endif -#define NUMPROCESSORS 11 +#define NUMPROCESSORS 15 static const char *const processors[NUMPROCESSORS] = { - "intel", "mips", "alpha", "ppc", "shx", "arm", "ia64", "alpha64", "msil", - "amd64", "ia32_on_win64" + "i686", "mips", "alpha", "ppc", "shx", "arm", "ia64", "alpha64", "msil", + "x86_64", "ia32_on_win64", "neutral", "arm64", "arm32_on_win64", "ia32_on_arm64" }; typedef struct { @@ -895,8 +895,7 @@ TclpSetVariables( GetSystemInfo(&sysInfo); - Tcl_SetVar2(interp, "tcl_platform", "os", - "Windows NT", TCL_GLOBAL_ONLY); + Tcl_SetVar2(interp, "tcl_platform", "os", "Windows NT", TCL_GLOBAL_ONLY); sprintf(buffer, "%d.%d", osInfo.dwMajorVersion, osInfo.dwMinorVersion); Tcl_SetVar2(interp, "tcl_platform", "osVersion", buffer, TCL_GLOBAL_ONLY); if (sysInfo.wProcessorArchitecture < NUMPROCESSORS) { |