diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2019-12-05 18:08:16 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-12-31 10:36:31 +0000 |
| commit | 6c41308b02b940ab1841c64d73782fd2a5a0f6f6 (patch) | |
| tree | 8492089a4b51a9426068bb1d10f28f2d4c0a169e | |
| parent | a26ac2921a1ad96959364223920402082ccd1d61 (diff) | |
| download | openembedded-core-contrib-6c41308b02b940ab1841c64d73782fd2a5a0f6f6.tar.gz | |
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>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
| -rw-r--r-- | meta/recipes-support/nss/nss/0001-Bug-1493916-Fix-ppc64-inline-assembler-for-clang-r-j.patch | 35 | ||||
| -rw-r--r-- | meta/recipes-support/nss/nss_3.45.bb | 1 |
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 @@ +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 + 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 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 \ |