Changeset f6b5593 in mainline for kernel/arch/arm32/include/elf.h


Ignore:
Timestamp:
2009-09-21T11:53:03Z (15 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
4098e38
Parents:
2f636b6 (diff), c1618ed (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 changes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/arm32/include/elf.h

    r2f636b6 rf6b5593  
    2727 */
    2828
    29 /** @addtogroup arm32   
     29/** @addtogroup arm32
    3030 * @{
    3131 */
     
    3737#define KERN_arm32_ELF_H_
    3838
    39 #define ELF_MACHINE             EM_ARM
     39#define ELF_MACHINE  EM_ARM
    4040
    41 #ifdef BIG_ENDIAN
    42 #define ELF_DATA_ENCODING       ELFDATA2MSB
     41#ifdef __BE__
     42        #define ELF_DATA_ENCODING  ELFDATA2MSB
    4343#else
    44 #define ELF_DATA_ENCODING       ELFDATA2LSB
     44        #define ELF_DATA_ENCODING  ELFDATA2LSB
    4545#endif
    4646
    47 #define ELF_CLASS               ELFCLASS32
     47#define ELF_CLASS  ELFCLASS32
    4848
    4949#endif
Note: See TracChangeset for help on using the changeset viewer.