=?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: server: Allow 32-bit connections on ARM64.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 6adcad498c6c68aaff1bd3bd1c97880717a09a71
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6adcad498c6c68aaff1bd3bd1c97880717a09a71

Author: André Hentschel <nerv at dawncrow.de>
Date:   Tue May  5 23:50:36 2015 +0200

server: Allow 32-bit connections on ARM64.

---

 server/process.h | 2 +-
 server/thread.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/process.h b/server/process.h
index 59625f0..fa7f60d 100644
--- a/server/process.h
+++ b/server/process.h
@@ -107,7 +107,7 @@ struct process_snapshot
 };
 
 #define CPU_FLAG(cpu) (1 << (cpu))
-#define CPU_64BIT_MASK CPU_FLAG(CPU_x86_64)
+#define CPU_64BIT_MASK (CPU_FLAG(CPU_x86_64) | CPU_FLAG(CPU_ARM64))
 
 /* process functions */
 
diff --git a/server/thread.c b/server/thread.c
index 906b79d..6c5d12d 100644
--- a/server/thread.c
+++ b/server/thread.c
@@ -62,7 +62,7 @@ static const unsigned int supported_cpus = CPU_FLAG(CPU_POWERPC);
 #elif defined(__arm__)
 static const unsigned int supported_cpus = CPU_FLAG(CPU_ARM);
 #elif defined(__aarch64__)
-static const unsigned int supported_cpus = CPU_FLAG(CPU_ARM64);
+static const unsigned int supported_cpus = CPU_FLAG(CPU_ARM64) | CPU_FLAG(CPU_ARM);
 #else
 #error Unsupported CPU
 #endif