From 0f18ae415f014d66887ede372582cdc605000fd1 Mon Sep 17 00:00:00 2001 From: neil Date: Mon, 9 May 2011 04:18:56 +0000 Subject: [PATCH] Added some extra flags needed for linking bootstrap. git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@38610 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- arch/i386-pc/bootstrap/mmakefile.src | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/i386-pc/bootstrap/mmakefile.src b/arch/i386-pc/bootstrap/mmakefile.src index 7bfa6bbca9..a03aa54e65 100644 --- a/arch/i386-pc/bootstrap/mmakefile.src +++ b/arch/i386-pc/bootstrap/mmakefile.src @@ -4,6 +4,7 @@ include $(TOP)/config/make.cfg TARGETDIR := $(GENDIR)/$(CURDIR) KOBJS := FILES := bootstrap screen elf support +LINKER = $(KERNEL_CC) $(KERNEL_CFLAGS) -nostartfiles -static-libgcc #MM kernel-bootstrap-i386 : linklibs \ #MM kernel-kernel-kobj \ @@ -19,7 +20,7 @@ $(BINDIR)/boot/aros-pc-i386.gz : $(BINDIR)/boot/aros-pc-i386 $(BINDIR)/boot/aros-pc-i386: setup-pc-i386 $(KOBJSDIR)/bootstrap.o \ $(TARGETDIR)/kernel.bin.o - $(KERNEL_CC) $(KERNEL_CFLAGS) -Wl,-N,-e,kernel_bootstrap \ + $(LINKER) -Wl,-N,-e,kernel_bootstrap \ -Wl,-Map,$(OSGENDIR)/boot/aros.map \ -Wl,-T,$(SRCDIR)/$(CURDIR)/ldscript.lds \ -o $@ $(KOBJSDIR)/bootstrap.o $(TARGETDIR)/kernel.bin.o \ @@ -28,13 +29,13 @@ $(BINDIR)/boot/aros-pc-i386: setup-pc-i386 $(KOBJSDIR)/bootstrap.o \ $(KOBJSDIR)/bootstrap.o: \ $(foreach f, $(FILES), $(TARGETDIR)/$(f).o $(TARGETDIR)/$(f).d) - $(KERNEL_LD) $(KERNEL_LDFLAGS) -r \ + $(LINKER) -Wl,-r \ $(foreach f, $(FILES), $(TARGETDIR)/$(f).o) -o $@ -L$(LIBDIR) \ -lrom -lm $(TARGETDIR)/kernel.bin.o: $(KOBJSDIR)/exec_library.o \ $(KOBJSDIR)/kernel_resource.o $(KOBJSDIR)/irq_hidd.o - $(KERNEL_CC) $(KERNEL_CFLAGS) -Wl,-Map,$(OSGENDIR)/boot/kernel.map \ + $(LINKER) -Wl,-Map,$(OSGENDIR)/boot/kernel.map \ -Wl,-T,$(SRCDIR)/$(CURDIR)/kernel.lds \ -o $(TARGETDIR)/kernel.bin \ $(KOBJSDIR)/kernel_resource.o $(KOBJSDIR)/exec_library.o \ -- 2.11.4.GIT