Changeset 32573ff in mainline for uspace/lib/c/include/rtld/dynamic.h


Ignore:
Timestamp:
2016-05-02T20:58:16Z (9 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
7c4b26c
Parents:
6adb775f (diff), 5035ba05 (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.
Message:

Merge mainline, which has dltest and fixes.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r6adb775f r32573ff  
    4848 */
    4949typedef struct dyn_info {
    50         /** Type of relocations used for the PLT, either DT_REL or DT_RELA */
    51         int plt_rel;
    52 
    5350        /** Relocation table without explicit addends */
    5451        void *rel;
    … …  
    6461        void *jmp_rel;
    6562        size_t plt_rel_sz;
     63        /** Type of relocations used for the PLT, either DT_REL or DT_RELA */
     64        int plt_rel;
    6665
    6766        /** Pointer to PLT/GOT (processor-specific) */
Note: See TracChangeset for help on using the changeset viewer.