drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Jeremy Drake 2021-05-19 11:43:48 +02:00 committed by Corinna Vinschen
parent c8949d0400
commit 338548f82f
2 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
winsup/cygwin/autoload.cc
View File

@ -587,6 +587,7 @@ LoadDLLfuncEx (GetLogicalProcessorInformationEx, 12, kernel32, 1)
LoadDLLfuncEx (GetProcessGroupAffinity, 12, kernel32, 1) LoadDLLfuncEx (GetProcessGroupAffinity, 12, kernel32, 1)
LoadDLLfunc (GetSystemTimePreciseAsFileTime, 4, kernel32) LoadDLLfunc (GetSystemTimePreciseAsFileTime, 4, kernel32)
LoadDLLfuncEx (GetThreadGroupAffinity, 8, kernel32, 1) LoadDLLfuncEx (GetThreadGroupAffinity, 8, kernel32, 1)
LoadDLLfuncEx (IsWow64Process2, 12, kernel32, 1)
LoadDLLfuncEx (PrefetchVirtualMemory, 16, kernel32, 1) LoadDLLfuncEx (PrefetchVirtualMemory, 16, kernel32, 1)
LoadDLLfunc (SetThreadGroupAffinity, 12, kernel32) LoadDLLfunc (SetThreadGroupAffinity, 12, kernel32)

31
winsup/cygwin/path.cc
View File

@ -4702,30 +4702,15 @@ find_fast_cwd ()
if (!f_cwd_ptr) if (!f_cwd_ptr)
{ {
bool warn = 1; bool warn = 1;
USHORT emulated, hosted;
#ifndef __x86_64__ /* Check if we're running in WOW64 on ARM64. Check on 64 bit as well,
#ifndef PROCESSOR_ARCHITECTURE_ARM64 given that ARM64 Windows 10 provides a x86_64 emulation soon. Skip
#define PROCESSOR_ARCHITECTURE_ARM64 12 warning as long as there's no solution for finding the FAST_CWD
#endif pointer on that system. */
if (IsWow64Process2 (GetCurrentProcess (), &emulated, &hosted)
SYSTEM_INFO si; && hosted == IMAGE_FILE_MACHINE_ARM64)
warn = 0;
/* 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__ */
if (warn) if (warn)
small_printf ("Cygwin WARNING:\n" small_printf ("Cygwin WARNING:\n"