Index: security/nss/files/patch-bug1612177
===================================================================
--- security/nss/files/patch-bug1612177	(revision 524760)
+++ security/nss/files/patch-bug1612177	(working copy)
@@ -1,6 +1,6 @@
 --- lib/freebl/Makefile.orig	2018-08-31 12:55:53 UTC
 +++ lib/freebl/Makefile
-@@ -215,7 +215,7 @@ ifeq ($(CPU_ARCH),x86)
+@@ -236,7 +236,7 @@ ifeq ($(CPU_ARCH),x86)
  endif
  endif # Darwin
  
@@ -9,3 +9,12 @@
  ifeq ($(CPU_ARCH),x86_64)
      ASFILES  = arcfour-amd64-gas.s mpi_amd64_gas.s
      ASFLAGS += -fPIC -Wa,--noexecstack
+@@ -786,7 +786,7 @@ ifeq ($(CPU_ARCH),arm)
+ # Confusingly, __SOFTFP__ is the name of the define for the softfloat ABI, not for the softfp ABI.
+ 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)
+-$(OBJDIR)/$(PROG_PREFIX)gcm-arm32-neon$(OBJ_SUFFIX): CFLAGS += -mfpu=neon$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp)
++$(OBJDIR)/$(PROG_PREFIX)gcm-arm32-neon$(OBJ_SUFFIX): CFLAGS += -march=armv7-a -mfpu=neon$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp)
+ endif
+ ifeq ($(CPU_ARCH),aarch64)
+ $(OBJDIR)/$(PROG_PREFIX)aes-armv8$(OBJ_SUFFIX): CFLAGS += -march=armv8-a+crypto