Changeset f126c87 in mainline for abi/include


Ignore:
Timestamp:
2016-09-01T16:46:27Z (9 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
2a2fbc8
Parents:
9befb0d (diff), bdfdc51c (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 from mainline.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • abi/include/abi/elf.h

    r9befb0d rf126c87  
    5555 * ELF machine types
    5656 */
    57 #define EM_NO           0   /* No machine */
    58 #define EM_SPARC        2   /* SPARC */
    59 #define EM_386          3   /* i386 */
    60 #define EM_MIPS         8   /* MIPS RS3000 */
    61 #define EM_MIPS_RS3_LE  10  /* MIPS RS3000 LE */
    62 #define EM_PPC          20  /* PPC32 */
    63 #define EM_PPC64        21  /* PPC64 */
    64 #define EM_ARM          40  /* ARM */
    65 #define EM_SPARCV9      43  /* SPARC64 */
    66 #define EM_IA_64        50  /* IA-64 */
    67 #define EM_X86_64       62  /* AMD64/EMT64 */
     57#define EM_NO           0    /* No machine */
     58#define EM_SPARC        2    /* SPARC */
     59#define EM_386          3    /* i386 */
     60#define EM_MIPS         8    /* MIPS RS3000 */
     61#define EM_MIPS_RS3_LE  10   /* MIPS RS3000 LE */
     62#define EM_PPC          20   /* PPC32 */
     63#define EM_PPC64        21   /* PPC64 */
     64#define EM_ARM          40   /* ARM */
     65#define EM_SPARCV9      43   /* SPARC64 */
     66#define EM_IA_64        50   /* IA-64 */
     67#define EM_X86_64       62   /* AMD64/EMT64 */
     68#define EM_RISCV        243  /* RISC-V */
    6869
    6970/**
Note: See TracChangeset for help on using the changeset viewer.