public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
* [newlib-cygwin] Cygwin: suppress FAST_CWD warnings on ARM64
@ 2021-05-20 7:16 Corinna Vinschen
0 siblings, 0 replies; only message in thread
From: Corinna Vinschen @ 2021-05-20 7:16 UTC (permalink / raw)
To: cygwin-cvs
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=338548f82fa32748a92c94036644db1a5b42cbf5
commit 338548f82fa32748a92c94036644db1a5b42cbf5
Author: Jeremy Drake <cygwin@jdrake.com>
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"
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-05-20 7:16 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-20 7:16 [newlib-cygwin] Cygwin: suppress FAST_CWD warnings on ARM64 Corinna Vinschen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).