[PATCH] ld: don't hardcode "-melf_i386"

[Roger Pau Monne]

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é 
Cc: Ian Campbell 
---
 Makefile |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 759bbbb..6a51305 100644
--- a/Makefile
+++ b/Makefile
@@ -67,6 +67,7 @@ STRIP=strip
 PYTHON=python
 CPP=cpp
 IASL:=iasl
+LD32BIT_FLAG:=-melf_i386

# Default targets
 -include $(KCONFIG_CONFIG)
@@ -143,8 +144,8 @@ $(OUT)romlayout16.lds: $(OUT)ccode32flat.o $(OUT)code32seg.o $(OUT)ccode16.o $(O
    @echo "  Building ld scripts"
    $(Q)./tools/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

[Idwer Vollering]

2014-04-15 19:22 GMT+02:00 Roger Pau Monne :
> 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.

What about clang? On FreeBSD >= 10 you need gcc from ports.

[Xen-devel] [PATCH] ld: don't hardcode "-melf_i386"

[Igor Kozhukhov]

On 15 Apr 2014, at 21:22, 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.

the same with -melf_i386_sol2 on illumos based platform.
LGTM from me here.
-Igor
> This allows SeaBIOS to compile on FreeBSD with gcc.
>
> Signed-off-by: Roger Pau Monné 
> Cc: Ian Campbell
>
> Makefile |    5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 759bbbb..6a51305 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -67,6 +67,7 @@ STRIP=strip
> PYTHON=python
> CPP=cpp
> IASL:=iasl
> +LD32BIT_FLAG:=-melf_i386
>
> # Default targets
> -include $(KCONFIG_CONFIG)
> @@ -143,8 +144,8 @@ $(OUT)romlayout16.lds: $(OUT)ccode32flat.o $(OUT)code32seg.o $(OUT)ccode16.o $(O
>    @echo "  Building ld scripts"
>    $(Q)./tools/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
> [e-mail]
> http://lists.xen.org/xen-devel