Make --enable-64bit=arm64 and --enable-64bit=aarch64 synonymes

tcltk · Jan 2, 2025 · 2b15d0b · 2b15d0b
1 parent 048d824
commit 2b15d0b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/win/configure b/win/configure
@@ -3477,7 +3477,7 @@ echo "${ECHO_T}$ac_cv_win32" >&6
 echo "$as_me: error: ${CC} cannot produce win32 executables." >&2;}
    { (exit 1); exit 1; }; }
 	fi
-	if test "$do64bit" != "arm64"; then
+	if test "$do64bit" != "arm64" -a "$do64bit" != "aarch64"; then
 	    extra_cflags="$extra_cflags -DHAVE_CPUID=1"
 	fi
 
@@ -4396,7 +4396,7 @@ if test "$tcl_ok" = "yes"; then
 
   if test "$do64bit" != "no"; then
 
-    if test "$do64bit" = "arm64"; then
+    if test "$do64bit" = "arm64" -o "$do64bit" = "aarch64"; then
 
       if test "$GCC" = "yes"; then
 

diff --git a/win/configure.in b/win/configure.in
@@ -145,7 +145,7 @@ zlib_lib_name=zdll.lib
 AS_IF([test "$tcl_ok" = "yes"], [
   AC_SUBST(ZLIB_DLL_FILE,[\${ZLIB_DLL_FILE}])
   AS_IF([test "$do64bit" != "no"], [
-    AS_IF([test "$do64bit" = "arm64"], [
+    AS_IF([test "$do64bit" = "arm64" -o "$do64bit" = "aarch64"], [
       AS_IF([test "$GCC" = "yes"],[
 	AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR_NATIVE}/win64-arm/libz.dll.a])
 	zlib_lib_name=libz.dll.a

diff --git a/win/tcl.m4 b/win/tcl.m4
@@ -649,7 +649,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 	if test "$ac_cv_win32" != "yes"; then
 	    AC_MSG_ERROR([${CC} cannot produce win32 executables.])
 	fi
-	if test "$do64bit" != "arm64"; then
+	if test "$do64bit" != "arm64" -a "$do64bit" != "aarch64"; then
 	    extra_cflags="$extra_cflags -DHAVE_CPUID=1"
 	fi