On Mon, Dec 01, 2014 at 10:56:09PM +0100, Patrick Georgi wrote:
> objdump output parsing expects C locale strings
> and formatting. Make sure it gets what it requires.
> 
> Signed-off-by: Patrick Georgi <pgeo...@google.com>

Thanks.

Your patch misses the call to OBJDUMP in bios.bin.prep though.  Does
the alternate patch below work?

-Kevin


--- a/Makefile
+++ b/Makefile
@@ -158,6 +158,7 @@ $(OUT)romlayout16.lds: $(OUT)ccode32flat.o 
$(OUT)code32seg.o $(OUT)ccode16.o $(O
        $(Q)$(CC) $(CFLAGS32FLAT) -c $(OUT)version.c -o $(OUT)version.o
        $(Q)$(LD) $(LD32BIT_FLAG) -r $(OUT)ccode32flat.o $(OUT)version.o -o 
$(OUT)code32flat.o
        $(Q)$(LD) $(LD32BIT_FLAG) -r $(OUT)ccode16.o $(OUT)romlayout.o -o 
$(OUT)code16.o
+       $(Q)export LC_ALL=C
        $(Q)$(OBJDUMP) -thr $(OUT)code32flat.o > $(OUT)code32flat.o.objdump
        $(Q)$(OBJDUMP) -thr $(OUT)code32seg.o > $(OUT)code32seg.o.objdump
        $(Q)$(OBJDUMP) -thr $(OUT)code16.o > $(OUT)code16.o.objdump
@@ -182,6 +183,7 @@ $(OUT)rom.o: $(OUT)rom16.strip.o $(OUT)rom32seg.strip.o 
$(OUT)code32flat.o $(OUT
 $(OUT)bios.bin.prep: $(OUT)rom.o scripts/checkrom.py
        @echo "  Prepping $@"
        $(Q)rm -f $(OUT)bios.bin $(OUT)Csm16.bin $(OUT)bios.bin.elf
+       $(Q)export LC_ALL=C
        $(Q)$(OBJDUMP) -thr $< > $<.objdump
        $(Q)$(OBJCOPY) -O binary $< $(OUT)bios.bin.raw
        $(Q)$(PYTHON) ./scripts/checkrom.py $<.objdump $(CONFIG_ROM_SIZE) 
$(OUT)bios.bin.raw $(OUT)bios.bin.prep

_______________________________________________
SeaBIOS mailing list
SeaBIOS@seabios.org
http://www.seabios.org/mailman/listinfo/seabios

Reply via email to