Initial support for ARM64 Windows

HOWTO/INSTALL.md

@@ -801,6 +801,7 @@ Operating system
 * Ubuntu 10.04 - 22.04
 * Windows 11, Windows 10, Windows Server 2019
 
+
 [DESTDIR]: http://www.gnu.org/prep/standards/html_node/DESTDIR.html
 [Building in Git]: #advanced-configuration-and-build-of-erlang-otp_Building_Within-Git
 [Advanced Configure]: #advanced-configuration-and-build-of-erlang-otp_Configuring

erts/configure

@@ -3837,6 +3837,27 @@ test -n "$target_alias" &&
 
     # Adjust for local legacy windows hack...
     case $host in #(
+  local-aarch64-*-windows) :
+
+                host=win32
+                host_os=win32
+                host_vendor=
+                host_cpu=aarch64
+             ;; #(
+  local-x86_64-*-windows) :
+
+                host=win32
+                host_os=win32
+                host_vendor=
+                host_cpu=x86_64
+             ;; #(
+  local-i686-*-windows) :
+
+                host=win32
+                host_os=win32
+                host_vendor=
+                host_cpu=i686
+             ;; #(
   local-*-windows) :
 
                 host=win32
@@ -3851,6 +3872,27 @@ esac
 
     # Adjust for local legacy windows hack...
     case $build in #(
+  local-aarch64-*-windows) :
+
+                build=win32
+                build_os=win32
+                build_vendor=
+                build_cpu=aarch64
+             ;; #(
+  local-x86_64-*-windows) :
+
+                build=win32
+                build_os=win32
+                build_vendor=
+                build_cpu=x86_64
+             ;; #(
+  local-i686-*-windows) :
+
+                build=win32
+                build_os=win32
+                build_vendor=
+                build_cpu=i686
+             ;; #(
   local-*-windows) :
 
                 build=win32
@@ -3865,6 +3907,27 @@ esac
 
     # Adjust for local legacy windows hack...
     case $target in #(
+  local-aarch64-*-windows) :
+
+                target=win32
+                target_os=win32
+                target_vendor=
+                target_cpu=aarch64
+             ;; #(
+  local-x86_64-*-windows) :
+
+                target=win32
+                target_os=win32
+                target_vendor=
+                target_cpu=x86_64
+             ;; #(
+  local-i686-*-windows) :
+
+                target=win32
+                target_os=win32
+                target_vendor=
+                target_cpu=i686
+             ;; #(
   local-*-windows) :
 
                 target=win32
@@ -3876,18 +3939,19 @@ esac
      ;;
 esac
 
-    if test "$cross_compiling" = "yes" -a "$build" = "$host"
+    if test "$cross_compiling" = "yes" -a "$build" = "$host" -a "$build_cpu" = "$host_cpu"
 then :
   as_fn_error $? "
-           Cross compiling with the same canonicalized 'host' value
-           as the canonicalized 'build' value.
+           Cross compiling with the same canonicalized 'host' and 'host_cpu'
+           values as the canonicalized 'build' and 'build_cpu' values
 
            We are cross compiling since the '--host=$host_alias'
            and the '--build=$build_alias' arguments differ. When
            cross compiling Erlang/OTP, also the canonicalized values of
            the '--build' and the '--host' arguments *must* differ. The
            canonicalized values of these arguments however both equals:
-           $host
+           host = build = $host,
+           host_cpu = build_cpu = $host_cpu
 
            You can check the canonical value by passing a value as
            argument to the 'make/autoconf/config.sub' script.
@@ -6550,7 +6614,7 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
 printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_cxx11+y}
+if test ${ac_cv_prog_cxx_11+y}
 then :
   printf %s "(cached) " >&6
 else case e in #(
@@ -6599,7 +6663,7 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
 printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_cxx98+y}
+if test ${ac_cv_prog_cxx_98+y}
 then :
   printf %s "(cached) " >&6
 else case e in #(

