nss: Backport clang build fix

(From OE-Core rev: 35bbb1deb4ddab3861dce7ca2ada778094fb353e)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2019-12-05 18:08:16 -08:00
committed by Richard Purdie
parent cc975d8bca
commit 450cf4926a
2 changed files with 36 additions and 0 deletions

View File

@@ -0,0 +1,35 @@
From 6b351dbb049b3b3ab6c0d51aa3c1c7fb3c9df80c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
Date: Mon, 22 Jul 2019 11:07:41 -0700
Subject: [PATCH] Bug 1493916 - Fix ppc64 inline assembler for clang r=jcj
Seems clang's inline assembler doesn't want registers to be prefixed with
"r", while gcc accepts both - r0 and 0 for GPR0.
tested with clang 6.0 and gcc 8.1
--HG--
extra : amend_source : 87e09bb59c78bdb25b9573b9f29511e10b9db6fa
extra : histedit_source : 9b3fad70ac2851bf7de14d42c34db4a5fba41710
Upstream-Status: Backport [https://github.com/nss-dev/nss/commit/671d89b6c4a6f41707bb044534751098e2e3f211]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
nss/lib/freebl/mpi/mpcpucache.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nss/lib/freebl/mpi/mpcpucache.c b/nss/lib/freebl/mpi/mpcpucache.c
index 336b4cc..2ad291f 100644
--- a/nss/lib/freebl/mpi/mpcpucache.c
+++ b/nss/lib/freebl/mpi/mpcpucache.c
@@ -727,7 +727,7 @@ static inline void
dcbzl(char *array)
{
register char *a asm("r2") = array;
- __asm__ __volatile__("dcbzl %0,r0"
+ __asm__ __volatile__("dcbzl %0,0"
: "=r"(a)
: "0"(a));
}
--
2.24.0

View File

@@ -28,6 +28,7 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO
file://nss-fix-nsinstall-build.patch \
file://disable-Wvarargs-with-clang.patch \
file://pqg.c-ULL_addend.patch \
file://0001-Bug-1493916-Fix-ppc64-inline-assembler-for-clang-r-j.patch \
file://blank-cert9.db \
file://blank-key4.db \
file://system-pkcs11.txt \