rpms/nss
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix build with s390x, due to bundled kremlin source

Browse Source
This commit is contained in:
Daiki Ueno 2020-03-03 16:16:16 +01:00
parent f512836b78
commit aa7d80b11e
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
nss-kremlin-ppc64le.patch
View File

@ -1,26 +1,30 @@
diff -up nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h.kremlin-ppc64 nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h Index: nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h
--- nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h.kremlin-ppc64 2020-02-17 14:15:27.996130995 +0100 ===================================================================
+++ nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h 2020-02-17 14:17:18.138486010 +0100 --- nss.orig/lib/freebl/verified/kremlin/include/kremlin/internal/types.h
@@ -56,7 +56,8 @@ typedef const char *Prims_string; +++ nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h
@@ -56,7 +56,9 @@ typedef const char *Prims_string;
#include <emmintrin.h> #include <emmintrin.h>
typedef __m128i FStar_UInt128_uint128; 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(__x86_64__) || defined(__x86_64) || defined(__aarch64__) || \
+ (defined(__powerpc64__) && defined(__LITTLE_ENDIAN__))) + (defined(__powerpc64__) && defined(__LITTLE_ENDIAN__)) || \
+ defined(__s390x__))
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 -up nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h.kremlin-ppc64 nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h Index: nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h
--- nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h.kremlin-ppc64 2020-02-17 14:15:55.389468034 +0100 ===================================================================
+++ nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h 2020-02-17 14:19:16.830951610 +0100 --- nss.orig/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h
@@ -25,7 +25,8 @@ +++ nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h
@@ -25,7 +25,9 @@
#include "LowStar_Endianness.h" #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(__x86_64__) || defined(__x86_64) || defined(__aarch64__) || \
+ (defined(__powerpc64__) && defined(__LITTLE_ENDIAN__))) + (defined(__powerpc64__) && defined(__LITTLE_ENDIAN__)) || \
+ defined(__s390x__))
/* GCC + using native unsigned __int128 support */ /* GCC + using native unsigned __int128 support */