Ajust patch for 3.36.1

2 files changed, 18 insertions, 17 deletions

diff --git a/devel/nss/distinfo b/devel/nss/distinfo
index 8ae08f5c4c6..94b6feb7080 100644
--- a/devel/nss/distinfo
+++ b/devel/nss/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.85 2018/04/12 10:37:11 bouyer Exp $
+$NetBSD: distinfo,v 1.86 2018/04/12 14:32:51 bouyer Exp $
 
 SHA1 (nss-3.36.1.tar.gz) = d8b73f808054c7cc50f5e67bb94e5dd853ccc09f
 RMD160 (nss-3.36.1.tar.gz) = bdb7f2627cb42a871f5f046893699f9c01fc4cf2
@@ -16,7 +16,7 @@ SHA1 (patch-mn) = 5b79783e48249044be1a904a6cfd20ba175b5fd4
 SHA1 (patch-nss_cmd_platlibs.mk) = 7dadcb72acf15714c61ae74b21c5baf45bc51d4c
 SHA1 (patch-nss_coreconf_OpenBSD.mk) = fccc17845c28f5b1268c96eb4e952e32dd530d1d
 SHA1 (patch-nss_coreconf_command.mk) = 008f7670f164bf19555a7691f5a59fc8bf687078
-SHA1 (patch-nss_lib_freebl_blinit.c) = 14d250c1aaa84c74cc300e490540ecda551731b9
+SHA1 (patch-nss_lib_freebl_blinit.c) = 94e2c7d64ae04bf2c18d3c4071cb6458536e4e3e
 SHA1 (patch-nss_lib_util_utilpars.c) = 5d3000515b01037929730a752b7d7a0f46f06deb
 SHA1 (patch-nss_tests_all.sh) = f8d0fcfcd67dca757c9ce016660210b20b1e6e8f
 SHA1 (patch-nss_tests_merge_merge.sh) = 42a4866d226b1076740ba9a5e42c7604f2cb15a7
diff --git a/devel/nss/patches/patch-nss_lib_freebl_blinit.c b/devel/nss/patches/patch-nss_lib_freebl_blinit.c
index 761ff5c1f17..80fe890a711 100644
--- a/devel/nss/patches/patch-nss_lib_freebl_blinit.c
+++ b/devel/nss/patches/patch-nss_lib_freebl_blinit.c
@@ -1,29 +1,30 @@
-$NetBSD: patch-nss_lib_freebl_blinit.c,v 1.1 2018/04/12 10:37:11 bouyer Exp $
+$NetBSD: patch-nss_lib_freebl_blinit.c,v 1.2 2018/04/12 14:32:51 bouyer Exp $
 
---- ./nss/lib/freebl/blinit.c.orig	2018-04-10 17:16:55.885129976 +0200
-+++ ./nss/lib/freebl/blinit.c	2018-04-10 17:20:26.723480086 +0200
-@@ -91,7 +91,7 @@
- }
+--- nss/lib/freebl/blinit.c.orig	2018-04-09 15:38:16.000000000 +0000
++++ nss/lib/freebl/blinit.c	2018-04-12 14:29:56.040326263 +0000
+@@ -92,7 +92,7 @@
  #endif /* NSS_X86_OR_X64 */
  
+ /* clang-format off */
 -#if (defined(__aarch64__) || defined(__arm__)) && !defined(__ANDROID__)
 +#if (defined(__aarch64__) || defined(__arm__)) && defined(__linux__)
- #if defined(__GNUC__) && __GNUC__ >= 2 && defined(__ELF__)
- #include <sys/auxv.h>
- extern unsigned long getauxval(unsigned long type) __attribute__((weak));
-@@ -100,9 +100,9 @@
- #define AT_HWCAP2
- #define AT_HWCAP
+ #ifndef __has_include
+ #define __has_include(x) 0
+ #endif
+@@ -105,10 +105,10 @@
+ #define AT_HWCAP2 0
+ #define AT_HWCAP 0
  #endif /* defined(__GNUC__) && __GNUC__ >= 2 && defined(__ELF__)*/
 -#endif /* (defined(__aarch64__) || defined(__arm__)) && !defined(__ANDROID__) */
 +#endif /* (defined(__aarch64__) || defined(__arm__)) && defined(__linux__) */
+ /* clang-format on */
  
 -#if defined(__aarch64__) && !defined(__ANDROID__)
 +#if defined(__aarch64__) && defined(__linux__)
  // Defines from hwcap.h in Linux kernel - ARM64
+ #ifndef HWCAP_AES
  #define HWCAP_AES (1 << 3)
- #define HWCAP_PMULL (1 << 4)
-@@ -124,9 +124,9 @@
+@@ -138,9 +138,9 @@
      /* aarch64 must support NEON. */
      arm_neon_support_ = disable_arm_neon == NULL;
  }
@@ -35,7 +36,7 @@ $NetBSD: patch-nss_lib_freebl_blinit.c,v 1.1 2018/04/12 10:37:11 bouyer Exp $
  // Defines from hwcap.h in Linux kernel - ARM
  /*
   * HWCAP flags - for elf_hwcap (in kernel) and AT_HWCAP
-@@ -155,7 +155,7 @@
+@@ -179,7 +179,7 @@
          arm_neon_support_ = hwcaps & HWCAP_NEON && disable_arm_neon == NULL;
      }
  }
@@ -44,7 +45,7 @@ $NetBSD: patch-nss_lib_freebl_blinit.c,v 1.1 2018/04/12 10:37:11 bouyer Exp $
  
  // Enable when Firefox can use it.
  // #if defined(__ANDROID__) && (defined(__arm__) || defined(__aarch64__))
-@@ -238,7 +238,7 @@
+@@ -262,7 +262,7 @@
  {
  #ifdef NSS_X86_OR_X64
      CheckX86CPUSupport();