blob: 1a7bf0fc52ae98e0edce961d79de51d2f5224e43 [file] [log] [blame]
Andrew Geisslerd688a012020-09-18 13:36:00 -05001From 298d958148f1fb2bb7725fed15c68c09677c14c9 Mon Sep 17 00:00:00 2001
Brad Bishop0a921262019-09-24 07:40:45 -04002From: 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
Brad Bishopd7bf8c12018-02-25 22:55:05 -05005
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
Brad Bishop0a921262019-09-24 07:40:45 -04007Signed-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(-)
Brad Bishopd7bf8c12018-02-25 22:55:05 -050013
Brad Bishop0a921262019-09-24 07:40:45 -040014diff --git a/SConstruct b/SConstruct
Andrew Geisslerd688a012020-09-18 13:36:00 -050015index 448939bdd0..abfd816f3e 100644
Brad Bishop0a921262019-09-24 07:40:45 -040016--- a/SConstruct
17+++ b/SConstruct
Andrew Geisslerd688a012020-09-18 13:36:00 -050018@@ -1228,6 +1228,7 @@ if endian == "auto":
Brad Bishopd7bf8c12018-02-25 22:55:05 -050019 processor_macros = {
Brad Bishop0a921262019-09-24 07:40:45 -040020 '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
Andrew Geisslerd688a012020-09-18 13:36:00 -050027index 58e1b7ba65..bffe83b462 100644
Brad Bishop0a921262019-09-24 07:40:45 -040028--- a/src/third_party/IntelRDFPMathLib20U1/SConscript
29+++ b/src/third_party/IntelRDFPMathLib20U1/SConscript
Andrew Geisslerd688a012020-09-18 13:36:00 -050030@@ -309,7 +309,7 @@ if processor == 'i386' or processor == 'emscripten':
Brad Bishopd7bf8c12018-02-25 22:55:05 -050031 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
Brad Bishop0a921262019-09-24 07:40:45 -040039diff --git a/src/third_party/wiredtiger/SConscript b/src/third_party/wiredtiger/SConscript
Andrew Geisslerd688a012020-09-18 13:36:00 -050040index d6bd665e23..2f1e656a19 100644
Brad Bishop0a921262019-09-24 07:40:45 -040041--- a/src/third_party/wiredtiger/SConscript
42+++ b/src/third_party/wiredtiger/SConscript
43@@ -152,7 +152,7 @@ condition_map = {
Brad Bishopd7bf8c12018-02-25 22:55:05 -050044 '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',
Brad Bishop0a921262019-09-24 07:40:45 -040052--
Andrew Geisslerd688a012020-09-18 13:36:00 -0500532.24.0
Brad Bishop0a921262019-09-24 07:40:45 -040054