Configure: add mechanism to specify asm target architecture

[openssl.git] / Configurations / 15-android.conf

diff --git a/Configurations/15-android.conf b/Configurations/15-android.conf
index 7b496a4529bd3072663fa08515125711d8bf81a7..62111a64d7e4c07feb4c8c95bd8167def22041dc 100644 (file)
--- a/Configurations/15-android.conf
+++ b/Configurations/15-android.conf
@@ -201,16 +201,20 @@ my %targets = (
         #
         inherit_from     => [ "android", asm("armv4_asm") ],
         bn_ops           => add("RC4_CHAR"),
+        asm_arch         => 'armv4',
+        perlasm_scheme   => "void",
     },
     "android-arm64" => {
         inherit_from     => [ "android", asm("aarch64_asm") ],
         bn_ops           => add("RC4_CHAR"),
+        asm_arch         => 'aarch64',
         perlasm_scheme   => "linux64",
     },
 
     "android-mips" => {
         inherit_from     => [ "android", asm("mips32_asm") ],
         bn_ops           => add("RC4_CHAR"),
+        asm_arch         => 'mips32',
         perlasm_scheme   => "o32",
     },
     "android-mips64" => {
@@ -225,6 +229,7 @@ my %targets = (
         #
         inherit_from     => [ "android", asm("mips64_asm") ],
         bn_ops           => add("RC4_CHAR"),
+        asm_arch         => 'mips64',
         perlasm_scheme   => "64",
     },
 
@@ -232,11 +237,13 @@ my %targets = (
         inherit_from     => [ "android", asm("x86_asm") ],
         CFLAGS           => add(picker(release => "-fomit-frame-pointer")),
         bn_ops           => add("RC4_INT"),
+        asm_arch         => 'x86',
         perlasm_scheme   => "android",
     },
     "android-x86_64" => {
         inherit_from     => [ "android", asm("x86_64_asm") ],
         bn_ops           => add("RC4_INT"),
+        asm_arch         => 'x86_64',
         perlasm_scheme   => "elf",
     },