diff options
author | Richard Levitte <levitte@openssl.org> | 2019-06-16 13:32:58 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2019-06-17 16:08:52 +0200 |
commit | e6f98ae404344e4aff55c209dc0f91d76e69fb27 (patch) | |
tree | d8ed6f406c03ca6aeddbc4d3af9ad25a17efa60a /Configurations/15-android.conf | |
parent | 989b2ad786ee43438bbb8b33f857ba0ce6e10082 (diff) |
Configure: add mechanism to specify asm target architecture
As preparation for moving asm file specs to build.info files, we must
make sure there is still some base information to help select the
correct files.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9166)
Diffstat (limited to 'Configurations/15-android.conf')
-rw-r--r-- | Configurations/15-android.conf | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Configurations/15-android.conf b/Configurations/15-android.conf index 7b496a4529..62111a64d7 100644 --- 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", }, |