Browse Source

remove redundant code patch

Signed-off-by: Rebecca Chang Swee Fun <rebecca.chang@starfivetech.com>
Rebecca Chang Swee Fun 1 year ago
parent
commit
e79c80cb8b

+ 0 - 46
nwjs-nw64/0013-build-config-compiler-set-generic-riscv64-flags.patch

@@ -1,46 +0,0 @@
-From a42e058e178f7993351b30a928ac4e464eb16aa9 Mon Sep 17 00:00:00 2001
-From: Rebecca Chang Swee Fun <rebecca.chang@starfivetech.com>
-Date: Fri, 14 Jan 2022 05:06:56 +0000
-Subject: [PATCH 13/21] build: config: compiler: set generic riscv64 flags
-
-Signed-off-by: Rebecca Chang Swee Fun <rebecca.chang@starfivetech.com>
-Signed-off-by: Loh Tien Hock <tienhock.loh@starfivetech.com>
----
- build/config/compiler/BUILD.gn | 14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index c9b6fb9c83114..43043a135afa7 100644
---- a/build/config/compiler/BUILD.gn
-+++ b/build/config/compiler/BUILD.gn
-@@ -1158,6 +1158,17 @@ config("compiler_cpu_abi") {
-         cflags += [ "-m64" ]
-         ldflags += [ "-m64" ]
-       }
-+    } else if (current_cpu == "riscv64") {
-+      cflags += [
-+        "-m64",
-+        "--target=riscv64-linux-gnu",
-+        "-mno-relax",
-+        "-mabi=lp64d",
-+      ]
-+      ldflags += [
-+        "--target=riscv64-linux-gnu",
-+        "-mno-relax",
-+      ]
-     } else if (current_cpu == "s390x") {
-       cflags += [ "-m64" ]
-       ldflags += [ "-m64" ]
-@@ -1626,7 +1637,8 @@ config("chromium_code") {
- 
-     if (!is_debug && !using_sanitizer && current_cpu != "s390x" &&
-         current_cpu != "s390" && current_cpu != "ppc64" &&
--        current_cpu != "mips" && current_cpu != "mips64") {
-+        current_cpu != "mips" && current_cpu != "mips64" &&
-+        current_cpu != "riscv64") {
-       # Non-chromium code is not guaranteed to compile cleanly with
-       # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are
-       # disabled, so only do that for Release build.
--- 
-2.25.1
-

+ 0 - 141
nwjs-nw64/nwjs-3pp-boringssl.patch

@@ -1,141 +0,0 @@
-diff --git a/third_party/boringssl/BUILD.generated.gni b/third_party/boringssl/BUILD.generated.gni
-index 5fe1e0fee093..04a98f7c776a 100644
---- a/third_party/boringssl/BUILD.generated.gni
-+++ b/third_party/boringssl/BUILD.generated.gni
-@@ -10,7 +10,6 @@ crypto_sources = [
-   "src/crypto/asn1/a_bool.c",
-   "src/crypto/asn1/a_d2i_fp.c",
-   "src/crypto/asn1/a_dup.c",
--  "src/crypto/asn1/a_enum.c",
-   "src/crypto/asn1/a_gentm.c",
-   "src/crypto/asn1/a_i2d_fp.c",
-   "src/crypto/asn1/a_int.c",
-@@ -27,7 +26,6 @@ crypto_sources = [
-   "src/crypto/asn1/asn1_lib.c",
-   "src/crypto/asn1/asn1_par.c",
-   "src/crypto/asn1/asn_pack.c",
--  "src/crypto/asn1/charmap.h",
-   "src/crypto/asn1/f_int.c",
-   "src/crypto/asn1/f_string.c",
-   "src/crypto/asn1/internal.h",
-@@ -64,7 +62,6 @@ crypto_sources = [
-   "src/crypto/chacha/internal.h",
-   "src/crypto/cipher_extra/cipher_extra.c",
-   "src/crypto/cipher_extra/derive_key.c",
--  "src/crypto/cipher_extra/e_aesccm.c",
-   "src/crypto/cipher_extra/e_aesctrhmac.c",
-   "src/crypto/cipher_extra/e_aesgcmsiv.c",
-   "src/crypto/cipher_extra/e_chacha20poly1305.c",
-@@ -75,7 +72,6 @@ crypto_sources = [
-   "src/crypto/cipher_extra/e_tls.c",
-   "src/crypto/cipher_extra/internal.h",
-   "src/crypto/cipher_extra/tls_cbc.c",
--  "src/crypto/cmac/cmac.c",
-   "src/crypto/conf/conf.c",
-   "src/crypto/conf/conf_def.h",
-   "src/crypto/conf/internal.h",
-@@ -110,7 +106,6 @@ crypto_sources = [
-   "src/crypto/engine/engine.c",
-   "src/crypto/err/err.c",
-   "src/crypto/err/internal.h",
--  "src/crypto/evp/digestsign.c",
-   "src/crypto/evp/evp.c",
-   "src/crypto/evp/evp_asn1.c",
-   "src/crypto/evp/evp_ctx.c",
-@@ -120,6 +115,7 @@ crypto_sources = [
-   "src/crypto/evp/p_ec_asn1.c",
-   "src/crypto/evp/p_ed25519.c",
-   "src/crypto/evp/p_ed25519_asn1.c",
-+  "src/crypto/evp/p_hkdf.c",
-   "src/crypto/evp/p_rsa.c",
-   "src/crypto/evp/p_rsa_asn1.c",
-   "src/crypto/evp/p_x25519.c",
-@@ -135,11 +131,12 @@ crypto_sources = [
-   "src/crypto/fipsmodule/bn/rsaz_exp.h",
-   "src/crypto/fipsmodule/cipher/internal.h",
-   "src/crypto/fipsmodule/delocate.h",
-+  "src/crypto/fipsmodule/dh/internal.h",
-   "src/crypto/fipsmodule/digest/internal.h",
-   "src/crypto/fipsmodule/digest/md32_common.h",
-   "src/crypto/fipsmodule/ec/internal.h",
--  "src/crypto/fipsmodule/ec/p256-x86_64-table.h",
--  "src/crypto/fipsmodule/ec/p256-x86_64.h",
-+  "src/crypto/fipsmodule/ec/p256-nistz-table.h",
-+  "src/crypto/fipsmodule/ec/p256-nistz.h",
-   "src/crypto/fipsmodule/ec/p256_table.h",
-   "src/crypto/fipsmodule/ecdsa/internal.h",
-   "src/crypto/fipsmodule/fips_shared_support.c",
-@@ -149,6 +146,7 @@ crypto_sources = [
-   "src/crypto/fipsmodule/rand/getrandom_fillin.h",
-   "src/crypto/fipsmodule/rand/internal.h",
-   "src/crypto/fipsmodule/rsa/internal.h",
-+  "src/crypto/fipsmodule/service_indicator/internal.h",
-   "src/crypto/fipsmodule/sha/internal.h",
-   "src/crypto/fipsmodule/tls/internal.h",
-   "src/crypto/hkdf/hkdf.c",
-@@ -335,6 +333,7 @@ crypto_headers = [
-   "src/include/openssl/hpke.h",
-   "src/include/openssl/hrss.h",
-   "src/include/openssl/is_boringssl.h",
-+  "src/include/openssl/kdf.h",
-   "src/include/openssl/lhash.h",
-   "src/include/openssl/md4.h",
-   "src/include/openssl/md5.h",
-@@ -357,6 +356,7 @@ crypto_headers = [
-   "src/include/openssl/ripemd.h",
-   "src/include/openssl/rsa.h",
-   "src/include/openssl/safestack.h",
-+  "src/include/openssl/service_indicator.h",
-   "src/include/openssl/sha.h",
-   "src/include/openssl/siphash.h",
-   "src/include/openssl/span.h",
-@@ -442,10 +442,13 @@ tool_sources = [
- 
- crypto_sources_apple_aarch64 = [
-   "apple-aarch64/crypto/chacha/chacha-armv8.S",
-+  "apple-aarch64/crypto/cipher_extra/chacha20_poly1305_armv8.S",
-   "apple-aarch64/crypto/fipsmodule/aesv8-armx64.S",
-   "apple-aarch64/crypto/fipsmodule/armv8-mont.S",
-   "apple-aarch64/crypto/fipsmodule/ghash-neon-armv8.S",
-   "apple-aarch64/crypto/fipsmodule/ghashv8-armx64.S",
-+  "apple-aarch64/crypto/fipsmodule/p256-armv8-asm.S",
-+  "apple-aarch64/crypto/fipsmodule/p256_beeu-armv8-asm.S",
-   "apple-aarch64/crypto/fipsmodule/sha1-armv8.S",
-   "apple-aarch64/crypto/fipsmodule/sha256-armv8.S",
-   "apple-aarch64/crypto/fipsmodule/sha512-armv8.S",
-@@ -507,10 +510,13 @@ crypto_sources_apple_x86_64 = [
- 
- crypto_sources_linux_aarch64 = [
-   "linux-aarch64/crypto/chacha/chacha-armv8.S",
-+  "linux-aarch64/crypto/cipher_extra/chacha20_poly1305_armv8.S",
-   "linux-aarch64/crypto/fipsmodule/aesv8-armx64.S",
-   "linux-aarch64/crypto/fipsmodule/armv8-mont.S",
-   "linux-aarch64/crypto/fipsmodule/ghash-neon-armv8.S",
-   "linux-aarch64/crypto/fipsmodule/ghashv8-armx64.S",
-+  "linux-aarch64/crypto/fipsmodule/p256-armv8-asm.S",
-+  "linux-aarch64/crypto/fipsmodule/p256_beeu-armv8-asm.S",
-   "linux-aarch64/crypto/fipsmodule/sha1-armv8.S",
-   "linux-aarch64/crypto/fipsmodule/sha256-armv8.S",
-   "linux-aarch64/crypto/fipsmodule/sha512-armv8.S",
-@@ -581,10 +587,13 @@ crypto_sources_linux_x86_64 = [
- 
- crypto_sources_win_aarch64 = [
-   "win-aarch64/crypto/chacha/chacha-armv8.S",
-+  "win-aarch64/crypto/cipher_extra/chacha20_poly1305_armv8.S",
-   "win-aarch64/crypto/fipsmodule/aesv8-armx64.S",
-   "win-aarch64/crypto/fipsmodule/armv8-mont.S",
-   "win-aarch64/crypto/fipsmodule/ghash-neon-armv8.S",
-   "win-aarch64/crypto/fipsmodule/ghashv8-armx64.S",
-+  "win-aarch64/crypto/fipsmodule/p256-armv8-asm.S",
-+  "win-aarch64/crypto/fipsmodule/p256_beeu-armv8-asm.S",
-   "win-aarch64/crypto/fipsmodule/sha1-armv8.S",
-   "win-aarch64/crypto/fipsmodule/sha256-armv8.S",
-   "win-aarch64/crypto/fipsmodule/sha512-armv8.S",
-@@ -637,6 +646,7 @@ fuzzers = [
-   "cert",
-   "client",
-   "decode_client_hello_inner",
-+  "der_roundtrip",
-   "dtls_client",
-   "dtls_server",
-   "pkcs12",