public/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add support in configuration for android-riscv64

Browse source 
Android is enabling support for the riscv64 ISA. Add a configuration
option to support building for it, aligned with the existing
linux-riscv64 configuration.

Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Todd Short <todd.short@me.com>
(Merged from https://github.com/openssl/openssl/pull/23427)
This commit is contained in:
Prashanth Swaminathan 2024-01-29 13:20:54 -08:00 • committed by Tomas Mraz
parent ed0f79c7ae
commit 2d321448b2
3 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Configurations/15-android.conf
View file

@ -12,6 +12,7 @@
arm64 => "aarch64-linux-android", arm64 => "aarch64-linux-android",
mips => "mipsel-linux-android", mips => "mipsel-linux-android",
mips64 => "mips64el-linux-android", mips64 => "mips64el-linux-android",
riscv64 => "riscv64-linux-android",
x86 => "i686-linux-android", x86 => "i686-linux-android",
x86_64 => "x86_64-linux-android", x86_64 => "x86_64-linux-android",
); );
@ -270,6 +271,12 @@ my %targets = (
perlasm_scheme => "elf", perlasm_scheme => "elf",
}, },
"android-riscv64" => {
inherit_from => [ "android" ],
asm_arch => 'riscv64',
perlasm_scheme => "linux64",
},
#################################################################### ####################################################################
# Backward compatible targets, (might) require $CROSS_SYSROOT # Backward compatible targets, (might) require $CROSS_SYSROOT
# #

4
NOTES-ANDROID.md
View file

@ -17,8 +17,8 @@ Notes for Android platforms
Android is a cross-compiled target and you can't rely on `./Configure` Android is a cross-compiled target and you can't rely on `./Configure`
to find out the configuration target for you. You have to name your to find out the configuration target for you. You have to name your
target explicitly; there are `android-arm`, `android-arm64`, `android-mips`, target explicitly; there are `android-arm`, `android-arm64`, `android-mips`,
`android-mip64`, `android-x86` and `android-x86_64` (`*MIPS` targets are no `android-mip64`, `android-x86`, `android-x86_64` and `android-riscv64`
longer supported with NDK R20+). (`*MIPS` targets are no longer supported with NDK R20+).
Do not pass --cross-compile-prefix (as you might be tempted), as it Do not pass --cross-compile-prefix (as you might be tempted), as it
will be "calculated" automatically based on chosen platform. However, will be "calculated" automatically based on chosen platform. However,

1
util/perl/OpenSSL/config.pm
View file

@ -859,6 +859,7 @@ EOF
cflags => [ '-march=armv7-a' ], cflags => [ '-march=armv7-a' ],
cxxflags => [ '-march=armv7-a' ] } ], cxxflags => [ '-march=armv7-a' ] } ],
[ 'arm.*-.*-android', { target => "android-armeabi" } ], [ 'arm.*-.*-android', { target => "android-armeabi" } ],
[ 'riscv64-.*-android', { target => "android-riscv64" } ],
[ '.*-hpux1.*', [ '.*-hpux1.*',
sub { sub {
my $KERNEL_BITS = $ENV{KERNEL_BITS}; my $KERNEL_BITS = $ENV{KERNEL_BITS};