|
@@ -0,0 +1,30 @@
|
|
|
+From ab8d2425728f37b1f21dbff712daf4a767c82149 Mon Sep 17 00:00:00 2001
|
|
|
+From: Giulio Benetti <giulio.benetti@benettiengineering.com>
|
|
|
+Date: Wed, 1 Apr 2020 09:41:08 -0700
|
|
|
+Subject: [PATCH] Bug 1624864 - Don't force ARMv7 for gcm-arm32-neon r=jcj
|
|
|
+
|
|
|
+--HG--
|
|
|
+extra : rebase_source : e046bbe45276b8cdf686c4f61006aff08865f1c0
|
|
|
+
|
|
|
+[Upstream: https://hg.mozilla.org/projects/nss/rev/8582092359720d052288cad2dc13f37aad783dc3]
|
|
|
+Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
|
|
|
+---
|
|
|
+ nss/lib/freebl/Makefile | 2 +-
|
|
|
+ 1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
+
|
|
|
+diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile
|
|
|
+index a03c0d108..898a0b9e0 100644
|
|
|
+--- a/nss/lib/freebl/Makefile
|
|
|
++++ b/nss/lib/freebl/Makefile
|
|
|
+@@ -781,7 +781,7 @@ ifeq ($(CPU_ARCH),arm)
|
|
|
+ USES_SOFTFLOAT_ABI := $(shell $(CC) -o - -E -dM - $(CFLAGS) < /dev/null | grep __SOFTFP__ > /dev/null && echo 1)
|
|
|
+ $(OBJDIR)/$(PROG_PREFIX)aes-armv8$(OBJ_SUFFIX): CFLAGS += -march=armv8-a -mfpu=crypto-neon-fp-armv8$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp)
|
|
|
+ ifndef NSS_DISABLE_ARM32_NEON
|
|
|
+-$(OBJDIR)/$(PROG_PREFIX)gcm-arm32-neon$(OBJ_SUFFIX): CFLAGS += -march=armv7 -mfpu=neon$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp)
|
|
|
++$(OBJDIR)/$(PROG_PREFIX)gcm-arm32-neon$(OBJ_SUFFIX): CFLAGS += -mfpu=neon$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp)
|
|
|
+ endif
|
|
|
+ endif
|
|
|
+ ifeq ($(CPU_ARCH),aarch64)
|
|
|
+--
|
|
|
+2.20.1
|
|
|
+
|