From owner-svn-src-head@FreeBSD.ORG  Sat Mar 21 19:13:15 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 142AA4B7;
 Sat, 21 Mar 2015 19:13:15 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 00751CE0;
 Sat, 21 Mar 2015 19:13:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2LJDEG6072628;
 Sat, 21 Mar 2015 19:13:14 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2LJDEJL072627;
 Sat, 21 Mar 2015 19:13:14 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201503211913.t2LJDEJL072627@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 21 Mar 2015 19:13:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r280328 - head/share/mk
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Mar 2015 19:13:15 -0000

Author: dim
Date: Sat Mar 21 19:13:13 2015
New Revision: 280328
URL: https://svnweb.freebsd.org/changeset/base/280328

Log:
  Correctly pass the -mllvm -enable-gvn=false flag in CLANG_OPT_SMALL
  (this has to be passed as a combination of two flags).  Should fix the
  case where the clang version is before 3.5.0.
  
  Submitted by:	Pedro Arthur <bygrandao@gmail.com>
  X-MFC-With:	r279018, r279378

Modified:
  head/share/mk/bsd.sys.mk

Modified: head/share/mk/bsd.sys.mk
==============================================================================
--- head/share/mk/bsd.sys.mk	Sat Mar 21 17:56:55 2015	(r280327)
+++ head/share/mk/bsd.sys.mk	Sat Mar 21 19:13:13 2015	(r280328)
@@ -128,9 +128,9 @@ CWARNFLAGS+=	-Wno-unknown-pragmas
 CLANG_NO_IAS=	 -no-integrated-as
 .endif
 CLANG_OPT_SMALL= -mstack-alignment=8 -mllvm -inline-threshold=3\
-		 -mllvm -simplifycfg-dup-ret -mllvm
+		 -mllvm -simplifycfg-dup-ret
 .if ${COMPILER_VERSION} >= 30500
-CLANG_OPT_SMALL+= -enable-gvn=false
+CLANG_OPT_SMALL+= -mllvm -enable-gvn=false
 .endif
 CFLAGS.clang+=	 -Qunused-arguments
 .if ${MACHINE_CPUARCH} == "sparc64"