[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  5a3d915d77a6083b886eb7de6d31b370bafb4818 (commit)
      from  4eb504aedf49a4acb55fa0a4fa9942d241ca8230 (commit)


- Log -----------------------------------------------------------------
commit 5a3d915d77a6083b886eb7de6d31b370bafb4818
Author: Andy Polyakov <appro at openssl.org>
Date:   Thu Apr 2 23:18:10 2015 +0200

    Configure: add initial support for 64-bit Android.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configurations/10-main.conf | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index aa4c76a..a26fc6e 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -816,6 +816,18 @@
         perlasm_scheme   => "o32",
     },
 
+    "android64" => {
+        inherit_from     => [ "linux-generic64" ],
+        cflags           => "-mandroid -fPIC --sysroot=\$(CROSS_SYSROOT) -Wa,--noexecstack -Wall",
+        debug_cflags     => "-O0 -g",
+        lflags           => "-pie%-ldl",
+        shared_cflag     => "",
+    },
+    "android64-aarch64" => {
+        inherit_from     => [ "android64", asm("aarch64_asm") ],
+        perlasm_scheme   => "linux64",
+    },
+
 #### *BSD
     "BSD-generic32" => {
         # As for thread_cflag. Idea is to maintain "collective" set of