Index: branches/2020Q1/security/nss/files/patch-bug1612177
===================================================================
--- branches/2020Q1/security/nss/files/patch-bug1612177	(nonexistent)
+++ branches/2020Q1/security/nss/files/patch-bug1612177	(revision 525995)
@@ -0,0 +1,21 @@
+--- lib/freebl/Makefile.orig	2020-02-07 20:58:46 UTC
++++ lib/freebl/Makefile
+@@ -770,7 +770,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
+--- lib/freebl/freebl.gyp.orig	2020-02-07 20:58:46 UTC
++++ lib/freebl/freebl.gyp
+@@ -158,6 +158,7 @@
+         '<(DEPTH)/exports.gyp:nss_exports'
+       ],
+       'cflags': [
++        '-march=armv7-a',
+         '-mfpu=neon',
+         '<@(softfp_cflags)',
+       ],

Property changes on: branches/2020Q1/security/nss/files/patch-bug1612177
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2020Q1
===================================================================
--- branches/2020Q1	(revision 525994)
+++ branches/2020Q1	(revision 525995)

Property changes on: branches/2020Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r525988