Clean up _BYTE_ORDER definitions for better x86 portability.
We'd manually hacked _BYTE_ORDER into the arm and mips "_types.h" headers, but not into the x86 one. Judging by upstream, _BYTE_ORDER should be in the "endian.h" headers instead, so let's uniformly do that. I've also ironed out some of the other differences between the different architectures' header files too. Bug: http://code.google.com/p/android/issues/detail?id=39824 Change-Id: I19d3af7ffd74e1c02b1b6886aec0f0d11f44ab8d
This commit is contained in:
parent
f2de6b0f6e
commit
b15c58bb0f
@ -77,7 +77,7 @@
|
||||
#endif /* __ARM_ARCH__ */
|
||||
#endif /* __GNUC__ */
|
||||
|
||||
#ifdef __ARMEB__
|
||||
#if defined(__ARMEB__)
|
||||
#define _BYTE_ORDER _BIG_ENDIAN
|
||||
#else
|
||||
#define _BYTE_ORDER _LITTLE_ENDIAN
|
||||
|
@ -116,10 +116,4 @@ typedef int __rune_t;
|
||||
typedef void * __wctrans_t;
|
||||
typedef void * __wctype_t;
|
||||
|
||||
#ifdef __ARMEB__
|
||||
#define _BYTE_ORDER _BIG_ENDIAN
|
||||
#else
|
||||
#define _BYTE_ORDER _LITTLE_ENDIAN
|
||||
#endif
|
||||
|
||||
#endif /* _ARM__TYPES_H_ */
|
||||
|
@ -29,17 +29,6 @@
|
||||
#ifndef _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__
|
||||
|
||||
#if defined(__mips_isa_rev) && (__mips_isa_rev >= 2)
|
||||
@ -69,9 +58,13 @@
|
||||
#endif /* __mips32r2__ */
|
||||
#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>
|
||||
|
||||
#define __STRICT_ALIGNMENT
|
||||
|
||||
#endif /* _MIPS64_ENDIAN_H_ */
|
||||
|
@ -124,12 +124,6 @@ typedef int __rune_t;
|
||||
typedef void * __wctrans_t;
|
||||
typedef void * __wctype_t;
|
||||
|
||||
#ifdef __MIPSEB__
|
||||
#define _BYTE_ORDER _BIG_ENDIAN
|
||||
#else
|
||||
#define _BYTE_ORDER _LITTLE_ENDIAN
|
||||
#endif
|
||||
|
||||
#if defined(_KERNEL)
|
||||
typedef struct label_t {
|
||||
__register_t val[14];
|
||||
|
@ -65,6 +65,7 @@
|
||||
#endif /* __GNUC__ */
|
||||
|
||||
#define _BYTE_ORDER _LITTLE_ENDIAN
|
||||
#include <sys/types.h>
|
||||
#include <sys/endian.h>
|
||||
|
||||
#endif /* _I386_ENDIAN_H_ */
|
||||
|
Loading…
x
Reference in New Issue
Block a user