blob: c06898758a195362f6119e902f86b39aa541629e [file] [log] [blame]
Brad Bishopd7bf8c12018-02-25 22:55:05 -05001Add alises for arm64 which is same as aarch64
2
3Signed-off-by: Khem Raj <raj.khem@gmail.com>
4Upstream-Status: Pending
5
6Index: git/SConstruct
7===================================================================
8--- git.orig/SConstruct
9+++ git/SConstruct
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080010@@ -1055,6 +1055,7 @@ elif endian == "big":
Brad Bishopd7bf8c12018-02-25 22:55:05 -050011 processor_macros = {
12 'arm' : { 'endian': 'little', 'defines': ('__arm__',) },
13 'aarch64' : { 'endian': 'little', 'defines': ('__arm64__', '__aarch64__')},
14+ 'arm64' : { 'endian': 'little', 'defines': ('__arm64__', '__aarch64__')},
15 'i386' : { 'endian': 'little', 'defines': ('__i386', '_M_IX86')},
16 'ppc64le' : { 'endian': 'little', 'defines': ('__powerpc64__',)},
17 's390x' : { 'endian': 'big', 'defines': ('__s390x__',)},
18Index: git/src/third_party/IntelRDFPMathLib20U1/SConscript
19===================================================================
20--- git.orig/src/third_party/IntelRDFPMathLib20U1/SConscript
21+++ git/src/third_party/IntelRDFPMathLib20U1/SConscript
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080022@@ -308,7 +308,7 @@ if processor == 'i386':
Brad Bishopd7bf8c12018-02-25 22:55:05 -050023 elif processor == 'arm':
24 cpp_defines['IA32'] = '1'
25 cpp_defines['ia32'] = '1'
26-elif processor == "aarch64":
27+elif processor == "aarch64" or processor == 'arm64':
28 cpp_defines['efi2'] = '1'
29 cpp_defines['EFI2'] = '1'
30 # Using 64 bit little endian
31Index: git/src/third_party/wiredtiger/SConscript
32===================================================================
33--- git.orig/src/third_party/wiredtiger/SConscript
34+++ git/src/third_party/wiredtiger/SConscript
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080035@@ -151,7 +151,7 @@ condition_map = {
Brad Bishopd7bf8c12018-02-25 22:55:05 -050036 'POSIX_HOST' : not env.TargetOSIs('windows'),
37 'WINDOWS_HOST' : env.TargetOSIs('windows'),
38
39- 'ARM64_HOST' : env['TARGET_ARCH'] == 'aarch64',
40+ 'ARM64_HOST' : env['TARGET_ARCH'] in ('aarch64', 'arm64'),
41 'POWERPC_HOST' : env['TARGET_ARCH'] == 'ppc64le',
42 'X86_HOST' : env['TARGET_ARCH'] == 'x86_64',
43 'ZSERIES_HOST' : env['TARGET_ARCH'] == 's390x',