Rebase riscv64 patch
Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
This commit is contained in:
parent
e9b8914369
commit
49e05ba542
|
@ -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
|
diff --git a/lib/freebl/verified/kremlin/include/kremlin/internal/types.h b/lib/freebl/verified/kremlin/include/kremlin/internal/types.h
|
||||||
index 67d5af5..beaa862 100644
|
index 40fac22..3896387 100644
|
||||||
--- nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h
|
--- a/lib/freebl/verified/kremlin/include/kremlin/internal/types.h
|
||||||
+++ nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h
|
+++ b/lib/freebl/verified/kremlin/include/kremlin/internal/types.h
|
||||||
@@ -56,7 +56,8 @@ typedef const char *Prims_string;
|
@@ -58,7 +58,7 @@ typedef __m128i FStar_UInt128_uint128;
|
||||||
#include <emmintrin.h>
|
|
||||||
typedef __m128i FStar_UInt128_uint128;
|
|
||||||
#elif !defined(KRML_VERIFIED_UINT128) && !defined(_MSC_VER) && \
|
#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(__x86_64__) || defined(__x86_64) || defined(__aarch64__) || \
|
(defined(__powerpc64__) && defined(__LITTLE_ENDIAN__)) || \
|
||||||
+ (defined(__riscv) && __riscv_xlen == 64))
|
- defined(__s390x__))
|
||||||
|
+ defined(__s390x__) || (defined(__riscv) && __riscv_xlen == 64))
|
||||||
typedef unsigned __int128 FStar_UInt128_uint128;
|
typedef unsigned __int128 FStar_UInt128_uint128;
|
||||||
#else
|
#else
|
||||||
typedef struct FStar_UInt128_uint128_s {
|
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
|
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 ba01362..8bd90bc 100644
|
index 1ecedc7..e187e61 100644
|
||||||
--- nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h
|
--- a/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h
|
||||||
+++ nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h
|
+++ b/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h
|
||||||
@@ -25,7 +25,8 @@
|
@@ -27,7 +27,7 @@
|
||||||
#include "LowStar_Endianness.h"
|
|
||||||
|
|
||||||
#if !defined(KRML_VERIFIED_UINT128) && !defined(_MSC_VER) && \
|
#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(__x86_64__) || defined(__x86_64) || defined(__aarch64__) || \
|
(defined(__powerpc64__) && defined(__LITTLE_ENDIAN__)) || \
|
||||||
+ (defined(__riscv) && __riscv_xlen == 64))
|
- defined(__s390x__))
|
||||||
|
+ defined(__s390x__) || (defined(__riscv) && __riscv_xlen == 64))
|
||||||
|
|
||||||
/* GCC + using native unsigned __int128 support */
|
/* GCC + using native unsigned __int128 support */
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue