summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-support/nss/nss/0001-Bug-1493916-Fix-ppc64-inline-assembler-for-clang-r-j.patch35
-rw-r--r--meta/recipes-support/nss/nss_3.45.bb1
2 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-support/nss/nss/0001-Bug-1493916-Fix-ppc64-inline-assembler-for-clang-r-j.patch b/meta/recipes-support/nss/nss/0001-Bug-1493916-Fix-ppc64-inline-assembler-for-clang-r-j.patch
new file mode 100644
index 0000000000..59e44e6841
--- /dev/null
+++ b/meta/recipes-support/nss/nss/0001-Bug-1493916-Fix-ppc64-inline-assembler-for-clang-r-j.patch
@@ -0,0 +1,35 @@
1From 6b351dbb049b3b3ab6c0d51aa3c1c7fb3c9df80c Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
3Date: Mon, 22 Jul 2019 11:07:41 -0700
4Subject: [PATCH] Bug 1493916 - Fix ppc64 inline assembler for clang r=jcj
5 Seems clang's inline assembler doesn't want registers to be prefixed with
6 "r", while gcc accepts both - r0 and 0 for GPR0.
7
8tested with clang 6.0 and gcc 8.1
9
10--HG--
11extra : amend_source : 87e09bb59c78bdb25b9573b9f29511e10b9db6fa
12extra : histedit_source : 9b3fad70ac2851bf7de14d42c34db4a5fba41710
13
14Upstream-Status: Backport [https://github.com/nss-dev/nss/commit/671d89b6c4a6f41707bb044534751098e2e3f211]
15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16---
17 nss/lib/freebl/mpi/mpcpucache.c | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20diff --git a/nss/lib/freebl/mpi/mpcpucache.c b/nss/lib/freebl/mpi/mpcpucache.c
21index 336b4cc..2ad291f 100644
22--- a/nss/lib/freebl/mpi/mpcpucache.c
23+++ b/nss/lib/freebl/mpi/mpcpucache.c
24@@ -727,7 +727,7 @@ static inline void
25 dcbzl(char *array)
26 {
27 register char *a asm("r2") = array;
28- __asm__ __volatile__("dcbzl %0,r0"
29+ __asm__ __volatile__("dcbzl %0,0"
30 : "=r"(a)
31 : "0"(a));
32 }
33--
342.24.0
35
diff --git a/meta/recipes-support/nss/nss_3.45.bb b/meta/recipes-support/nss/nss_3.45.bb
index e89e7d69d5..c8005a5b3a 100644
--- a/meta/recipes-support/nss/nss_3.45.bb
+++ b/meta/recipes-support/nss/nss_3.45.bb
@@ -28,6 +28,7 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO
28 file://nss-fix-nsinstall-build.patch \ 28 file://nss-fix-nsinstall-build.patch \
29 file://disable-Wvarargs-with-clang.patch \ 29 file://disable-Wvarargs-with-clang.patch \
30 file://pqg.c-ULL_addend.patch \ 30 file://pqg.c-ULL_addend.patch \
31 file://0001-Bug-1493916-Fix-ppc64-inline-assembler-for-clang-r-j.patch \
31 file://blank-cert9.db \ 32 file://blank-cert9.db \
32 file://blank-key4.db \ 33 file://blank-key4.db \
33 file://system-pkcs11.txt \ 34 file://system-pkcs11.txt \