[SeaBIOS] [PATCH] Fix layoutrom step on i18n-equipped systems

Gerd Hoffmann kraxel at redhat.com
Wed Dec 3 11:16:39 CET 2014


On Di, 2014-12-02 at 10:40 -0500, Kevin O'Connor wrote:
> 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 <pgeorgi at 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

I suspect this isn't going to fly as each makefile line is run
separately.

How about this:

diff --git a/Makefile b/Makefile
index 7c2b33c..f2f80e2 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,7 @@ export HOSTCC             := $(CC)
 export CONFIG_SHELL       := sh
 export KCONFIG_AUTOHEADER := autoconf.h
 export KCONFIG_CONFIG     := $(CURDIR)/.config
+export LC_ALL             := C
 CROSS_PREFIX=
 ifneq ($(CROSS_PREFIX),)
 CC=$(CROSS_PREFIX)gcc

cheers,
  Gerd





More information about the SeaBIOS mailing list