Changeset 3e30c0b in mainline

Timestamp:

2010-01-17T11:02:13Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

3c081d0e

Parents:

cec261e (diff), 8416d46 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge fix for loader not using the correct linker script.

Location:

uspace/srv

Files:

• Makefile.common (modified) (3 diffs)
• loader/Makefile (modified) (2 diffs)

uspace/srv/Makefile.common

@@ -50 +50 @@
 SOFTINT_PREFIX = $(USPACE_PREFIX)/lib/softint
 
+LINK_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld
+
 JOB = $(OUTPUT).job
 
@@ -67 +69 @@
     $(LIBS) \
     \
-    $(OUTPUT) $(OUTPUT).disasm
+    $(OUTPUT) $(OUTPUT).disasm \
+    $(EXTRA_OUTPUT)
         -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
 
 clean:
-        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
+        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm $(EXTRA_OUTPUT)
         find . -name '*.o' -follow -exec rm \{\} \;
 
@@ -82 +85 @@
 
 $(OUTPUT): $(OBJECTS) $(LIBS)
-        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+        $(LD) -T $(LINK_SCRIPT) $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
 %.o: %.c $(DEPEND)

uspace/srv/loader/Makefile

@@ -34 +34 @@
 LIBS = $(LIBC_PREFIX)/libc.a
 EXTRA_CFLAGS += -Iinclude
+LINK_SCRIPT = arch/$(UARCH)/_link.ld
 
 OUTPUT = loader
+EXTRA_OUTPUT = $(LINK_SCRIPT)
 
 GENERIC_SOURCES = \
@@ -46 +48 @@
 
 include ../Makefile.common
+
+$(LINK_SCRIPT): $(LINK_SCRIPT).in
+        $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@