From dceef331b55ecbd35864acbfc15291dba47f4821 Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Thu, 10 Mar 2016 00:18:31 +0000
Subject: [PATCH] security/nss: refresh patch with version approved upstream

---
 security/nss/files/patch-bug1250891 | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/security/nss/files/patch-bug1250891 b/security/nss/files/patch-bug1250891
index d0cd666e9cb5..1582d2bb5320 100644
--- a/security/nss/files/patch-bug1250891
+++ b/security/nss/files/patch-bug1250891
@@ -37,14 +37,17 @@ diff --git a/coreconf/OpenBSD.mk b/coreconf/OpenBSD.mk
 diff --git a/coreconf/Werror.mk b/coreconf/Werror.mk
 --- coreconf/Werror.mk
 +++ coreconf/Werror.mk
-@@ -5,6 +5,12 @@
+@@ -5,6 +5,15 @@
  
  # This sets WARNING_CFLAGS for gcc-like compilers.
  
 +ifndef CC_IS_CLANG
 +  CC_IS_CLANG := $(and $(findstring clang, $(shell $(CC) --version 2>&1)), 1)
-+  # Export CC_IS_CLANG to save a shell invocation when recursing.
++  # Clang claims GCC 4.2.1 compatibility, see GCC_VERSION
++  CC_IS_GCC = 1
++  # Export CC_IS_CLANG and CC_IS_GCC to save a shell invocation when recursing.
 +  export CC_IS_CLANG
++  export CC_IS_GCC
 +endif
 +
  ifndef CC_IS_GCC
@@ -84,12 +87,14 @@ diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile
      HAVE_INT128_SUPPORT = 1
  else ifeq (1,$(CC_IS_GCC))
      ifneq (,$(filter 4.6 4.7 4.8 4.9,$(word 1,$(GCC_VERSION)).$(word 2,$(GCC_VERSION))))
-@@ -697,7 +697,7 @@ ifdef INTEL_GCM
+@@ -697,8 +697,8 @@ ifdef INTEL_GCM
  # symbolic names to registers, for example,
  #     .set  Htbl, %rdi
  # So we can't use Clang's integrated assembler with intel-gcm.s.
 -ifneq (,$(findstring clang,$(shell $(AS) --version)))
+-$(OBJDIR)/$(PROG_PREFIX)intel-gcm$(OBJ_SUFFIX): ASFLAGS += -no-integrated-as
 +ifdef CC_IS_CLANG
- $(OBJDIR)/$(PROG_PREFIX)intel-gcm$(OBJ_SUFFIX): ASFLAGS += -no-integrated-as
++$(OBJDIR)/$(PROG_PREFIX)intel-gcm$(OBJ_SUFFIX): CFLAGS += -no-integrated-as
  endif
  endif
+