Changeset 1d465bf in mainline for uspace/Makefile.common

Timestamp:

2011-04-03T15:34:24Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3a3d4ca

Parents:

ec3e2ed

Message:

Fix passing of PCB pointer from dload. Build dltest (dynamically linked). Some issues with libtest remain.

File:

• uspace/Makefile.common (modified) (3 diffs)

uspace/Makefile.common

@@ -76 +76 @@
         LARCHIVE = $(LIBRARY).la
         LOUTPUT = $(SLIBRARY)
-        EXTRA_CLEAN += $(LOUTPUT).map $(LIBC_PREFIX)/shared/arch/$(UARCH)/_lib.ld
+        EXTRA_OUTPUT += $(LOUTPUT).disasm
+        EXTRA_CLEAN += $(LOUTPUT).map $(LOUTPUT).ldisasm \
+            $(LIBC_PREFIX)/shared/arch/$(UARCH)/_lib.ld
 endif
 
@@ -96 +98 @@
 LIBNET_PREFIX = $(LIB_PREFIX)/net
 
+ifeq ($(DYNAMIC_LINKING),y)
+BASE_LIBS = $(LIBC_PREFIX)/libc.so.0 $(LIBSOFTINT_PREFIX)/libsoftint.a
+LFLAGS = -Bdynamic
+LINKER_SCRIPT ?= $(LIBC_PREFIX)/shared/arch/$(UARCH)/_link.ld
+else
 BASE_LIBS = $(LIBC_PREFIX)/libc.a $(LIBSOFTINT_PREFIX)/libsoftint.a
-
 LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld
+endif
 
 ifeq ($(CONFIG_OPTIMIZE_FOR_SIZE),y)
@@ -202 +209 @@
 endif
 
+ifneq ($(SLIBRARY),)
+%.disasm: $(LOUTPUT)
+ifeq ($(CONFIG_LINE_DEBUG),y)
+        $(OBJDUMP) -d -S $< > $@
+else
+        $(OBJDUMP) -d $< > $@
+endif
+
 $(LOUTPUT): $(LARCHIVE) $(LIBC_PREFIX)/shared/arch/$(UARCH)/_lib.ld
         $(LD) -T $(LIBC_PREFIX)/shared/arch/$(UARCH)/_lib.ld $(LIB_LFLAGS) $(LARCHIVE) -o $@ -Map $(LOUTPUT).map
+endif
 
 $(LIBC_PREFIX)/shared/arch/$(UARCH)/_lib.ld: $(LIBC_PREFIX)/shared/arch/$(UARCH)/_lib.ld.in
+        $(CC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
+
+$(LIBC_PREFIX)/shared/arch/$(UARCH)/_link.ld: $(LIBC_PREFIX)/shared/arch/$(UARCH)/_link.ld.in
         $(CC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@