d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make boot2 build with Clang again.

Browse Source 
Submitted by:	dim (bsd.sys.mk)
Reviewed by:	dim, jhb
This commit is contained in:
Jung-uk Kim 2012-03-09 23:30:30 +00:00
parent c5940c30a7
commit de9dec16dd
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
share/mk/bsd.sys.mk
View File

@ -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" && \

6
sys/boot/i386/boot2/boot2.c
View File

@ -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;