From owner-svn-src-head@FreeBSD.ORG  Sat Mar 28 12:23:16 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 96781A82;
 Sat, 28 Mar 2015 12:23:16 +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 81568C86;
 Sat, 28 Mar 2015 12:23:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2SCNGjU009391;
 Sat, 28 Mar 2015 12:23:16 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2SCNGUc009390;
 Sat, 28 Mar 2015 12:23:16 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201503281223.t2SCNGUc009390@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, 28 Mar 2015 12:23:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r280784 - 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, 28 Mar 2015 12:23:16 -0000

Author: dim
Date: Sat Mar 28 12:23:15 2015
New Revision: 280784
URL: https://svnweb.freebsd.org/changeset/base/280784

Log:
  Re-enable using -mllvm -enable-load-pre=false in CLANG_OPT_SMALL for
  clang versions before 3.5.0.  This should enable building head's version
  of sys/boot/i386/boot2 on 9.x and 10.x again.
  
  Reported by:	bz

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

Modified: head/share/mk/bsd.sys.mk
==============================================================================
--- head/share/mk/bsd.sys.mk	Sat Mar 28 10:20:20 2015	(r280783)
+++ head/share/mk/bsd.sys.mk	Sat Mar 28 12:23:15 2015	(r280784)
@@ -131,6 +131,8 @@ CLANG_OPT_SMALL= -mstack-alignment=8 -ml
 		 -mllvm -simplifycfg-dup-ret
 .if ${COMPILER_VERSION} >= 30500
 CLANG_OPT_SMALL+= -mllvm -enable-gvn=false
+.else
+CLANG_OPT_SMALL+= -mllvm -enable-load-pre=false
 .endif
 CFLAGS.clang+=	 -Qunused-arguments
 .if ${MACHINE_CPUARCH} == "sparc64"