From owner-freebsd-gecko@FreeBSD.ORG Sat Mar 30 11:42:24 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id B76F24D8 for ; Sat, 30 Mar 2013 11:42:24 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 3B2F3E48 for ; Sat, 30 Mar 2013 11:42:23 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r2UBgMIg031180 for ; Sat, 30 Mar 2013 11:42:22 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r2UBgH4P030602 for freebsd-gecko@freebsd.org; Sat, 30 Mar 2013 11:42:17 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 30 Mar 2013 11:42:17 GMT Message-Id: <201303301142.r2UBgH4P030602@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1223 - in trunk/security/nss: . files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Mar 2013 11:42:24 -0000 Author: jbeich Date: Sat Mar 30 11:42:16 2013 New Revision: 1223 Log: detect clang in nss better Reported by: Andreas Nilsson Added: trunk/security/nss/files/patch-bug856300 - copied, changed from r1221, trunk/security/nss/files/extra-bug835050 Deleted: trunk/security/nss/files/extra-bug835050 Modified: trunk/security/nss/Makefile Modified: trunk/security/nss/Makefile ============================================================================== --- trunk/security/nss/Makefile Fri Mar 29 11:38:56 2013 (r1222) +++ trunk/security/nss/Makefile Sat Mar 30 11:42:16 2013 (r1223) @@ -55,9 +55,6 @@ .if ${ARCH} == amd64 USE_BINUTILS= # intel-gcm.s CFLAGS+= -B${LOCALBASE}/bin -.if defined(WITH_CLANG_IS_CC) || ${CC:Mcc} && ${OSVERSION} > 1000023 -EXTRA_PATCHES+= ${FILESDIR}/extra-bug835050 -.endif .endif check regression-test test: Deleted: trunk/security/nss/files/extra-bug835050 ============================================================================== --- trunk/security/nss/files/extra-bug835050 Sat Mar 30 11:42:16 2013 (r1222) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- lib/freebl/Makefile~ -+++ lib/freebl/Makefile -@@ -659,7 +659,5 @@ $(OBJDIR)/$(PROG_PREFIX)intel-gcm-wrap$( - # 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,$(AS))) - $(OBJDIR)/$(PROG_PREFIX)intel-gcm$(OBJ_SUFFIX): ASFLAGS += -no-integrated-as - endif --endif Copied and modified: trunk/security/nss/files/patch-bug856300 (from r1221, trunk/security/nss/files/extra-bug835050) ============================================================================== --- trunk/security/nss/files/extra-bug835050 Fri Mar 29 02:27:28 2013 (r1221, copy source) +++ trunk/security/nss/files/patch-bug856300 Sat Mar 30 11:42:16 2013 (r1223) @@ -1,10 +1,11 @@ --- lib/freebl/Makefile~ +++ lib/freebl/Makefile -@@ -659,7 +659,5 @@ $(OBJDIR)/$(PROG_PREFIX)intel-gcm-wrap$( +@@ -659,7 +659,7 @@ $(OBJDIR)/$(PROG_PREFIX)intel-gcm-wrap$( # 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,$(AS))) ++ifneq (,$(findstring clang,$(shell $(AS) -v 2>&1))) $(OBJDIR)/$(PROG_PREFIX)intel-gcm$(OBJ_SUFFIX): ASFLAGS += -no-integrated-as endif --endif + endif