diff options
author | Ben Noordhuis <info@bnoordhuis.nl> | 2015-03-02 21:35:29 +0100 |
---|---|---|
committer | Ben Noordhuis <info@bnoordhuis.nl> | 2015-03-03 00:40:49 +0100 |
commit | ca3c50b789011565a3109528ff66eb2b93ce0659 (patch) | |
tree | 94db1381c2c0344952c149c201c898d9c61b7e01 /deps/openssl/config | |
parent | 3d6440cf2a02325d906d1c8f271497ea4aa3c80d (diff) | |
download | android-node-v8-ca3c50b789011565a3109528ff66eb2b93ce0659.tar.gz android-node-v8-ca3c50b789011565a3109528ff66eb2b93ce0659.tar.bz2 android-node-v8-ca3c50b789011565a3109528ff66eb2b93ce0659.zip |
build: add basic arm64 support
This commit adds basic arm64 support to the build. Building the bundled
openssl is disabled pending an upgrade to openssl 1.2, the currently
bundled version has some hand-rolled assembly that is 32 bits only.
PR-URL: https://github.com/iojs/io.js/pull/1028
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Reviewed-By: Rod Vagg <rod@vagg.org>
Diffstat (limited to 'deps/openssl/config')
-rw-r--r-- | deps/openssl/config/opensslconf.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/deps/openssl/config/opensslconf.h b/deps/openssl/config/opensslconf.h index 2e7732b926..84e5de7c12 100644 --- a/deps/openssl/config/opensslconf.h +++ b/deps/openssl/config/opensslconf.h @@ -190,7 +190,7 @@ * boundary. See crypto/rc4/rc4_enc.c for further details. */ # undef RC4_CHUNK -# if defined(_M_X64) || defined(__x86_64__) +# if defined(_M_X64) || defined(__aarch64__) || defined(__x86_64__) # define RC4_CHUNK unsigned long long # elif defined(__arm__) # define RC4_CHUNK unsigned long @@ -220,7 +220,7 @@ # undef THIRTY_TWO_BIT # undef SIXTEEN_BIT # undef EIGHT_BIT -# if defined(_M_X64) || defined(__x86_64__) +# if defined(_M_X64) || defined(__aarch64__) || defined(__x86_64__) # if defined(_LP64) # define SIXTY_FOUR_BIT_LONG # else |