Brad Bishop | 0a92126 | 2019-09-24 07:40:45 -0400 | [diff] [blame] | 1 | From c9fc9e9a44b0fb764ce86a5e57f17d3c5bbfd8cd Mon Sep 17 00:00:00 2001 |
| 2 | From: Vincent Prince <vincent.prince.fr@gmail.com> |
| 3 | Date: Mon, 16 Sep 2019 13:37:10 +0200 |
| 4 | Subject: [PATCH 05/10] Add alises for arm64 which is same as aarch64 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 5 | |
| 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
Brad Bishop | 0a92126 | 2019-09-24 07:40:45 -0400 | [diff] [blame] | 7 | Signed-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 Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 13 | |
Brad Bishop | 0a92126 | 2019-09-24 07:40:45 -0400 | [diff] [blame] | 14 | diff --git a/SConstruct b/SConstruct |
| 15 | index e63cf15..5593c78 100644 |
| 16 | --- a/SConstruct |
| 17 | +++ b/SConstruct |
| 18 | @@ -1129,6 +1129,7 @@ elif endian == "big": |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 19 | processor_macros = { |
Brad Bishop | 0a92126 | 2019-09-24 07:40:45 -0400 | [diff] [blame] | 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__',)}, |
| 26 | diff --git a/src/third_party/IntelRDFPMathLib20U1/SConscript b/src/third_party/IntelRDFPMathLib20U1/SConscript |
| 27 | index f23c071..fb82cd6 100644 |
| 28 | --- a/src/third_party/IntelRDFPMathLib20U1/SConscript |
| 29 | +++ b/src/third_party/IntelRDFPMathLib20U1/SConscript |
| 30 | @@ -308,7 +308,7 @@ if processor == 'i386' or processor == 'emscripten': |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 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 |
Brad Bishop | 0a92126 | 2019-09-24 07:40:45 -0400 | [diff] [blame] | 39 | diff --git a/src/third_party/wiredtiger/SConscript b/src/third_party/wiredtiger/SConscript |
| 40 | index cdd090b..97a1b3b 100644 |
| 41 | --- a/src/third_party/wiredtiger/SConscript |
| 42 | +++ b/src/third_party/wiredtiger/SConscript |
| 43 | @@ -152,7 +152,7 @@ condition_map = { |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 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', |
Brad Bishop | 0a92126 | 2019-09-24 07:40:45 -0400 | [diff] [blame] | 52 | -- |
| 53 | 2.7.4 |
| 54 | |