diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-06-16 23:01:10 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-06-17 16:08:53 +0200 |
| commit | 30478c97837a026ba56718f98d490adf7bce2760 (patch) | |
| tree | 10166f933851346d6f4fd6387394087843ce26a3 /Configurations/15-android.conf | |
| parent | Move padlock_asm_src file information to build.info files (diff) | |
| download | openssl-30478c97837a026ba56718f98d490adf7bce2760.tar.xz openssl-30478c97837a026ba56718f98d490adf7bce2760.zip | |
Configure: final cleanup of asm related things
Remove the *_asm templates in Configurations/00-base-templates.conf,
all attempts to inherit them, and the asm() perl function.
[extended tests]
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 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Configurations/15-android.conf b/Configurations/15-android.conf index 62111a64d7..69c3693d95 100644 --- a/Configurations/15-android.conf +++ b/Configurations/15-android.conf @@ -199,20 +199,20 @@ my %targets = ( # -march and/or -mfloat-abi flags. NDK defaults to armv5te. # Newer NDK versions reportedly require additional -latomic. # - inherit_from => [ "android", asm("armv4_asm") ], + inherit_from => [ "android" ], bn_ops => add("RC4_CHAR"), asm_arch => 'armv4', perlasm_scheme => "void", }, "android-arm64" => { - inherit_from => [ "android", asm("aarch64_asm") ], + inherit_from => [ "android" ], bn_ops => add("RC4_CHAR"), asm_arch => 'aarch64', perlasm_scheme => "linux64", }, "android-mips" => { - inherit_from => [ "android", asm("mips32_asm") ], + inherit_from => [ "android" ], bn_ops => add("RC4_CHAR"), asm_arch => 'mips32', perlasm_scheme => "o32", @@ -227,21 +227,21 @@ my %targets = ( # with previous MIPS ISA versions, in sense that unlike # prior versions original MIPS binary code will fail. # - inherit_from => [ "android", asm("mips64_asm") ], + inherit_from => [ "android" ], bn_ops => add("RC4_CHAR"), asm_arch => 'mips64', perlasm_scheme => "64", }, "android-x86" => { - inherit_from => [ "android", asm("x86_asm") ], + inherit_from => [ "android" ], 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") ], + inherit_from => [ "android" ], bn_ops => add("RC4_INT"), asm_arch => 'x86_64', perlasm_scheme => "elf", |