svn commit: r233467 - stable/9/share/mk

[Marius Strobl]

Author: marius
Date: Sun Mar 25 16:20:01 2012
New Revision: 233467
URL: http://svn.freebsd.org/changeset/base/233467

Log:
  MFC: r232754 (remaining part)
  
  Make boot2 build with Clang again.
  
  Submitted by:	dim (bsd.sys.mk)
  Reviewed by:	dim, jhb

Modified:
  stable/9/share/mk/bsd.sys.mk   (contents, props changed)

Modified: stable/9/share/mk/bsd.sys.mk
==============================================================================
--- stable/9/share/mk/bsd.sys.mk	Sun Mar 25 16:00:56 2012	(r233466)
+++ stable/9/share/mk/bsd.sys.mk	Sun Mar 25 16:20:01 2012	(r233467)
@@ -100,8 +100,10 @@ CWARNFLAGS	+=	-Wno-unknown-pragmas
 
 .if ${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang"
 CLANG_NO_IAS	=	-no-integrated-as
-CLANG_OPT_SMALL	=	-mllvm -stack-alignment=8 -mllvm -inline-threshold=3 \
-			-mllvm -enable-load-pre=false
+CLANG_OPT_SMALL	=	-mllvm -stack-alignment=8 \
+			-mllvm -inline-threshold=3 \
+			-mllvm -enable-load-pre=false \
+			-mllvm -simplifycfg-dup-ret
 .endif
 
 .if ${MK_SSP} != "no" && ${MACHINE_CPUARCH} != "ia64" && \