Changeset 3647

Timestamp:

Nov 3, 2024, 3:33:51 AM (12 months ago)

Author:

bird

Message:

envwin.cmd: ARM64 tweak for tcc.exe/amd64.

File:

• trunk/kBuild/envwin.cmd (modified) (3 diffs)

trunk/kBuild/envwin.cmd

@@ -6 +6 @@
 
 REM
-REM Copyright (c) 2005-2010 knut st. osmundsen <bird-kBuild-spamx@anduin.net>
+REM Copyright (c) 2005-2024 knut st. osmundsen <bird-kBuild-spamx@anduin.net>
 REM
 REM This file is part of kBuild.
@@ -452 +452 @@
 if ".%KBUILD_HOST_CPU%" == ".k10"       set _KBUILD_HOST_ARCH=amd64
 if not ".%_KBUILD_HOST_ARCH%" == "."    goto have_host_arch
-REM try guess from PROCESSOR_ARCHITEW6432 and PROCESSOR_ARCHITECTURE
+REM try guess from PROCESSOR_ARCHITECTURE, PROCESSOR_ARCHITEW6432, and
+REM PROCESSOR_IDENTIFIER (latter for arm running non-native shells (tcc.exe)).
 set _KBUILD_TMP=%PROCESSOR_ARCHITECTURE%
 if not ".%PROCESSOR_ARCHITEW6432%" == "." set _KBUILD_TMP=%PROCESSOR_ARCHITEW6432%
@@ -462 +463 @@
 if "%_KBUILD_TMP%" == "x64"             set _KBUILD_HOST_ARCH=amd64
 if "%_KBUILD_TMP%" == "X64"             set _KBUILD_HOST_ARCH=amd64
+if /i "%PROCESSOR_IDENTIFIER:~0,5%" == "ARMv8" set _KBUILD_HOST_ARCH=arm64
+if /i "%PROCESSOR_IDENTIFIER:~0,5%" == "ARMv9" set _KBUILD_HOST_ARCH=arm64
 if not ".%_KBUILD_HOST_ARCH%" == "."    goto have_host_arch
 echo error: Cannot figure KBUILD_HOST_ARCH!