Alexandre Julliard : tests: Use ARM64 as architecture in manifests on ARM64EC.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: bf84534793e601c8e9b397c469c5ebd447bdbd1d
URL:    https://gitlab.winehq.org/wine/wine/-/commit/bf84534793e601c8e9b397c469c5ebd...

Author: Alexandre Julliard 
Date:   Wed Jun 12 09:55:08 2024 +0200

tests: Use ARM64 as architecture in manifests on ARM64EC.

---

dlls/comctl32/tests/v6util.h  | 4 ++--
 dlls/kernel32/tests/actctx.c  | 4 ++--
 dlls/kernel32/tests/path.c    | 4 ++--
 dlls/oleaut32/tests/typelib.c | 4 ++--
 dlls/user32/tests/class.c     | 4 ++--
 dlls/user32/tests/msg.c       | 4 ++--
 dlls/uxtheme/tests/v6util.h   | 4 ++--
 dlls/vcomp/tests/vcomp.c      | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/dlls/comctl32/tests/v6util.h b/dlls/comctl32/tests/v6util.h
index fc32616d777..a4e928f51bf 100644
--- a/dlls/comctl32/tests/v6util.h
+++ b/dlls/comctl32/tests/v6util.h
@@ -22,12 +22,12 @@

#ifdef __i386__
 #define ARCH "x86"
+#elif defined __aarch64__ || defined__arm64ec__
+#define ARCH "arm64"
 #elif defined __x86_64__
 #define ARCH "amd64"
 #elif defined __arm__
 #define ARCH "arm"
-#elif defined __aarch64__
-#define ARCH "arm64"
 #else
 #define ARCH "none"
 #endif
diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c
index 20e5e42b620..b6f43b12f1a 100644
--- a/dlls/kernel32/tests/actctx.c
+++ b/dlls/kernel32/tests/actctx.c
@@ -37,12 +37,12 @@ static VOID    (NTAPI *pRtlFreeUnicodeString)(PUNICODE_STRING);

#ifdef __i386__
 #define ARCH "x86"
+#elif defined __aarch64__ || defined__arm64ec__
+#define ARCH "arm64"
 #elif defined __x86_64__
 #define ARCH "amd64"
 #elif defined __arm__
 #define ARCH "arm"
-#elif defined __aarch64__
-#define ARCH "arm64"
 #else
 #define ARCH "none"
 #endif
diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c
index 7e122780602..46eef74bce3 100644
--- a/dlls/kernel32/tests/path.c
+++ b/dlls/kernel32/tests/path.c
@@ -47,12 +47,12 @@

#ifdef __i386__
 #define ARCH "x86"
+#elif defined __aarch64__ || defined__arm64ec__
+#define ARCH "arm64"
 #elif defined __x86_64__
 #define ARCH "amd64"
 #elif defined __arm__
 #define ARCH "arm"
-#elif defined __aarch64__
-#define ARCH "arm64"
 #else
 #define ARCH "none"
 #endif
diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c
index eb5407f034f..153964e17d5 100644
--- a/dlls/oleaut32/tests/typelib.c
+++ b/dlls/oleaut32/tests/typelib.c
@@ -64,12 +64,12 @@

#ifdef __i386__
 #define ARCH "x86"
+#elif defined __aarch64__ || defined__arm64ec__
+#define ARCH "arm64"
 #elif defined __x86_64__
 #define ARCH "amd64"
 #elif defined __arm__
 #define ARCH "arm"
-#elif defined __aarch64__
-#define ARCH "arm64"
 #else
 #define ARCH "none"
 #endif
diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c
index 686fced55ee..03f6b0c549b 100644
--- a/dlls/user32/tests/class.c
+++ b/dlls/user32/tests/class.c
@@ -37,12 +37,12 @@

#ifdef __i386__
 #define ARCH "x86"
+#elif defined __aarch64__ || defined__arm64ec__
+#define ARCH "arm64"
 #elif defined __x86_64__
 #define ARCH "amd64"
 #elif defined __arm__
 #define ARCH "arm"
-#elif defined __aarch64__
-#define ARCH "arm64"
 #else
 #define ARCH "none"
 #endif
diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index 60067b7ab02..edfd8e5eb3f 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -63,12 +63,12 @@

#ifdef __i386__
 #define ARCH "x86"
+#elif defined __aarch64__ || defined__arm64ec__
+#define ARCH "arm64"
 #elif defined __x86_64__
 #define ARCH "amd64"
 #elif defined __arm__
 #define ARCH "arm"
-#elif defined __aarch64__
-#define ARCH "arm64"
 #else
 #define ARCH "none"
 #endif
diff --git a/dlls/uxtheme/tests/v6util.h b/dlls/uxtheme/tests/v6util.h
index fc32616d777..a4e928f51bf 100644
--- a/dlls/uxtheme/tests/v6util.h
+++ b/dlls/uxtheme/tests/v6util.h
@@ -22,12 +22,12 @@

#ifdef __i386__
 #define ARCH "x86"
+#elif defined __aarch64__ || defined__arm64ec__
+#define ARCH "arm64"
 #elif defined __x86_64__
 #define ARCH "amd64"
 #elif defined __arm__
 #define ARCH "arm"
-#elif defined __aarch64__
-#define ARCH "arm64"
 #else
 #define ARCH "none"
 #endif
diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c
index 43a9cc7ce16..3542581a565 100644
--- a/dlls/vcomp/tests/vcomp.c
+++ b/dlls/vcomp/tests/vcomp.c
@@ -153,12 +153,12 @@ static void  (CDECL   *pomp_unset_nest_lock)(omp_nest_lock_t *lock);

#ifdef __i386__
 #define ARCH "x86"
+#elif defined __aarch64__ || defined__arm64ec__
+#define ARCH "arm64"
 #elif defined(__x86_64__)
 #define ARCH "amd64"
 #elif defined __arm__
 #define ARCH "arm"
-#elif defined __aarch64__
-#define ARCH "arm64"
 #else
 #define ARCH "none"
 #endif