Changeset 90b8d58 in mainline


Ignore:
Timestamp:
2011-07-23T12:58:15Z (14 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
bfdb5af1
Parents:
5baf209
Message:

Remove surplus definition of NT_PRSTATUS.
Remove one surplus copy of elf.h.

Location:
uspace
Files:
1 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/c/Makefile

    r5baf209 r90b8d58  
    5858-include $(CONFIG_MAKEFILE)
    5959-include arch/$(UARCH)/Makefile.inc
    60 
    61 EXTRA_CFLAGS += -I../../srv/loader/include
    6260
    6361GENERIC_SOURCES = \

  • uspace/lib/c/include/elf/elf.h

    r5baf209 r90b8d58  
    358358#endif
    359359
    360 /*
    361  * Note types are not defined by the standard. These are the ones used
    362  * by SVr4 derivatives.
    363  */
    364 #define NT_PRSTATUS     1
    365 
    366 extern char *elf_error(unsigned int rc);
    367 
    368360#endif
    369361

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

    r5baf209 r90b8d58  
    3939#include <sys/types.h>
    4040
    41 #include <elf.h>
     41#include <elf/elf.h>
    4242#include <libarch/rtld/elf_dyn.h>
    4343

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

    r5baf209 r90b8d58  
    3636#define LIBC_RTLD_SYMBOL_H_
    3737
     38#include <elf/elf.h>
    3839#include <rtld/rtld.h>
    39 #include <elf.h>
    4040
    4141elf_symbol_t *symbol_bfs_find(const char *name, module_t *start, module_t **mod);

  • uspace/srv/loader/elf_load.c

    r5baf209 r90b8d58  
    4949#include <assert.h>
    5050#include <as.h>
     51#include <elf/elf.h>
    5152#include <unistd.h>
    5253#include <fcntl.h>
    … …  
    5556#include <entry_point.h>
    5657
    57 #include "elf.h"
    5858#include "elf_load.h"
    5959

  • uspace/srv/loader/include/elf_load.h

    r5baf209 r90b8d58  
    3838
    3939#include <arch/elf.h>
     40#include <elf/elf.h>
    4041#include <sys/types.h>
    4142#include <loader/pcb.h>
    4243
    43 #include "elf.h"
    4444
    4545typedef enum {
    … …  
    8282} elf_ld_t;
    8383
    84 int elf_load_file(const char *file_name, size_t so_bias, eld_flags_t flags,
    85     elf_info_t *info);
    86 void elf_create_pcb(elf_info_t *info, pcb_t *pcb);
     84extern const char *elf_error(unsigned int);
     85extern int elf_load_file(const char *, size_t, eld_flags_t, elf_info_t *);
     86extern void elf_create_pcb(elf_info_t *, pcb_t *);
    8787
    8888#endif

  • uspace/srv/loader/main.c

    r5baf209 r90b8d58  
    5959#include <str.h>
    6060#include <as.h>
    61 #include <elf.h>
    62 #include <elf_load.h>
     61#include <elf/elf.h>
     62
     63#include "elf_load.h"
    6364
    6465#ifdef CONFIG_RTLD
Note: See TracChangeset for help on using the changeset viewer.