From aa7d80b11eecf7f0b2679b2c84cdcc23612b6122 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Tue, 3 Mar 2020 16:16:16 +0100 Subject: [PATCH] Fix build with s390x, due to bundled kremlin source --- nss-kremlin-ppc64le.patch | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/nss-kremlin-ppc64le.patch b/nss-kremlin-ppc64le.patch index d5fe2eb..d4e9d89 100644 --- a/nss-kremlin-ppc64le.patch +++ b/nss-kremlin-ppc64le.patch @@ -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 ---- 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 -@@ -56,7 +56,8 @@ typedef const char *Prims_string; +Index: nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h +=================================================================== +--- nss.orig/lib/freebl/verified/kremlin/include/kremlin/internal/types.h ++++ nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h +@@ -56,7 +56,9 @@ typedef const char *Prims_string; #include 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(__powerpc64__) && defined(__LITTLE_ENDIAN__))) ++ (defined(__powerpc64__) && defined(__LITTLE_ENDIAN__)) || \ ++ defined(__s390x__)) typedef unsigned __int128 FStar_UInt128_uint128; #else 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 ---- 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 -@@ -25,7 +25,8 @@ +Index: nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h +=================================================================== +--- nss.orig/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,9 @@ #include "LowStar_Endianness.h" #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(__powerpc64__) && defined(__LITTLE_ENDIAN__))) ++ (defined(__powerpc64__) && defined(__LITTLE_ENDIAN__)) || \ ++ defined(__s390x__)) /* GCC + using native unsigned __int128 support */