|
@@ -0,0 +1,36 @@
|
|
|
+From 6b3819159949ed7fc099e588e2e0669407135121 Mon Sep 17 00:00:00 2001
|
|
|
+From: Giulio Benetti <giulio.benetti@micronovasrl.com>
|
|
|
+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.
|
|
|
+
|
|
|
+[Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1580126]
|
|
|
+Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
|
|
|
+---
|
|
|
+ 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
|
|
|
+
|