Skip to content

Commit 2d32144

Browse files
prashanthswamit8m
authored andcommitted
Add support in configuration for android-riscv64
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 <[email protected]> Reviewed-by: Todd Short <[email protected]> (Merged from openssl#23427)
1 parent ed0f79c commit 2d32144

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

Configurations/15-android.conf

+7
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
arm64 => "aarch64-linux-android",
1313
mips => "mipsel-linux-android",
1414
mips64 => "mips64el-linux-android",
15+
riscv64 => "riscv64-linux-android",
1516
x86 => "i686-linux-android",
1617
x86_64 => "x86_64-linux-android",
1718
);
@@ -270,6 +271,12 @@ my %targets = (
270271
perlasm_scheme => "elf",
271272
},
272273

274+
"android-riscv64" => {
275+
inherit_from => [ "android" ],
276+
asm_arch => 'riscv64',
277+
perlasm_scheme => "linux64",
278+
},
279+
273280
####################################################################
274281
# Backward compatible targets, (might) require $CROSS_SYSROOT
275282
#

NOTES-ANDROID.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ Notes for Android platforms
1717
Android is a cross-compiled target and you can't rely on `./Configure`
1818
to find out the configuration target for you. You have to name your
1919
target explicitly; there are `android-arm`, `android-arm64`, `android-mips`,
20-
`android-mip64`, `android-x86` and `android-x86_64` (`*MIPS` targets are no
21-
longer supported with NDK R20+).
20+
`android-mip64`, `android-x86`, `android-x86_64` and `android-riscv64`
21+
(`*MIPS` targets are no longer supported with NDK R20+).
2222

2323
Do not pass --cross-compile-prefix (as you might be tempted), as it
2424
will be "calculated" automatically based on chosen platform. However,

util/perl/OpenSSL/config.pm

+1
Original file line numberDiff line numberDiff line change
@@ -859,6 +859,7 @@ EOF
859859
cflags => [ '-march=armv7-a' ],
860860
cxxflags => [ '-march=armv7-a' ] } ],
861861
[ 'arm.*-.*-android', { target => "android-armeabi" } ],
862+
[ 'riscv64-.*-android', { target => "android-riscv64" } ],
862863
[ '.*-hpux1.*',
863864
sub {
864865
my $KERNEL_BITS = $ENV{KERNEL_BITS};

0 commit comments

Comments
 (0)