Changeset 40d3604 in mainline for uspace/lib/c/include/elf/elf_mod.h


Ignore:
Timestamp:
2018-04-30T20:12:50Z (6 years ago)
Author:
GitHub <noreply@…>
Parents:
4c5f04f (diff), 64d38cd (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:
Jiří Zárevúcky <zarevucky.jiri@…> (2018-04-30 20:12:50)
git-committer:
GitHub <noreply@…> (2018-04-30 20:12:50)
Message:

Merge 64d38cd33ec6817c3a5fdd1a7da6d705b0d9d3a2 into 4c5f04f66aa0d34ff3bbed6e9abebf85f59723fb

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/c/include/elf/elf_mod.h

    r4c5f04f r40d3604  
    7878        entry_point_t entry;
    7979
     80        /** The base address where the file has been loaded.
     81         *  Points to the ELF file header.
     82         */
     83        void *base;
     84
    8085        /** ELF interpreter name or NULL if statically-linked */
    8186        const char *interp;
     
    101106        eld_flags_t flags;
    102107
    103         /** A copy of the ELF file header */
    104         elf_header_t *header;
    105 
    106108        /** Store extracted info here */
    107109        elf_finfo_t *info;
     
    109111
    110112extern const char *elf_error(unsigned int);
    111 extern int elf_load_file(int, size_t, eld_flags_t, elf_finfo_t *);
    112 extern int elf_load_file_name(const char *, size_t, eld_flags_t, elf_finfo_t *);
     113extern int elf_load_file(int, eld_flags_t, elf_finfo_t *);
     114extern int elf_load_file_name(const char *, eld_flags_t, elf_finfo_t *);
    113115
    114116#endif
Note: See TracChangeset for help on using the changeset viewer.