Changeset 90b8d58 in mainline for uspace/srv

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/srv/loader

Files:

• elf_load.c (modified) (2 diffs)
• include/elf.h (deleted)
• include/elf_load.h (modified) (2 diffs)
• main.c (modified) (1 diff)

uspace/srv/loader/elf_load.c

@@ -49 +49 @@
 #include <assert.h>
 #include <as.h>
+#include <elf/elf.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -55 +56 @@
 #include <entry_point.h>
 
-#include "elf.h"
 #include "elf_load.h"
 

uspace/srv/loader/include/elf_load.h

@@ -38 +38 @@
 
 #include <arch/elf.h>
+#include <elf/elf.h>
 #include <sys/types.h>
 #include <loader/pcb.h>
 
-#include "elf.h"
 
 typedef enum {
@@ -82 +82 @@
 } elf_ld_t;
 
-int elf_load_file(const char *file_name, size_t so_bias, eld_flags_t flags,
-    elf_info_t *info);
-void elf_create_pcb(elf_info_t *info, pcb_t *pcb);
+extern const char *elf_error(unsigned int);
+extern int elf_load_file(const char *, size_t, eld_flags_t, elf_info_t *);
+extern void elf_create_pcb(elf_info_t *, pcb_t *);
 
 #endif

uspace/srv/loader/main.c

@@ -59 +59 @@
 #include <str.h>
 #include <as.h>
-#include <elf.h>
-#include <elf_load.h>
+#include <elf/elf.h>
+
+#include "elf_load.h"
 
 #ifdef CONFIG_RTLD