1From 298d958148f1fb2bb7725fed15c68c09677c14c9 Mon Sep 17 00:00:00 2001
2From: Vincent Prince <vincent.prince.fr@gmail.com>
3Date: Mon, 16 Sep 2019 13:37:10 +0200
4Subject: [PATCH 05/10] Add alises for arm64 which is same as aarch64
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7Signed-off-by: Vincent Prince <vincent.prince.fr@gmail.com>
8---
9 SConstruct                                      | 1 +
10 src/third_party/IntelRDFPMathLib20U1/SConscript | 2 +-
11 src/third_party/wiredtiger/SConscript           | 2 +-
12 3 files changed, 3 insertions(+), 2 deletions(-)
13
14diff --git a/SConstruct b/SConstruct
15index 448939bdd0..abfd816f3e 100644
16--- a/SConstruct
17+++ b/SConstruct
18@@ -1228,6 +1228,7 @@ if endian == "auto":
19 processor_macros = {
20     'arm'        : { 'endian': 'little', 'defines': ('__arm__',) },
21     'aarch64'    : { 'endian': 'little', 'defines': ('__arm64__', '__aarch64__')},
22+    'arm64'      : { 'endian': 'little', 'defines': ('__arm64__', '__aarch64__')},
23     'i386'       : { 'endian': 'little', 'defines': ('__i386', '_M_IX86')},
24     'ppc64le'    : { 'endian': 'little', 'defines': ('__powerpc64__',)},
25     's390x'      : { 'endian': 'big',    'defines': ('__s390x__',)},
26diff --git a/src/third_party/IntelRDFPMathLib20U1/SConscript b/src/third_party/IntelRDFPMathLib20U1/SConscript
27index 58e1b7ba65..bffe83b462 100644
28--- a/src/third_party/IntelRDFPMathLib20U1/SConscript
29+++ b/src/third_party/IntelRDFPMathLib20U1/SConscript
30@@ -309,7 +309,7 @@ if processor == 'i386' or processor == 'emscripten':
31 elif processor == 'arm':
32     cpp_defines['IA32'] = '1'
33     cpp_defines['ia32'] = '1'
34-elif processor == "aarch64":
35+elif processor == "aarch64" or processor == 'arm64':
36     cpp_defines['efi2'] = '1'
37     cpp_defines['EFI2'] = '1'
38 # Using 64 bit little endian
39diff --git a/src/third_party/wiredtiger/SConscript b/src/third_party/wiredtiger/SConscript
40index d6bd665e23..2f1e656a19 100644
41--- a/src/third_party/wiredtiger/SConscript
42+++ b/src/third_party/wiredtiger/SConscript
43@@ -152,7 +152,7 @@ condition_map = {
44     'POSIX_HOST'   : not env.TargetOSIs('windows'),
45     'WINDOWS_HOST' : env.TargetOSIs('windows'),
46
47-    'ARM64_HOST'   : env['TARGET_ARCH'] == 'aarch64',
48+    'ARM64_HOST'   : env['TARGET_ARCH'] in ('aarch64', 'arm64'),
49     'POWERPC_HOST' : env['TARGET_ARCH'] == 'ppc64le',
50     'X86_HOST'     : env['TARGET_ARCH'] == 'x86_64',
51     'ZSERIES_HOST' : env['TARGET_ARCH'] == 's390x',
52--
532.24.0
54
55