am dea13da3: Merge "Clean up _BYTE_ORDER definitions for better x86 portability."

* commit 'dea13da3407873e4f3fec9ba1a04b4fdacea07f4':
  Clean up _BYTE_ORDER definitions for better x86 portability.
This commit is contained in:
Elliott Hughes 2012-11-27 18:44:17 -08:00 committed by Android Git Automerger
commit 321b545ad9
5 changed files with 9 additions and 27 deletions

View File

@ -77,7 +77,7 @@
#endif /* __ARM_ARCH__ */ #endif /* __ARM_ARCH__ */
#endif /* __GNUC__ */ #endif /* __GNUC__ */
#ifdef __ARMEB__ #if defined(__ARMEB__)
#define _BYTE_ORDER _BIG_ENDIAN #define _BYTE_ORDER _BIG_ENDIAN
#else #else
#define _BYTE_ORDER _LITTLE_ENDIAN #define _BYTE_ORDER _LITTLE_ENDIAN

View File

@ -116,10 +116,4 @@ typedef int __rune_t;
typedef void * __wctrans_t; typedef void * __wctrans_t;
typedef void * __wctype_t; typedef void * __wctype_t;
#ifdef __ARMEB__
#define _BYTE_ORDER _BIG_ENDIAN
#else
#define _BYTE_ORDER _LITTLE_ENDIAN
#endif
#endif /* _ARM__TYPES_H_ */ #endif /* _ARM__TYPES_H_ */

View File

@ -29,17 +29,6 @@
#ifndef _MIPS64_ENDIAN_H_ #ifndef _MIPS64_ENDIAN_H_
#define _MIPS64_ENDIAN_H_ #define _MIPS64_ENDIAN_H_
#if defined(__MIPSEL__)
#define _BYTE_ORDER _LITTLE_ENDIAN
#endif
#if defined(__MIPSEB__)
#define _BYTE_ORDER _BIG_ENDIAN
#endif
#if !defined(_BYTE_ORDER) && !defined(lint)
#error "__MIPSEL__ or __MIPSEB__ must be defined to define BYTE_ORDER!!!"
#endif
#ifdef __GNUC__ #ifdef __GNUC__
#if defined(__mips_isa_rev) && (__mips_isa_rev >= 2) #if defined(__mips_isa_rev) && (__mips_isa_rev >= 2)
@ -69,9 +58,13 @@
#endif /* __mips32r2__ */ #endif /* __mips32r2__ */
#endif /* __GNUC__ */ #endif /* __GNUC__ */
#if defined(__MIPSEB__)
#define _BYTE_ORDER _BIG_ENDIAN
#else
#define _BYTE_ORDER _LITTLE_ENDIAN
#endif
#define __STRICT_ALIGNMENT
#include <sys/types.h>
#include <sys/endian.h> #include <sys/endian.h>
#define __STRICT_ALIGNMENT
#endif /* _MIPS64_ENDIAN_H_ */ #endif /* _MIPS64_ENDIAN_H_ */

View File

@ -124,12 +124,6 @@ typedef int __rune_t;
typedef void * __wctrans_t; typedef void * __wctrans_t;
typedef void * __wctype_t; typedef void * __wctype_t;
#ifdef __MIPSEB__
#define _BYTE_ORDER _BIG_ENDIAN
#else
#define _BYTE_ORDER _LITTLE_ENDIAN
#endif
#if defined(_KERNEL) #if defined(_KERNEL)
typedef struct label_t { typedef struct label_t {
__register_t val[14]; __register_t val[14];

View File

@ -65,6 +65,7 @@
#endif /* __GNUC__ */ #endif /* __GNUC__ */
#define _BYTE_ORDER _LITTLE_ENDIAN #define _BYTE_ORDER _LITTLE_ENDIAN
#include <sys/types.h>
#include <sys/endian.h> #include <sys/endian.h>
#endif /* _I386_ENDIAN_H_ */ #endif /* _I386_ENDIAN_H_ */