Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1 | Add alises for arm64 which is same as aarch64 |
| 2 | |
| 3 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 4 | Upstream-Status: Pending |
| 5 | |
| 6 | Index: git/SConstruct |
| 7 | =================================================================== |
| 8 | --- git.orig/SConstruct |
| 9 | +++ git/SConstruct |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 10 | @@ -1055,6 +1055,7 @@ elif endian == "big": |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 11 | 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__',)}, |
| 18 | Index: git/src/third_party/IntelRDFPMathLib20U1/SConscript |
| 19 | =================================================================== |
| 20 | --- git.orig/src/third_party/IntelRDFPMathLib20U1/SConscript |
| 21 | +++ git/src/third_party/IntelRDFPMathLib20U1/SConscript |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 22 | @@ -308,7 +308,7 @@ if processor == 'i386': |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 23 | 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 |
| 31 | Index: git/src/third_party/wiredtiger/SConscript |
| 32 | =================================================================== |
| 33 | --- git.orig/src/third_party/wiredtiger/SConscript |
| 34 | +++ git/src/third_party/wiredtiger/SConscript |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 35 | @@ -151,7 +151,7 @@ condition_map = { |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 36 | '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', |