The branch master has been updated
via a43249122baabb9ebaee0822d683f1fdb60f72a7 (commit)
via d5a39c12f0331dd0d14dbfcf2b98921be4cbb1da (commit)
from 216a0cc4d6a35a21e613f1e7e9eee957768bf9dd (commit)
- Log -----------------------------------------------------------------
commit a43249122baabb9ebaee0822d683f1fdb60f72a7
Author: Andy Polyakov <ap...@openssl.org>
Date: Wed Aug 31 20:50:56 2016 +0200
Configurations/10-main.conf: add android64-x86_64 target.
Reviewed-by: Rich Salz <rs...@openssl.org>
commit d5a39c12f0331dd0d14dbfcf2b98921be4cbb1da
Author: Andy Polyakov <ap...@openssl.org>
Date: Wed Aug 31 20:50:08 2016 +0200
Configurations/10-main.conf: fix omittions in commentary.
Reviewed-by: Rich Salz <rs...@openssl.org>
-----------------------------------------------------------------------
Summary of changes:
Configurations/10-main.conf | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index e4f5f1c..a1d566d 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -865,7 +865,7 @@ sub vms_info {
#
# It takes pair of prior-set environment variables to make it work:
#
- #
CROSS_SYSROOT=/some/where/android-ndk-<ver>/platforms/android-<apiver>/arch-<
+ #
CROSS_SYSROOT=/some/where/android-ndk-<ver>/platforms/android-<apiver>/arch-<arch>
# CROSS_COMPILE=<prefix>
#
# As well as PATH adjusted to cover ${CROSS_COMPILE}gcc and company.
@@ -874,7 +874,7 @@ sub vms_info {
# ANDROID_NDK=/some/where/android-ndk-10d
# CROSS_SYSROOT=$ANDROID_NDK/platforms/android-14/arch-arm
# CROSS_COMPILE=arm-linux-adroideabi-
- #
PATH=$ANDROID_NDK/toolchains/arm-linux-androideabi-4.8/prebuild/linux-x86_64/
+ #
PATH=$ANDROID_NDK/toolchains/arm-linux-androideabi-4.8/prebuild/linux-x86_64/bin
#
"android" => {
inherit_from => [ "linux-generic32" ],
@@ -934,6 +934,10 @@ sub vms_info {
inherit_from => [ "android64", asm("aarch64_asm") ],
perlasm_scheme => "linux64",
},
+ "android64-x86_64" => {
+ inherit_from => [ "android64", asm("x86_64_asm") ],
+ perlasm_scheme => "elf",
+ },
#### *BSD
"BSD-generic32" => {
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
