9os

commit 452c80805f35cfe728f2738de8cedf2402395aaa
parent 9b4e37f6f468a25a44b1f26b79fc998c57f35f83
Author: Dimitris Papastamos <dimitris.papastamos@arm.com>
Date:   Thu, 22 Nov 2018 14:19:55 +0000

Introduce RCODE_LDLIBS

Change-Id: I373f25f19e4c9b4f93ef404762bc9d5d2f954a19
Signed-off-by: Dimitris Papastamos <dimitris.papastamos@arm.com>

Diffstat:
M
arch/amd64/Makefile
 | 
4
++--
M
arch/arm32/Makefile
 | 
4
++--
M
arch/arm64/Makefile
 | 
4
++--
M
arch/rmode/Makefile
 | 
4
++--
M
scripts/rules.mk
 | 
7
++++++-

5 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/arch/amd64/Makefile b/arch/amd64/Makefile
@@ -19,7 +19,7 @@ TARGET = $(BINDIR)/romfw.elf $(BINDIR)/ramfw.elf
 all: $(TARGET)
 
 $(BINDIR)/romfw.elf: $(ROMOBJS) $(LIBDEP)
-	$(LD) $(RCODE_LDFLAGS) $(ROMOBJS) $(LIBS) -o $@
+	$(LD) $(RCODE_LDFLAGS) $(ROMOBJS) $(RCODE_LDLIBS) -o $@
 
 $(BINDIR)/ramfw.elf: $(RAMOBJS) $(LIBDEP)
-	$(LD) $(RCODE_LDFLAGS) $(RAMOBJS) $(LIBS) -o $@
+	$(LD) $(RCODE_LDFLAGS) $(RAMOBJS) $(RCODE_LDLIBS) -o $@
diff --git a/arch/arm32/Makefile b/arch/arm32/Makefile
@@ -19,7 +19,7 @@ TARGET = $(BINDIR)/romfw.elf $(BINDIR)/ramfw.elf
 all: $(TARGET)
 
 $(BINDIR)/romfw.elf: $(ROMOBJS) $(LIBDEP)
-	$(LD) $(RCODE_LDFLAGS) $(ROMOBJS) $(LIBS) -o $@
+	$(LD) $(RCODE_LDFLAGS) $(ROMOBJS) $(RCODE_LDLIBS) -o $@
 
 $(BINDIR)/ramfw.elf: $(RAMOBJS) $(LIBDEP)
-	$(LD) $(RCODE_LDFLAGS) $(RAMOBJS) $(LIBS) -o $@
+	$(LD) $(RCODE_LDFLAGS) $(RAMOBJS) $(RCODE_LDLIBS) -o $@
diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
@@ -19,7 +19,7 @@ TARGET = $(BINDIR)/romfw.elf $(BINDIR)/ramfw.elf
 all: $(TARGET)
 
 $(BINDIR)/romfw.elf: $(ROMOBJS) $(LIBDEP)
-	$(LD) $(RCODE_LDFLAGS) $(ROMOBJS) $(LIBS) -o $@
+	$(LD) $(RCODE_LDFLAGS) $(ROMOBJS) $(RCODE_LDLIBS) -o $@
 
 $(BINDIR)/ramfw.elf: $(RAMOBJS) $(LIBDEP)
-	$(LD) $(RCODE_LDFLAGS) $(RAMOBJS) $(LIBS) -o $@
+	$(LD) $(RCODE_LDFLAGS) $(RAMOBJS) $(RCODE_LDLIBS) -o $@
diff --git a/arch/rmode/Makefile b/arch/rmode/Makefile
@@ -41,10 +41,10 @@ sysreg.s: sysreg.lst
 	./mksysreg -s sysreg.lst
 
 $(BINDIR)/romfw.elf: $(ROMOBJS) $(LIBDEP)
-	$(LD) $(RCODE_LDFLAGS) $(ROMOBJS) $(LIBS) -o $@
+	$(LD) $(RCODE_LDFLAGS) $(ROMOBJS) $(RCODE_LDLIBS) -o $@
 
 $(BINDIR)/ramfw.elf: $(RAMOBJS) $(LIBDEP)
-	$(LD) $(RCODE_LDFLAGS) $(RAMOBJS) $(LIBS) -o $@
+	$(LD) $(RCODE_LDFLAGS) $(RAMOBJS) $(RCODE_LDLIBS) -o $@
 
 $(BINDIR)/ramfw.bin: $(BINDIR)/ramfw.tst
 $(BINDIR)/romfw.bin: $(BINDIR)/romfw.tst
diff --git a/scripts/rules.mk b/scripts/rules.mk
@@ -10,7 +10,7 @@ SRCDIR   = $(PROJECTDIR)/src
 SCRIPTDIR= $(PROJECTDIR)/scripts
 CONFDIR  = $(PROJECTDIR)/config
 INCLUDES = -I$(INCDIR) -I$(INCDIR)/bits/$(ARCH)/ -I$(INCDIR)/bits/$(SYS)
-LIBS   = -lhdl -lrmu -lk -lc
+LIBS     = -lhdl -lrmu -lk -lc
 
 LIBDEP = $(LIBDIR)/libhdl.a \
          $(LIBDIR)/librmu.a \
@@ -31,6 +31,11 @@ RCODE_ASFLAGS = $(MOREASFLAGS) \
                 $(SYSASFLAGS) \
                 $(ASFLAGS)
 
+RCODE_LDLIBS = $(MORELDLIBS) \
+               $(LIBS) \
+               $(SYSLDLIBS) \
+               $(LDLIBS)
+
 EMUCMD     = $(EMU) $(EMUFLAGS)
 
 CC = $(CROSS_COMPILE)$(COMP)