Changeset 2ca5f632 in mainline


Ignore:
Timestamp:
2011-04-30T16:45:06Z (13 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
7fb3f1c
Parents:
15b3761
Message:

Integrate arch/ part of rtld into core C library.

Location:
uspace/lib/c
Files:
3 deleted
6 edited
12 moved

Legend:

Unmodified
Added
Removed

  • uspace/lib/c/Makefile

    r15b3761 r2ca5f632  
    3434INCLUDE_ARCH = include/arch
    3535INCLUDE_LIBARCH = include/libarch
    36 INCLUDE_RTLDARCH = rtld/include/arch
    3736
    3837COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
    … …  
    4847        $(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld
    4948
    50 PRE_DEPEND = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) $(INCLUDE_RTLDARCH) $(COMMON_HEADER_ARCH)
     49PRE_DEPEND = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH)
    5150EXTRA_OUTPUT = $(LINKER_SCRIPTS)
    52 EXTRA_CLEAN = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) $(INCLUDE_RTLDARCH) $(COMMON_HEADER_ARCH) $(LINKER_SCRIPTS)
     51EXTRA_CLEAN = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH) $(LINKER_SCRIPTS)
    5352LIBRARY = libc
    5453SLIBRARY = libc.so.0.0
    … …  
    5958-include $(CONFIG_MAKEFILE)
    6059-include arch/$(UARCH)/Makefile.inc
    61 -include rtld/arch/$(UARCH)/Makefile.inc
    6260
    6361EXTRA_CFLAGS += -Irtld/include -I../../srv/loader/include
    … …  
    147145        ln -sfn ../$< $@
    148146
    149 $(INCLUDE_RTLDARCH): rtld/arch/$(UARCH)/include
    150         ln -sfn ../../$< $@
    151 
    152147$(INCLUDE_KERNEL)/arch: ../../../kernel/generic/include/arch $(INCLUDE_KERNEL)
    153148

  • uspace/lib/c/arch/ia32/Makefile.inc

    r15b3761 r2ca5f632  
    3636        arch/$(UARCH)/src/setjmp.S \
    3737        arch/$(UARCH)/src/stacktrace.c \
    38         arch/$(UARCH)/src/stacktrace_asm.S
     38        arch/$(UARCH)/src/stacktrace_asm.S \
     39        arch/$(UARCH)/src/rtld/dynamic.c \
     40        arch/$(UARCH)/src/rtld/reloc.c
    3941
    4042.PRECIOUS: arch/$(UARCH)/src/entry.o

  • uspace/lib/c/arch/ia32/src/rtld/reloc.c

    r15b3761 r2ca5f632  
    3838#include <stdlib.h>
    3939
    40 #include <elf_dyn.h>
     40#include <libarch/rtld/elf_dyn.h>
    4141#include <symbol.h>
    4242#include <rtld.h>

  • uspace/lib/c/arch/mips32/Makefile.inc

    r15b3761 r2ca5f632  
    3535        arch/$(UARCH)/src/tls.c \
    3636        arch/$(UARCH)/src/stacktrace.c \
    37         arch/$(UARCH)/src/stacktrace_asm.S
     37        arch/$(UARCH)/src/stacktrace_asm.S \
     38        arch/$(UARCH)/src/rtld/dynamic.c \
     39        arch/$(UARCH)/src/rtld/reloc.c
    3840
    3941.PRECIOUS: arch/$(UARCH)/src/entry.o

  • uspace/lib/c/arch/ppc32/Makefile.inc

    r15b3761 r2ca5f632  
    3535        arch/$(UARCH)/src/tls.c \
    3636        arch/$(UARCH)/src/stacktrace.c \
    37         arch/$(UARCH)/src/stacktrace_asm.S
     37        arch/$(UARCH)/src/stacktrace_asm.S \
     38        arch/$(UARCH)/src/rtld/dynamic.c \
     39        arch/$(UARCH)/src/rtld/reloc.c
    3840
    3941.PRECIOUS: arch/$(UARCH)/src/entry.o

  • uspace/lib/c/rtld/include/dynamic.h

    r15b3761 r2ca5f632  
    3838#include <bool.h>
    3939#include <elf_dyn.h>
    40 #include <arch/dynamic.h>
     40#include <libarch/rtld/dynamic.h>
    4141
    4242/**

  • uspace/lib/c/rtld/include/elf_dyn.h

    r15b3761 r2ca5f632  
    4040
    4141#include <elf.h>
    42 #include <arch/elf_dyn.h>
     42#include <libarch/rtld/elf_dyn.h>
    4343
    4444#define ELF32_R_SYM(i) ((i)>>8)
Note: See TracChangeset for help on using the changeset viewer.