7cfcfbe992
This backports the `uname` patches from Cygwin where Windows/ARM64 is indicated by an `-ARM64` suffix. It corresponds to https://github.com/msys2/msys2-runtime/pull/245 and https://github.com/msys2/msys2-runtime/pull/244. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
59 lines
2.0 KiB
Diff
59 lines
2.0 KiB
Diff
From 51909270bb8322cd659ea88edd4f37ed424c567e Mon Sep 17 00:00:00 2001
|
|
From: Jeremy Drake <github@jdrake.com>
|
|
Date: Tue, 19 Nov 2024 22:41:42 -0800
|
|
Subject: [PATCH 61/N] Cygwin: uname: add host machine tag to sysname.
|
|
|
|
If the Cygwin dll's architecture is different from the host system's
|
|
architecture, append an additional tag that indicates the host system
|
|
architecture (the Cygwin dll's architecture is already indicated in
|
|
machine).
|
|
|
|
Signed-off-by: Jeremy Drake <cygwin@jdrake.com>
|
|
---
|
|
winsup/cygwin/uname.cc | 28 ++++++++++++++++++++++++----
|
|
1 file changed, 24 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/winsup/cygwin/uname.cc b/winsup/cygwin/uname.cc
|
|
index f6a5f88..efd233c 100644
|
|
--- a/winsup/cygwin/uname.cc
|
|
+++ b/winsup/cygwin/uname.cc
|
|
@@ -51,14 +51,34 @@ uname_x (struct utsname *name)
|
|
{
|
|
char buf[NI_MAXHOST + 1] ATTRIBUTE_NONSTRING;
|
|
char *snp = strstr (cygwin_version.dll_build_date, "SNP");
|
|
+ int n;
|
|
|
|
memset (name, 0, sizeof (*name));
|
|
/* sysname */
|
|
const char* sysname = get_sysname();
|
|
- __small_sprintf (name->sysname, "%s_%s-%u%s",
|
|
- sysname,
|
|
- wincap.osname (), wincap.build_number (),
|
|
- wincap.is_wow64 () ? "-WOW64" : "");
|
|
+ n = __small_sprintf (name->sysname, "%s_%s-%u",
|
|
+ sysname,
|
|
+ wincap.osname (), wincap.build_number ());
|
|
+ if (wincap.host_machine () != wincap.cygwin_machine ())
|
|
+ {
|
|
+ switch (wincap.host_machine ())
|
|
+ {
|
|
+ case IMAGE_FILE_MACHINE_AMD64:
|
|
+ /* special case for backwards compatibility */
|
|
+ if (wincap.cygwin_machine () == IMAGE_FILE_MACHINE_I386)
|
|
+ n = stpcpy (name->sysname + n, "-WOW64") - name->sysname;
|
|
+ else
|
|
+ n = stpcpy (name->sysname + n, "-x64") - name->sysname;
|
|
+ break;
|
|
+ case IMAGE_FILE_MACHINE_ARM64:
|
|
+ n = stpcpy (name->sysname + n, "-ARM64") - name->sysname;
|
|
+ break;
|
|
+ default:
|
|
+ n += __small_sprintf (name->sysname + n, "-%04y",
|
|
+ (int) wincap.host_machine ());
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
/* nodename */
|
|
memset (buf, 0, sizeof buf);
|
|
cygwin_gethostname (buf, sizeof buf - 1);
|