Minor build fixes.
I made these two tiny changes to SeaBIOS when I was playing with the HEAD version. The Makefile change prevents the test command from failing if CC contains a space. The coreboot change prevents a warning on our gcc 4.5.2 in certain circumstances when sizeof seems to be unsigned long int instead of unsigned int. They're both unintrusive, shouldn't have potential for breaking anything. Signed-off-by: Stefan Reinauer <stepan@coreboot.org>
This commit is contained in:
parent
33abfc0ac5
commit
06d0bdd9e2
2
Makefile
2
Makefile
|
@ -67,7 +67,7 @@ vpath %.S src vgasrc
|
||||||
################ Build rules
|
################ Build rules
|
||||||
|
|
||||||
# Verify the gcc configuration and test if -fwhole-program works.
|
# Verify the gcc configuration and test if -fwhole-program works.
|
||||||
TESTGCC:=$(shell CC=$(CC) tools/test-gcc.sh)
|
TESTGCC:=$(shell CC="$(CC)" tools/test-gcc.sh)
|
||||||
ifeq "$(TESTGCC)" "-1"
|
ifeq "$(TESTGCC)" "-1"
|
||||||
$(error "Please upgrade GCC")
|
$(error "Please upgrade GCC")
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -326,7 +326,7 @@ ulzma(u8 *dst, u32 maxlen, const u8 *src, u32 srclen)
|
||||||
u8 scratch[15980];
|
u8 scratch[15980];
|
||||||
int need = (LzmaGetNumProbs(&state.Properties) * sizeof(CProb));
|
int need = (LzmaGetNumProbs(&state.Properties) * sizeof(CProb));
|
||||||
if (need > sizeof(scratch)) {
|
if (need > sizeof(scratch)) {
|
||||||
dprintf(1, "LzmaDecode need %d have %d\n", need, sizeof(scratch));
|
dprintf(1, "LzmaDecode need %d have %d\n", need, (unsigned int)sizeof(scratch));
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
state.Probs = (CProb *)scratch;
|
state.Probs = (CProb *)scratch;
|
||||||
|
|
Loading…
Reference in New Issue