Changeset 76ca3f7 in mainline for uspace/srv/loader

Timestamp:

2010-03-23T20:49:54Z (15 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

e417b96

Parents:

b48ebd19 (diff), 63f8966 (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 mailnline changes, revision 329

Location:

uspace/srv/loader

Files:

• Makefile (modified) (2 diffs)
• arch/abs32le/Makefile.inc (modified) (1 diff)
• arch/amd64/Makefile.inc (modified) (1 diff)
• arch/arm32/Makefile.inc (modified) (1 diff)
• arch/ia32/Makefile.inc (modified) (1 diff)
• arch/ia64/Makefile.inc (modified) (1 diff)
• arch/mips32/Makefile.inc (modified) (1 diff)
• arch/ppc32/Makefile.inc (modified) (1 diff)
• arch/sparc64/Makefile.inc (modified) (1 diff)
• main.c (modified) (1 diff)

uspace/srv/loader/Makefile

@@ -28 +28 @@
 #
 
--include ../../../Makefile.config
+USPACE_PREFIX = ../..
+ROOT_PATH = $(USPACE_PREFIX)/..
+
+COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
+CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
+
+-include $(COMMON_MAKEFILE)
+-include $(CONFIG_MAKEFILE)
 -include arch/$(UARCH)/Makefile.inc
 
-USPACE_PREFIX = ../..
-LIBS = $(LIBC_PREFIX)/libc.a
-EXTRA_CFLAGS += -Iinclude
-LINK_SCRIPT = arch/$(UARCH)/_link.ld
+LINKER_SCRIPT = arch/$(UARCH)/_link.ld
+EXTRA_CLEAN = $(LINKER_SCRIPT)
 
-OUTPUT = loader
-EXTRA_OUTPUT = $(LINK_SCRIPT)
+EXTRA_CFLAGS = -Iinclude
+
+BINARY = loader
 
 GENERIC_SOURCES = \
@@ -44 +50 @@
         interp.s
 
-SOURCES := $(GENERIC_SOURCES) $(ARCH_SOURCES)
-OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
+SOURCES = \
+        $(GENERIC_SOURCES) \
+        $(ARCH_SOURCES)
 
-include ../Makefile.common
+include $(USPACE_PREFIX)/Makefile.common
 
-$(LINK_SCRIPT): $(LINK_SCRIPT).in
+$(LINKER_SCRIPT): $(LINKER_SCRIPT).in
         $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@

uspace/srv/loader/arch/abs32le/Makefile.inc

@@ -27 +27 @@
 #
 
-ARCH_SOURCES := arch/$(UARCH)/abs32le.c
+ARCH_SOURCES = arch/$(UARCH)/abs32le.c

uspace/srv/loader/arch/amd64/Makefile.inc

@@ -27 +27 @@
 #
 
-ARCH_SOURCES := arch/$(UARCH)/amd64.s
+ARCH_SOURCES = arch/$(UARCH)/amd64.s

uspace/srv/loader/arch/arm32/Makefile.inc

@@ -27 +27 @@
 #
 
-ARCH_SOURCES := arch/$(UARCH)/arm32.s
+ARCH_SOURCES = arch/$(UARCH)/arm32.s

uspace/srv/loader/arch/ia32/Makefile.inc

@@ -27 +27 @@
 #
 
-ARCH_SOURCES := arch/$(UARCH)/ia32.s
+ARCH_SOURCES = arch/$(UARCH)/ia32.s

uspace/srv/loader/arch/ia64/Makefile.inc

@@ -27 +27 @@
 #
 
-ARCH_SOURCES := arch/$(UARCH)/ia64.s
+ARCH_SOURCES = arch/$(UARCH)/ia64.s
 AFLAGS += -xexplicit

uspace/srv/loader/arch/mips32/Makefile.inc

@@ -27 +27 @@
 #
 
-ARCH_SOURCES := arch/$(UARCH)/mips32.s
+ARCH_SOURCES = arch/$(UARCH)/mips32.s

uspace/srv/loader/arch/ppc32/Makefile.inc

@@ -27 +27 @@
 #
 
-ARCH_SOURCES := arch/$(UARCH)/ppc32.s
+ARCH_SOURCES = arch/$(UARCH)/ppc32.s

uspace/srv/loader/arch/sparc64/Makefile.inc

@@ -27 +27 @@
 #
 
-ARCH_SOURCES := arch/$(UARCH)/sparc64.s
+ARCH_SOURCES = arch/$(UARCH)/sparc64.s

uspace/srv/loader/main.c

@@ -58 +58 @@
 #include <errno.h>
 #include <async.h>
-#include <string.h>
+#include <str.h>
 #include <as.h>