Changeset 3e828ea in mainline for uspace/lib/c/include/elf/elf_mod.h

Timestamp:

2019-09-23T12:49:29Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (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.

git-author:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

File:

• uspace/lib/c/include/elf/elf_mod.h (modified) (2 diffs)

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

@@ -42 +42 @@
 #include <stdint.h>
 #include <loader/pcb.h>
-
-/**
- * ELF error return codes
- */
-#define EE_OK                   0       /* No error */
-#define EE_INVALID              1       /* Invalid ELF image */
-#define EE_MEMORY               2       /* Cannot allocate address space */
-#define EE_INCOMPATIBLE         3       /* ELF image is not compatible with current architecture */
-#define EE_UNSUPPORTED          4       /* Non-supported ELF (e.g. dynamic ELFs) */
-#define EE_IRRECOVERABLE        5
-#define EE_IO                   6       /* Could not read file. */
 
 typedef enum {
@@ -110 +99 @@
 } elf_ld_t;
 
-extern const char *elf_error(unsigned int);
-extern int elf_load_file(int, eld_flags_t, elf_finfo_t *);
-extern int elf_load_file_name(const char *, eld_flags_t, elf_finfo_t *);
+extern errno_t elf_load_file(int, eld_flags_t, elf_finfo_t *);
+extern errno_t elf_load_file_name(const char *, eld_flags_t, elf_finfo_t *);
 
 #endif