From 944e1910daee4046d2cbf6835dd8d2dba66779fc Mon Sep 17 00:00:00 2001
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 30 May 2015 18:10:43 +0000
Subject: [PATCH] From 3.7.0 onwards, we no longer need the -mllvm
 -enable-gvn=false hack to compile boot2 successfully.

---
 share/mk/bsd.sys.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
index 78a4c6b79ba6..bd1609eb7b8e 100644
--- a/share/mk/bsd.sys.mk
+++ b/share/mk/bsd.sys.mk
@@ -129,7 +129,7 @@ CLANG_NO_IAS=	 -no-integrated-as
 .endif
 CLANG_OPT_SMALL= -mstack-alignment=8 -mllvm -inline-threshold=3\
 		 -mllvm -simplifycfg-dup-ret
-.if ${COMPILER_VERSION} >= 30500
+.if ${COMPILER_VERSION} >= 30500 && ${COMPILER_VERSION} < 30700
 CLANG_OPT_SMALL+= -mllvm -enable-gvn=false
 .else
 CLANG_OPT_SMALL+= -mllvm -enable-load-pre=false