erts/emulator/beam/bif.c

@@ -3901,11 +3901,11 @@ BIF_RETTYPE display_string_2(BIF_ALIST_2)
     int res;
 
 #ifdef __WIN32__
-    HANDLE fd;
+    FILE * fd;
     if (ERTS_IS_ATOM_STR("stdout", BIF_ARG_1)) {
-        fd = GetStdHandle(STD_OUTPUT_HANDLE);
+        fd = stdout;
     } else if (ERTS_IS_ATOM_STR("stderr", BIF_ARG_1)) {
-        fd = GetStdHandle(STD_ERROR_HANDLE);
+        fd = stderr;
     }
 #else
     int fd;
@@ -3964,11 +3964,9 @@ BIF_RETTYPE display_string_2(BIF_ALIST_2)
 #endif
     {
 #ifdef __WIN32__
-        Uint32 w;
-        if (!WriteFile(fd, str, len, &w, NULL)) {
+        res = fwrite(str, len, 1, fd);
+        if (res <= 0) 
             goto error;
-        }
-        written = (Sint)w;
 #else
         written = 0;
         do {

erts/emulator/beam/erl_time_sup.c

@@ -2302,9 +2302,7 @@ time_unit_conversion(Process *c_p, Eterm term, ErtsMonotonicTime val, ErtsMonoto
     case am_nanosecond:
     case am_nano_seconds:
     case make_small(1000*1000*1000):
-	result = ERTS_MONOTONIC_TO_NSEC(val) + muloff*ERTS_MONOTONIC_OFFSET_NSEC;
-	ERTS_BIF_PREP_RET(ret, make_time_val(c_p, result));
-	break;
+    goto trap_to_erlang_code;
 #endif
     case am_perf_counter:
 	goto trap_to_erlang_code;

erts/emulator/beam/jit/arm/instr_common.cpp

@@ -3109,7 +3109,12 @@ void BeamModuleAssembler::emit_i_perf_counter() {
     Label next = a.newLabel(), small = a.newLabel();
 
     emit_enter_runtime_frame();
+#ifdef WIN32
+    /* Call the function pointer used by erts_sys_perf_counter */
+    runtime_call<0>(erts_sys_time_data__.r.o.sys_hrtime);
+#else
     runtime_call<0>(erts_sys_time_data__.r.o.perf_counter);
+#endif
     emit_leave_runtime_frame();
 
     a.asr(TMP1, ARG1, imm(SMALL_BITS - 1));

erts/emulator/beam/jit/beam_jit_common.hpp

@@ -195,14 +195,14 @@ struct BeamModuleAssemblerCommon {
     }
 
     /* Helpers */
-    const auto &getTypeEntry(const ArgSource &arg) const {
+    const BeamArgType &getTypeEntry(const ArgSource &arg) const {
         auto typeIndex =
                 arg.isRegister() ? arg.as<ArgRegister>().typeIndex() : 0;
         ASSERT(typeIndex < beam->types.count);
         return static_cast<BeamArgType &>(beam->types.entries[typeIndex]);
     }
 
-    auto getTypeUnion(const ArgSource &arg) const {
+    BeamTypeId getTypeUnion(const ArgSource &arg) const {
         if (arg.isRegister()) {
             return getTypeEntry(arg).type();
         }

erts/etc/win32/nsis/erlang20.nsi

@@ -56,9 +56,9 @@ Var STARTMENU_FOLDER
 
 ;Folder selection page
 !if ${WINTYPE} == "win64"
-  	InstallDir "$PROGRAMFILES64\Erlang OTP"
+	InstallDir "$PROGRAMFILES64\Erlang OTP"
 !else
-  	InstallDir "$PROGRAMFILES\Erlang OTP"
+	InstallDir "$PROGRAMFILES\Erlang OTP"
 !endif  
 ;Remember install folder
   	InstallDirRegKey HKLM "SOFTWARE\Ericsson\Erlang\${ERTS_VERSION}" ""

erts/etc/win32/wsl_tools/SetupWSLcross.bat

@@ -2,8 +2,11 @@
 rem Setup MCL and echo the environment
 rem Usage: eval `cmd.exe /c SetupWSLcross.bat x64`
 
+set MACHINE="%~1"
 IF "%~1"=="x86" GOTO search
 IF "%~1"=="x64" GOTO search
+IF "%~1"=="arm64" GOTO search
+IF "%~1"=="amd64_arm64" GOTO search
 
 GOTO badarg
 
@@ -67,7 +70,12 @@ GOTO no_vcvars
 
 :continue
 
-FOR /F "delims==" %%F IN ('where cl.exe') DO SET _cl_exec_=%%F
+FOR /F "delims==" %%F IN ('where cl.exe') DO (
+   SET _cl_exec_=%%F
+   goto set_cl_path
+)
+
+:set_cl_path
 FOR %%F IN ("%_cl_exec_%") DO SET CL_PATH=%%~dpF
 
 FOR /F "delims==" %%F IN ('where rc.exe') DO SET _rc_exec_=%%F
@@ -87,7 +95,7 @@ wsl.exe echo "# Eval this file eval \`cmd.exe /c SetupWSLcross.bat\`"
 exit
 
 :badarg
-echo "Bad TARGET or not specified: %~1 expected x86 or x64"
+echo "Bad TARGET or not specified: %~1 expected x86, x64, arm64 or x64_arm64"
 exit
 
 :no_vcvars

erts/etc/win32/wsl_tools/reg_query.sh

@@ -10,6 +10,8 @@ BACKED=`echo "$1" | sed 's,/,\\\\,g'`
 
 if [ $CONFIG_SUBTYPE = "win64" ]; then
     REG_OPT=" /reg:64"
+elif [ X"$CONFIG_SUBTYPE" = X"arm64" -o X"$CONFIG_SUBTYPE" = X"x64_arm64" ]; then
+    REG_OPT=" /reg:64"
 else
     REG_OPT=" /reg:32"
 fi

erts/etc/win32/wsl_tools/vc/cc.sh

@@ -29,6 +29,15 @@ SAVE="$@"
 # Constants
 COMMON_CFLAGS="-nologo -D__WIN32__ -DWIN32 -DWINDOWS -D_WIN32 -DNT -D_CRT_SECURE_NO_DEPRECATE"
 
+if [ "$CONFIG_SUBTYPE" = "x64_arm64" -o "$CONFIG_SUBTYPE" = "arm64" ]; then
+    MACHINE="ARM64"
+    COMMON_CFLAGS="${COMMON_CFLAGS} -D__aarch64__"
+elif [ "$CONFIG_SUBTYPE" = "win64" ]; then
+    MACHINE="x64"
+else
+    MACHINE="x86"
+fi
+
 # Variables
 # The stdout and stderr for the compiler
 MSG_FILE=/tmp/cl.exe.$$.1
@@ -64,7 +73,7 @@ CMD=""
 # All the c source files, in unix style
 SOURCES=""
 # All the options to pass to the linker, kept in Unix style
-LINKCMD=""
+LINKCMD="-MACHINE:${MACHINE}"
 
 
 # Loop through the parameters and set the above variables accordingly

erts/etc/win32/wsl_tools/vc/emu_cc.sh

@@ -23,6 +23,8 @@
 
 if [ X"$CONFIG_SUBTYPE" = X"win64" ]; then
     GCC="x86_64-w64-mingw32-gcc -m64"
+elif [ X"$CONFIG_SUBTYPE" = X"arm64" || X"$CONFIG_SUBTYPE" = X"x64_arm64" ]; then
+    GCC="aarch64-w64-mingw32-gcc -m64"
 else
     GCC="x86_64-w64-mingw32-gcc -m32"
 fi