From 5e67aa317de99c58152309dd94cc64ee2bd4c49a Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Thu, 1 Feb 2024 23:53:56 +0800 Subject: [PATCH] loongarch: Revert "loongarch: openssl: Apply upstream fixes for runtime issues on LoongArch" This reverts commit 6be4bf1b7d5808c30fe13942663df8dc79c337a7. It will be no longer needed for 3.2.1. Revert early to make merge easier. --- chapter01/changelog.xml | 10 ---------- chapter03/patches.xml | 8 -------- chapter08/openssl.xml | 6 ------ patches.ent | 4 ---- 4 files changed, 28 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 7ed1c641d..aba69a0de 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -40,16 +40,6 @@ appropriate for the entry or if needed the entire day's listitem. --> - - 2024-01-22 - - - [xry111] - Patch OpenSSL-3.2.0 to fix various runtime issues - on LoongArch. - - - - 2024-01-21 diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 23cf87fd8..50ff56a6f 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -118,14 +118,6 @@ --> - - OpenSSL LoongArch Fix Patch - &openssl-loongarch-patch-size;: - - Download: - MD5 sum: &openssl-loongarch-patch-md5; - - - Pkgconf Upstream Fix Patch - &pkgconf-upstream-fix-patch-size;: diff --git a/chapter08/openssl.xml b/chapter08/openssl.xml index b13e2141f..ae5d27e38 100644 --- a/chapter08/openssl.xml +++ b/chapter08/openssl.xml @@ -49,12 +49,6 @@ sed -e '/bn_reduce.*m1/i\ factor_size /= sizeof(BN_ULONG) * 8;' \ -i crypto/bn/rsaz_exp_x2.c --> - - First apply a patch to fix various runtime issues on - LoongArch: - -patch -Np1 -i ../&openssl-loongarch-patch; - Prepare OpenSSL for compilation: ./config --prefix=/usr \ diff --git a/patches.ent b/patches.ent index c30e4fc4d..d27c717de 100644 --- a/patches.ent +++ b/patches.ent @@ -26,10 +26,6 @@ - - - -