[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [Xen-devel] [PATCH v2] ld: don't hardcode "-melf_i386"
On Wed, 2014-04-16 at 09:14 +0200, Roger Pau Monne wrote: > On FreeBSD, the name of the emulation is "-melf_i386_fbsd", so allow > SeaBIOS to fetch the emulation to use from the environment variables. > > This allows SeaBIOS to compile on FreeBSD with gcc. > > Signed-off-by: Roger Pau Monnà <roger.pau@xxxxxxxxxx> > Cc: Ian Campbell <ian.campbell@xxxxxxxxxx> Since you CCd me, FWIW: Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx> > --- > Changes in v2: > - Rebase on top of master > --- > Makefile | 5 +++-- > 1 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/Makefile b/Makefile > index e567ba1..4338f94 100644 > --- a/Makefile > +++ b/Makefile > @@ -24,6 +24,7 @@ STRIP=$(CROSS_PREFIX)strip > PYTHON=python > CPP=cpp > IASL:=iasl > +LD32BIT_FLAG:=-melf_i386 > > # Source files > SRCBOTH=misc.c stacks.c output.c string.c x86.c block.c cdrom.c mouse.c > kbd.c \ > @@ -154,8 +155,8 @@ $(OUT)romlayout16.lds: $(OUT)ccode32flat.o > $(OUT)code32seg.o $(OUT)ccode16.o $(O > @echo " Building ld scripts" > $(Q)./scripts/buildversion.sh $(OUT)version.c > $(Q)$(CC) $(CFLAGS32FLAT) -c $(OUT)version.c -o $(OUT)version.o > - $(Q)$(LD) -melf_i386 -r $(OUT)ccode32flat.o $(OUT)version.o -o > $(OUT)code32flat.o > - $(Q)$(LD) -melf_i386 -r $(OUT)ccode16.o $(OUT)romlayout.o -o > $(OUT)code16.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)$(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 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |