Author: jkim
Date: Fri Mar 9 23:30:30 2012
New Revision: 232754
URL: http://svn.freebsd.org/changeset/base/232754
Log:
Make boot2 build with Clang again.
Submitted by: dim (bsd.sys.mk)
Reviewed by: dim, jhb
Modified:
head/share/mk/bsd.sys.mk
head/sys/boot/i386/boot2/boot2.c
Modified: head/share/mk/bsd.sys.mk
==============================================================================
--- head/share/mk/bsd.sys.mk Fri Mar 9 22:58:34 2012 (r232753)
+++ head/share/mk/bsd.sys.mk Fri Mar 9 23:30:30 2012 (r232754)
@@ -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" && \
Modified: head/sys/boot/i386/boot2/boot2.c
==============================================================================
--- head/sys/boot/i386/boot2/boot2.c Fri Mar 9 22:58:34 2012
(r232753)
+++ head/sys/boot/i386/boot2/boot2.c Fri Mar 9 23:30:30 2012
(r232754)
@@ -129,8 +129,8 @@ static struct dsk {
int init;
} dsk;
static char cmd[512], cmddup[512], knamebuf[1024];
-static const char *kname;
-static uint32_t opts;
+static const char *kname = NULL;
+static uint32_t opts = 0;
static int comspeed = SIOSPD;
static struct bootinfo bootinfo;
static uint8_t ioctrl = IO_KEYBOARD;
@@ -225,8 +225,6 @@ main(void)
ino_t ino;
size_t nbyte;
- opts = 0;
- kname = NULL;
dmadat = (void *)(roundup2(__base + (int32_t)&_end, 0x10000) - __base);
v86.ctl = V86_FLAGS;
v86.efl = PSL_RESERVED_DEFAULT | PSL_I;
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
