Changeset e175d69 in mainline for uspace/lib/c/Makefile

Timestamp:

2011-05-01T13:08:18Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

042fbe0

Parents:

a41577e (diff), e515a827 (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 dynamic linking support (ia32-only, off by default). Very limited TLS
support. Executables which use TLS should set STATIC_ONLY = y in Makefile.

File:

• uspace/lib/c/Makefile (modified) (4 diffs)

uspace/lib/c/Makefile

@@ -43 +43 @@
 LINKER_SCRIPTS = \
         $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld \
-        $(LIBC_PREFIX)/arch/$(UARCH)/_link-loader.ld
+        $(LIBC_PREFIX)/arch/$(UARCH)/_link-loader.ld \
+        $(LIBC_PREFIX)/arch/$(UARCH)/_link-shlib.ld \
+        $(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld
 
 PRE_DEPEND = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH)
@@ -49 +51 @@
 EXTRA_CLEAN = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH) $(LINKER_SCRIPTS)
 LIBRARY = libc
+SLIBRARY = libc.so.0.0
+LSONAME = libc.so.0
+
 
 -include $(COMMON_MAKEFILE)
 -include $(CONFIG_MAKEFILE)
 -include arch/$(UARCH)/Makefile.inc
+
+EXTRA_CFLAGS += -I../../srv/loader/include
 
 GENERIC_SOURCES = \
@@ -118 +125 @@
         generic/sort.c \
         generic/stats.c \
-        generic/assert.c \
+        generic/assert.c
+
+ifeq ($(CONFIG_RTLD), y)
+        GENERIC_SOURCES += \
+                generic/dlfcn.c \
+                generic/rtld/rtld.c \
+                generic/rtld/elf_load.c \
+                generic/rtld/dynamic.c \
+                generic/rtld/module.c \
+                generic/rtld/symbol.c
+endif
 
 SOURCES = \
@@ -143 +160 @@
         $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -DLOADER -E -x c $< | grep -v "^\#" > $@
 
+$(LIBC_PREFIX)/arch/$(UARCH)/_link-shlib.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in
+        $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -DSHLIB -E -x c $< | grep -v "^\#" > $@
+
+$(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in
+        $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -DDLEXE -E -x c $< | grep -v "^\#" > $@
+
 $(COMMON_HEADER_ARCH): $(COMMON_HEADER)
         ln -sfn ../../../$< $@