From ab0116f5fbe7ed9b4b08cd3d64382a89640cb9ae Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sat, 28 Mar 2015 12:23:15 +0000 Subject: [PATCH] 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 --- share/mk/bsd.sys.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index 286fa4fcccf..78a4c6b79ba 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -131,6 +131,8 @@ CLANG_OPT_SMALL= -mstack-alignment=8 -mllvm -inline-threshold=3\ -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"