openssl: Remove patch already upstreamed

Since the bump to OpenSSL 3.3.1, riscv32 doesn't build anymore due to
the folowing error:
crypto/riscv32cpuid.s:77: Error: symbol `riscv_vlen_asm' is already
defined

This is due to the patch beeing already applied upstream:
Commit: 8702320db98d1346c230aff1282ade3ecdca681a

(From OE-Core rev: 06c4168c7bd6a32cb7de3e003793c8e232714fad)

Signed-off-by: Clément Péron <peron.clem@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Clément Péron
2024-06-21 12:10:34 +02:00
committed by Richard Purdie
parent 16b73c215f
commit 684ab3c776
2 changed files with 0 additions and 44 deletions

View File

@@ -1,43 +0,0 @@
From 725b1530456545e8511adc9cbdd265309dffad53 Mon Sep 17 00:00:00 2001
From: Hongren Zheng <i@zenithal.me>
Date: Fri, 26 Apr 2024 06:03:43 +0000
Subject: [PATCH] Implement riscv_vlen_asm for riscv32
riscvcap.c: undefined reference to 'riscv_vlen_asm'
Upstream-Status: Backport [https://github.com/openssl/openssl/pull/24270]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
crypto/riscv32cpuid.pl | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/crypto/riscv32cpuid.pl b/crypto/riscv32cpuid.pl
index 20694e7..ac1c043 100644
--- a/crypto/riscv32cpuid.pl
+++ b/crypto/riscv32cpuid.pl
@@ -84,5 +84,22 @@ OPENSSL_cleanse:
___
}
+{
+my ($ret) = ('a0');
+$code .= <<___;
+################################################################################
+# size_t riscv_vlen_asm(void)
+# Return VLEN (i.e. the length of a vector register in bits).
+.p2align 3
+.globl riscv_vlen_asm
+.type riscv_vlen_asm,\@function
+riscv_vlen_asm:
+ csrr $ret, vlenb
+ slli $ret, $ret, 3
+ ret
+.size riscv_vlen_asm,.-riscv_vlen_asm
+___
+}
+
print $code;
close STDOUT or die "error closing STDOUT: $!";
--
2.45.0

View File

@@ -12,7 +12,6 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \
file://0001-Configure-do-not-tweak-mips-cflags.patch \
file://0001-Added-handshake-history-reporting-when-test-fails.patch \
file://0001-Implement-riscv_vlen_asm-for-riscv32.patch \
"
SRC_URI:append:class-nativesdk = " \