summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMingli Yu <mingli.yu@windriver.com>2020-04-30 20:27:08 +0800
committerKhem Raj <raj.khem@gmail.com>2020-05-03 14:29:17 -0700
commit2ca4f084f101c619950137e8f0503bdefafe8973 (patch)
tree265f76cbef8721d65a3ca4e05879d3ef803a6862
parent50981554374a2fc4ae004663bc2fbccab910505a (diff)
downloadmeta-openembedded-2ca4f084f101c619950137e8f0503bdefafe8973.tar.gz
nss: enable uint128 support on mips64
Fix below build error: | verified/kremlin/kremlib/dist/minimal/FStar_UInt128.h:22:1: error: 'FStar_UInt128___proj__Mkuint128__item__low' declared 'static' but never defined [-Werror=unused-function] | 22 | FStar_UInt128___proj__Mkuint128__item__low(FStar_UInt128_uint128 projectee); Signed-off-by: Mingli Yu <mingli.yu@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-support/nss/nss/0001-Enable-uint128-on-mips64.patch48
-rw-r--r--meta-oe/recipes-support/nss/nss_3.51.1.bb1
2 files changed, 49 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/nss/nss/0001-Enable-uint128-on-mips64.patch b/meta-oe/recipes-support/nss/nss/0001-Enable-uint128-on-mips64.patch
new file mode 100644
index 0000000000..90ec379c67
--- /dev/null
+++ b/meta-oe/recipes-support/nss/nss/0001-Enable-uint128-on-mips64.patch
@@ -0,0 +1,48 @@
1From 8cf7afb5417e23cd3ebf8141239bf020f5dd2ac8 Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Thu, 30 Apr 2020 06:56:09 +0000
4Subject: [PATCH] Enable uint128 on mips64
5
6Fix below error:
7| verified/kremlin/kremlib/dist/minimal/FStar_UInt128.h:22:1: error: 'FStar_UInt128___proj__Mkuint128__item__low' declared 'static' but never defined [-Werror=unused-function]
8| 22 | FStar_UInt128___proj__Mkuint128__item__low(FStar_UInt128_uint128 projectee);
9
10Upstream-Status: Pending
11
12Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
13---
14 .../freebl/verified/kremlin/include/kremlin/internal/types.h | 3 ++-
15 .../kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h | 3 ++-
16 2 files changed, 4 insertions(+), 2 deletions(-)
17
18diff --git a/nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h b/nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h
19index 801e78f..cdac61e 100644
20--- a/nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h
21+++ b/nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h
22@@ -57,7 +57,8 @@ typedef const char *Prims_string;
23 typedef __m128i FStar_UInt128_uint128;
24 #elif !defined(KRML_VERIFIED_UINT128) && !defined(_MSC_VER) && \
25 (defined(__x86_64__) || defined(__x86_64) || defined(__aarch64__) || \
26- (defined(__riscv) && __riscv_xlen == 64))
27+ (defined(__riscv) && __riscv_xlen == 64) || \
28+ defined(__mips64))
29 typedef unsigned __int128 FStar_UInt128_uint128;
30 #else
31 typedef struct FStar_UInt128_uint128_s {
32diff --git a/nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h b/nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h
33index f38fda3..7ca67d2 100644
34--- a/nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h
35+++ b/nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h
36@@ -26,7 +26,8 @@
37 #include <stdint.h>
38 #if !defined(KRML_VERIFIED_UINT128) && !defined(_MSC_VER) && \
39 (defined(__x86_64__) || defined(__x86_64) || defined(__aarch64__) || \
40- (defined(__riscv) && __riscv_xlen == 64))
41+ (defined(__riscv) && __riscv_xlen == 64) || \
42+ defined(__mips64))
43
44 /* GCC + using native unsigned __int128 support */
45
46--
472.24.1
48
diff --git a/meta-oe/recipes-support/nss/nss_3.51.1.bb b/meta-oe/recipes-support/nss/nss_3.51.1.bb
index 001124011e..fba80ce2ab 100644
--- a/meta-oe/recipes-support/nss/nss_3.51.1.bb
+++ b/meta-oe/recipes-support/nss/nss_3.51.1.bb
@@ -33,6 +33,7 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO
33 file://nss-fix-nsinstall-build.patch \ 33 file://nss-fix-nsinstall-build.patch \
34 file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ 34 file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \
35 file://riscv.patch \ 35 file://riscv.patch \
36 file://0001-Enable-uint128-on-mips64.patch \
36 " 37 "
37 38
38SRC_URI[md5sum] = "6acaf1ddff69306ae30a908881c6f233" 39SRC_URI[md5sum] = "6acaf1ddff69306ae30a908881c6f233"