package/libnss: fix build failure on aarch64_be
PATCH 1/1 package/libnss: fix build failure on aarch64_be
In libnss there is a bug leading to build failure due to double declared functions. This is due to 2 different #ifdef statements treating the same function-set.
Add patch to fix this by making the 2 #ifdef statements equal.
---
Already sent upstream:
https://bugzilla.mozilla.org/show_bug.cgi?id=1580126
--- ...build-failure-on-aarch64_be-while-bu.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/libnss/0003-Bug-1580126-Fix-build-failure-on-aarch64_be-while-bu.patch
package/libnss/0003-Bug-1580126-Fix-build-failure-on-aarch64_be-while-bu.patch new file +35 -0
@@ -0,0 +1,35 @@ +From 6b3819159949ed7fc099e588e2e0669407135121 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti <[email protected]> +Date: Tue, 10 Sep 2019 11:29:02 +0200 +Subject: [PATCH] Bug 1580126 - Fix build failure on aarch64_be while building + freebl/gcm + +Build failure is caused by different #ifdef conditions in gcm.c and +gcm-aarch64.c that leads to double declaration of the same gcm_* +functions. + +Fix #ifdef condition in gcm-aarch64.c making it the same as the one in +gcm.c. + +Signed-off-by: Giulio Benetti <[email protected]> +--- + nss/lib/freebl/gcm-aarch64.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/nss/lib/freebl/gcm-aarch64.c b/nss/lib/freebl/gcm-aarch64.c +index 65ea9fb5f..3f3c046d7 100644 +--- a/nss/lib/freebl/gcm-aarch64.c ++++ b/nss/lib/freebl/gcm-aarch64.c +@@ -9,7 +9,8 @@ + #include "secerr.h" + + /* old gcc doesn't support some poly64x2_t intrinsic */ +-#if defined(__clang__) || (defined(__GNUC__) && __GNUC__ > 6) ++#if defined(__aarch64__) && defined(IS_LITTLE_ENDIAN) && \ ++ (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6) + + #include <arm_neon.h> + +-- +2.17.1 +
Signature · 1 line
2.17.1
PATCH 1/1 package/libnss: fix build failure on aarch64_be
Sorry,
I've forgot to add:
Fixes:
http://autobuild.buildroot.net/results/bfd29593bb6c53d3e9e2d02d2ed6bea360d99c00
Il 11/09/2019 15:17, Giulio Benetti ha scritto:
Quoted 57 lines
In libnss there is a bug leading to build failure due to double declared functions. This is due to 2 different #ifdef statements treating the same function-set.
Add patch to fix this by making the 2 #ifdef statements equal.
Signed-off-by Giulio Benetti <[email protected]>---
Already sent upstream:
https://bugzilla.mozilla.org/show_bug.cgi?id=1580126--- ...build-failure-on-aarch64_be-while-bu.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+)create mode 100644
package/libnss/0003-Bug-1580126-Fix-build-failure-on-aarch64_be-while-bu.patchpackage/libnss/0003-Bug-1580126-Fix-build-failure-on-aarch64_be-while-bu.patch new file +35
-0@@ -0,0 +1,35 @@ +From 6b3819159949ed7fc099e588e2e0669407135121 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti <[email protected]> +Date: Tue, 10 Sep 2019 11:29:02 +0200 +Subject: [PATCH] Bug 1580126 - Fix build failure on aarch64_be while building + freebl/gcm + +Build failure is caused by different #ifdef conditions in gcm.c and +gcm-aarch64.c that leads to double declaration of the same gcm_* +functions. + +Fix #ifdef condition in gcm-aarch64.c making it the same as the one in +gcm.c. + +Signed-off-by: Giulio Benetti <[email protected]> +--- + nss/lib/freebl/gcm-aarch64.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/nss/lib/freebl/gcm-aarch64.c b/nss/lib/freebl/gcm-aarch64.c +index 65ea9fb5f..3f3c046d7 100644 +--- a/nss/lib/freebl/gcm-aarch64.c ++++ b/nss/lib/freebl/gcm-aarch64.c +@@ -9,7 +9,8 @@ + #include "secerr.h" + + /* old gcc doesn't support some poly64x2_t intrinsic */ +-#if defined(__clang__) || (defined(__GNUC__) && __GNUC__ > 6) ++#if defined(__aarch64__) && defined(IS_LITTLE_ENDIAN) && \ ++ (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6) + + #include <arm_neon.h> + +-- +2.17.1 +
Signature · 10 lines
Giulio Benetti CTO MICRONOVA SRL Sede: Via A. Niedda 3 - 35010 Vigonza (PD) Tel. 049/8931563 - Fax 049/8931346 Cod.Fiscale - P.IVA 02663420285 Capitale Sociale ? 26.000 i.v. Iscritta al Reg. Imprese di Padova N. 02663420285 Numero R.E.A. 258642
PATCH 1/1 package/libnss: fix build failure on aarch64_be
In reply to Giulio BenettiQuoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Giulio" == Giulio Benetti <[email protected]> writes:
In libnss there is a bug leading to build failure due to double declared functions. This is due to 2 different #ifdef statements treating the same function-set.
Quoted 6 lines
Add patch to fix this by making the 2 #ifdef statements equal.
Signed-off-by Giulio Benetti <[email protected]>---
Already sent upstream:
https://bugzilla.mozilla.org/show_bug.cgi?id=1580126
Committed after adding the autobuilder reference and the upstream bugtracker to the patch, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/1 package/libnss: fix build failure on aarch64_be
In reply to Giulio BenettiQuoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Giulio" == Giulio Benetti <[email protected]> writes:
In libnss there is a bug leading to build failure due to double declared functions. This is due to 2 different #ifdef statements treating the same function-set.
Quoted 6 lines
Add patch to fix this by making the 2 #ifdef statements equal.
Signed-off-by Giulio Benetti <[email protected]>---
Already sent upstream:
https://bugzilla.mozilla.org/show_bug.cgi?id=1580126
Committed to 2019.02.x, 2019.05.x and 2019.08.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard