diff options
author | Armin Kuster <akuster@mvista.com> | 2018-03-26 07:30:08 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-30 00:31:18 +0100 |
commit | a5463fc07f3e7d6a3a1fdc1a6057f926507d00bf (patch) | |
tree | e19a06503e4b429c6464e967f550a9098d712f5c /meta/recipes-support/nss/nss | |
parent | 4ab3e6f1a1fa936aefe7522228aa1ee0e7567623 (diff) | |
download | poky-a5463fc07f3e7d6a3a1fdc1a6057f926507d00bf.tar.gz |
nss: update to 3.35
(From OE-Core rev: d136548ad7aef23021eac6af2ffc6317f36bd1c5)
Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/nss/nss')
-rw-r--r-- | meta/recipes-support/nss/nss/nss-build-hacl-poly1305-aarch64.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-support/nss/nss/nss-build-hacl-poly1305-aarch64.patch b/meta/recipes-support/nss/nss/nss-build-hacl-poly1305-aarch64.patch new file mode 100644 index 0000000000..8276f89e8b --- /dev/null +++ b/meta/recipes-support/nss/nss/nss-build-hacl-poly1305-aarch64.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | # HG changeset patch | ||
2 | # User Daiki Ueno <dueno@redhat.com> | ||
3 | # Date 1516710574 -3600 | ||
4 | # Tue Jan 23 13:29:34 2018 +0100 | ||
5 | # Node ID 27f27ce21c2c6ff5a47fa9e17c438b000366c9c9 | ||
6 | # Parent be1dca5ac80541d3b81a8da9d42854d8b1cceefb | ||
7 | Build Hacl_Poly1305_64.o on aarch64 even with make | ||
8 | |||
9 | Upstream-Status: Backport | ||
10 | https://bug1432455.bmoattachments.org/attachment.cgi?id=8944691 | ||
11 | Signed-off-by: Armin Kuster <akuster@mvista.com> | ||
12 | |||
13 | Index: nss-3.35/nss/lib/freebl/Makefile | ||
14 | =================================================================== | ||
15 | --- nss-3.35.orig/nss/lib/freebl/Makefile | ||
16 | +++ nss-3.35/nss/lib/freebl/Makefile | ||
17 | @@ -533,7 +533,12 @@ ifndef NSS_DISABLE_CHACHAPOLY | ||
18 | EXTRA_SRCS += chacha20_vec.c | ||
19 | endif | ||
20 | else | ||
21 | - EXTRA_SRCS += poly1305.c | ||
22 | + ifeq ($(CPU_ARCH),aarch64) | ||
23 | + EXTRA_SRCS += Hacl_Poly1305_64.c | ||
24 | + else | ||
25 | + EXTRA_SRCS += poly1305.c | ||
26 | + endif | ||
27 | + | ||
28 | EXTRA_SRCS += chacha20.c | ||
29 | VERIFIED_SRCS += Hacl_Chacha20.c | ||
30 | endif # x86_64 | ||