Fix merge

Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>

nss-3.50-fix-riscv64.patch

@@ -0,0 +1,26 @@
+diff --git a/lib/freebl/verified/kremlin/include/kremlin/internal/types.h b/lib/freebl/verified/kremlin/include/kremlin/internal/types.h
+index 40fac22..3896387 100644
+--- a/lib/freebl/verified/kremlin/include/kremlin/internal/types.h
++++ b/lib/freebl/verified/kremlin/include/kremlin/internal/types.h
+@@ -58,7 +58,7 @@ typedef __m128i FStar_UInt128_uint128;
+ #elif !defined(KRML_VERIFIED_UINT128) && !defined(_MSC_VER) && \
+     (defined(__x86_64__) || defined(__x86_64) || defined(__aarch64__) || \
+     (defined(__powerpc64__) && defined(__LITTLE_ENDIAN__)) || \
+-     defined(__s390x__))
++     defined(__s390x__) || (defined(__riscv) && __riscv_xlen == 64))
+ typedef unsigned __int128 FStar_UInt128_uint128;
+ #else
+ typedef struct FStar_UInt128_uint128_s {
+diff --git a/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h b/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h
+index 1ecedc7..e187e61 100644
+--- a/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h
++++ b/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h
+@@ -27,7 +27,7 @@
+ #if !defined(KRML_VERIFIED_UINT128) && !defined(_MSC_VER) && \
+     (defined(__x86_64__) || defined(__x86_64) || defined(__aarch64__) || \
+     (defined(__powerpc64__) && defined(__LITTLE_ENDIAN__)) || \
+-     defined(__s390x__))
++     defined(__s390x__) || (defined(__riscv) && __riscv_xlen == 64))
+ 
+ /* GCC + using native unsigned __int128 support */
+ 

nss.spec

@@ -44,7 +44,7 @@ rpm.define(string.format("nss_release_tag NSS_%s_RTM",
 Summary:          Network Security Services
 Name:             nss
 Version:          %{nss_version}
-Release:          2%{?dist}
+Release:          2.0.riscv64%{?dist}
 License:          MPLv2.0
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Requires:         nspr >= %{nspr_version}
@@ -115,6 +115,9 @@ Patch20:          nss-gcm-param-default-pkcs11v2.patch
 %endif
 %endif
 
+# Fix RISC-V compilation
+Patch30:          nss-3.50-fix-riscv64.patch
+
 %description
 Network Security Services (NSS) is a set of libraries designed to
 support cross-platform development of security-enabled client and
@@ -892,6 +895,9 @@ update-crypto-policies &> /dev/null || :
 
 
 %changelog
+* Sun May 17 2020 David Abdurachmanov <david.abdurachmanov@sifive.com> - 3.52.0-2.0.riscv64
+- Fix RISC-V compilation errors
+
 * Wed May 13 2020 Bob Relyea <rrelyea@redhat.com> - 3.52.0-2
 - Delay CK_GCM_PARAMS semantics until fedora 34