From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 62F4D394FC17; Thu, 20 May 2021 07:16:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 62F4D394FC17 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: suppress FAST_CWD warnings on ARM64 X-Act-Checkin: newlib-cygwin X-Git-Author: Jeremy Drake X-Git-Refname: refs/heads/master X-Git-Oldrev: c8949d04001e3dbc03651475b6cd1c5623400835 X-Git-Newrev: 338548f82fa32748a92c94036644db1a5b42cbf5 Message-Id: <20210520071638.62F4D394FC17@sourceware.org> Date: Thu, 20 May 2021 07:16:38 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 May 2021 07:16:38 -0000 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=338548f82fa32748a92c94036644db1a5b42cbf5 commit 338548f82fa32748a92c94036644db1a5b42cbf5 Author: Jeremy Drake Date: Wed May 19 11:43:48 2021 +0200 Cygwin: suppress FAST_CWD warnings on ARM64 The old check was insufficient: new insider preview builds of Windows allow running x86_64 process on ARM64. The IsWow64Process2 function seems to be the intended way to figure this situation out. Diff: --- winsup/cygwin/autoload.cc | 1 + winsup/cygwin/path.cc | 33 +++++++++------------------------ 2 files changed, 10 insertions(+), 24 deletions(-) diff --git a/winsup/cygwin/autoload.cc b/winsup/cygwin/autoload.cc index b2de2c3f4..0ebe15332 100644 --- a/winsup/cygwin/autoload.cc +++ b/winsup/cygwin/autoload.cc @@ -587,6 +587,7 @@ LoadDLLfuncEx (GetLogicalProcessorInformationEx, 12, kernel32, 1) LoadDLLfuncEx (GetProcessGroupAffinity, 12, kernel32, 1) LoadDLLfunc (GetSystemTimePreciseAsFileTime, 4, kernel32) LoadDLLfuncEx (GetThreadGroupAffinity, 8, kernel32, 1) +LoadDLLfuncEx (IsWow64Process2, 12, kernel32, 1) LoadDLLfuncEx (PrefetchVirtualMemory, 16, kernel32, 1) LoadDLLfunc (SetThreadGroupAffinity, 12, kernel32) diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc index 637c32348..b8850a11a 100644 --- a/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc @@ -4702,30 +4702,15 @@ find_fast_cwd () if (!f_cwd_ptr) { bool warn = 1; - -#ifndef __x86_64__ - #ifndef PROCESSOR_ARCHITECTURE_ARM64 - #define PROCESSOR_ARCHITECTURE_ARM64 12 - #endif - - SYSTEM_INFO si; - - /* Check if we're running in WOW64 on ARM64. Skip the warning as long as - there's no solution for finding the FAST_CWD pointer on that system. - - 2018-07-12: Apparently current ARM64 WOW64 has a bug: - It's GetNativeSystemInfo returns PROCESSOR_ARCHITECTURE_INTEL in - wProcessorArchitecture. Since that's an invalid value (a 32 bit - host system hosting a 32 bit emulator for itself?) we can use this - value as an indicator to skip the message as well. */ - if (wincap.is_wow64 ()) - { - GetNativeSystemInfo (&si); - if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_ARM64 - || si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) - warn = 0; - } -#endif /* !__x86_64__ */ + USHORT emulated, hosted; + + /* Check if we're running in WOW64 on ARM64. Check on 64 bit as well, + given that ARM64 Windows 10 provides a x86_64 emulation soon. Skip + warning as long as there's no solution for finding the FAST_CWD + pointer on that system. */ + if (IsWow64Process2 (GetCurrentProcess (), &emulated, &hosted) + && hosted == IMAGE_FILE_MACHINE_ARM64) + warn = 0; if (warn) small_printf ("Cygwin WARNING:\n"