Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/c/Makefile

    rc7bbf029 r79ae36dd  
    4141CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
    4242
     43LINKER_SCRIPTS = \
     44        $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld \
     45        $(LIBC_PREFIX)/arch/$(UARCH)/_link-loader.ld \
     46        $(LIBC_PREFIX)/arch/$(UARCH)/_link-shlib.ld \
     47        $(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld
     48
    4349PRE_DEPEND = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH)
    44 EXTRA_OUTPUT = $(LINKER_SCRIPT)
    45 EXTRA_CLEAN = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH) $(LINKER_SCRIPT)
     50EXTRA_OUTPUT = $(LINKER_SCRIPTS)
     51EXTRA_CLEAN = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH) $(LINKER_SCRIPTS)
    4652LIBRARY = libc
     53SLIBRARY = libc.so.0.0
     54LSONAME = libc.so0
     55
    4756
    4857-include $(COMMON_MAKEFILE)
    4958-include $(CONFIG_MAKEFILE)
    5059-include arch/$(UARCH)/Makefile.inc
     60
     61EXTRA_CFLAGS += -I../../srv/loader/include
    5162
    5263GENERIC_SOURCES = \
     
    5768        generic/clipboard.c \
    5869        generic/devmap.c \
     70        generic/devmap_obsolete.c \
    5971        generic/devman.c \
     72        generic/devman_obsolete.c \
    6073        generic/device/hw_res.c \
    6174        generic/device/char_dev.c \
     
    6578        generic/str.c \
    6679        generic/str_error.c \
     80        generic/l18n/langs.c \
    6781        generic/fibril.c \
    6882        generic/fibril_synch.c \
     
    8498        generic/io/console.c \
    8599        generic/io/screenbuffer.c \
    86         generic/ipc/ns.c \
    87100        generic/malloc.c \
    88101        generic/sysinfo.c \
    89102        generic/ipc.c \
     103        generic/ns.c \
     104        generic/ns_obsolete.c \
    90105        generic/async.c \
    91         generic/async_sess.c \
     106        generic/async_obsolete.c \
    92107        generic/loader.c \
    93108        generic/getopt.c \
     
    97112        generic/adt/measured_strings.c \
    98113        generic/adt/char_map.c \
     114        generic/adt/prodcons.c \
    99115        generic/time.c \
    100116        generic/stdlib.c \
     
    114130        generic/sort.c \
    115131        generic/stats.c \
    116         generic/assert.c \
     132        generic/assert.c
     133
     134ifeq ($(CONFIG_RTLD),y)
     135        GENERIC_SOURCES += \
     136                generic/dlfcn.c \
     137                generic/rtld/rtld.c \
     138                generic/rtld/elf_load.c \
     139                generic/rtld/dynamic.c \
     140                generic/rtld/module.c \
     141                generic/rtld/symbol.c
     142endif
    117143
    118144SOURCES = \
     
    133159        ln -sfn ../$< $@
    134160
    135 $(LINKER_SCRIPT): $(LINKER_SCRIPT).in
     161$(LIBC_PREFIX)/arch/$(UARCH)/_link.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in
    136162        $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -E -x c $< | grep -v "^\#" > $@
     163
     164$(LIBC_PREFIX)/arch/$(UARCH)/_link-loader.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in
     165        $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -DLOADER -E -x c $< | grep -v "^\#" > $@
     166
     167$(LIBC_PREFIX)/arch/$(UARCH)/_link-shlib.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in
     168        $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -DSHLIB -E -x c $< | grep -v "^\#" > $@
     169
     170$(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in
     171        $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -DDLEXE -E -x c $< | grep -v "^\#" > $@
    137172
    138173$(COMMON_HEADER_ARCH): $(COMMON_HEADER)
Note: See TracChangeset for help on using the changeset viewer.