summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2022-02-11 16:21:35 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2022-02-11 16:21:35 (GMT)
commit21db6889635b43cef6b659b974ec0883a551d4e1 (patch)
tree3de871a44bb6c48e7bc8d59111b94d4aee7cd5a8
parent85cb8c27f27b0f3dab72ab181ba1bed5400e13e5 (diff)
downloadtcl-21db6889635b43cef6b659b974ec0883a551d4e1.zip
tcl-21db6889635b43cef6b659b974ec0883a551d4e1.tar.gz
tcl-21db6889635b43cef6b659b974ec0883a551d4e1.tar.bz2
more tweaks for windows-arm64
-rw-r--r--libtommath/tommath.h2
-rw-r--r--win/rules.vc6
2 files changed, 4 insertions, 4 deletions
diff --git a/libtommath/tommath.h b/libtommath/tommath.h
index 22951c9..8ccbb89 100644
--- a/libtommath/tommath.h
+++ b/libtommath/tommath.h
@@ -37,7 +37,7 @@ extern "C" {
#endif
/* detect 64-bit mode if possible */
-#if defined(__x86_64__) || defined(_M_X64) || defined(_M_AMD64) || \
+#if defined(__x86_64__) || defined(_M_X64) || defined(_M_AMD64) || defined(_M_ARM64) || \
defined(__powerpc64__) || defined(__ppc64__) || defined(__PPC64__) || \
defined(__s390x__) || defined(__arch64__) || defined(__aarch64__) || \
defined(__sparcv9) || defined(__sparc_v9__) || defined(__sparc64__) || \
diff --git a/win/rules.vc b/win/rules.vc
index 4f103d0..b68b6b4 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -1384,7 +1384,7 @@ OPTDEFINES = $(OPTDEFINES) /DUSE_THREAD_ALLOC=1
OPTDEFINES = $(OPTDEFINES) /DSTATIC_BUILD
!elseif $(TCL_VERSION) > 86
OPTDEFINES = $(OPTDEFINES) /DTCL_WITH_EXTERNAL_TOMMATH
-!if "$(MACHINE)" == "AMD64"
+!if "$(MACHINE)" == "AMD64" || "$(MACHINE)" == "ARM64"
OPTDEFINES = $(OPTDEFINES) /DMP_64BIT
!endif
!endif
@@ -1412,7 +1412,7 @@ OPTDEFINES = $(OPTDEFINES) /DTCL_CFG_OPTIMIZED
!if $(PROFILE)
OPTDEFINES = $(OPTDEFINES) /DTCL_CFG_PROFILED
!endif
-!if "$(MACHINE)" == "AMD64"
+!if "$(MACHINE)" == "AMD64" || "$(MACHINE)" == "ARM64"
OPTDEFINES = $(OPTDEFINES) /DTCL_CFG_DO64BIT
!endif
!if $(VCVERSION) < 1300
@@ -1474,7 +1474,7 @@ cdebug = $(cdebug) -Zi
# cwarn includes default warning levels.
cwarn = $(WARNINGS)
-!if "$(MACHINE)" == "AMD64"
+!if "$(MACHINE)" == "AMD64" || "$(MACHINE)" == "ARM64"
# Disable pointer<->int warnings related to cast between different sizes
# There are a gadzillion of these due to use of ClientData and
# clutter up compiler