From 49e05ba542cd441b67922f2c87e173836f100611 Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Sat, 2 May 2020 14:47:07 +0300 Subject: [PATCH] Rebase riscv64 patch Signed-off-by: David Abdurachmanov --- nss-3.50-fix-riscv64.patch | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/nss-3.50-fix-riscv64.patch b/nss-3.50-fix-riscv64.patch index b874de0..14fbe5a 100644 --- a/nss-3.50-fix-riscv64.patch +++ b/nss-3.50-fix-riscv64.patch @@ -1,28 +1,26 @@ -diff --git nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h -index 67d5af5..beaa862 100644 ---- nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h -+++ nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h -@@ -56,7 +56,8 @@ typedef const char *Prims_string; - #include - typedef __m128i FStar_UInt128_uint128; +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(__x86_64__) || defined(__x86_64) || defined(__aarch64__) || \ -+ (defined(__riscv) && __riscv_xlen == 64)) + (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 nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h -index ba01362..8bd90bc 100644 ---- nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h -+++ nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h -@@ -25,7 +25,8 @@ - #include "LowStar_Endianness.h" - +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(__x86_64__) || defined(__x86_64) || defined(__aarch64__) || \ -+ (defined(__riscv) && __riscv_xlen == 64)) + (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 */