summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/nss/nss/Fix-compilation-for-X32.patch
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2018-06-24 19:33:33 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-27 13:55:21 +0100
commit1e36258c5a5961c5bb8d1ccc9cc957e3fd07629d (patch)
treedcafb66efcdd5ee3fa999a21e7e23d6c5f674a2c /meta/recipes-support/nss/nss/Fix-compilation-for-X32.patch
parent0507645e3b7956e9edb2b47ffef6010b89988a12 (diff)
downloadpoky-1e36258c5a5961c5bb8d1ccc9cc957e3fd07629d.tar.gz
nss: update to 3.37.1
remove Fix-compilation-for-X32.patch as a solution simular is included in update. notable changes: The TLS 1.3 implementation was updated to Draft 28. The CA certificates list was updated to version 2.24. refresh patches fix 32 bit build error nss bug: https://bugzilla.mozilla.org/show_bug.cgi?format=default&id=1459739 (From OE-Core rev: 1ed072515f2a23de75ee56b86d8607c85b42605c) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/nss/nss/Fix-compilation-for-X32.patch')
-rw-r--r--meta/recipes-support/nss/nss/Fix-compilation-for-X32.patch33
1 files changed, 0 insertions, 33 deletions
diff --git a/meta/recipes-support/nss/nss/Fix-compilation-for-X32.patch b/meta/recipes-support/nss/nss/Fix-compilation-for-X32.patch
deleted file mode 100644
index 80b86908e5..0000000000
--- a/meta/recipes-support/nss/nss/Fix-compilation-for-X32.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From c8eadfcdfbc1d5a4799e9a264b0f859cb5954c05 Mon Sep 17 00:00:00 2001
2From: Christopher Larson <chris_larson@mentor.com>
3Date: Tue, 13 Dec 2016 11:40:47 -0700
4Subject: [PATCH 7/7] Fix compilation for X32
5
6X32 uses 32-bit pointers, not 64-bit.
7
8Signed-off-by: Christopher Larson <chris_larson@mentor.com>
9
10Upstream-Status: Pending
11---
12 nss/lib/freebl/poly1305-donna-x64-sse2-incremental-source.c | 4 ++++
13 1 file changed, 4 insertions(+)
14
15diff --git a/nss/lib/freebl/poly1305-donna-x64-sse2-incremental-source.c b/nss/lib/freebl/poly1305-donna-x64-sse2-incremental-source.c
16index 2a3301e..d4ade41 100644
17--- a/nss/lib/freebl/poly1305-donna-x64-sse2-incremental-source.c
18+++ b/nss/lib/freebl/poly1305-donna-x64-sse2-incremental-source.c
19@@ -87,7 +87,11 @@ static poly1305_state_internal INLINE
20 *
21 poly1305_aligned_state(poly1305_state *state)
22 {
23+#ifdef __ILP32__
24+ return (poly1305_state_internal *)(((uint32_t)state + 63) & ~63);
25+#else
26 return (poly1305_state_internal *)(((uint64_t)state + 63) & ~63);
27+#endif
28 }
29
30 /* copy 0-63 bytes */
31--
322.8.0
33