aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-01-21 11:21:34 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2010-01-21 11:21:34 -0800
commitc8472186e15ab6968342bae839277b82cf2584c4 (patch)
tree754bf1fb08b9b818bbab288142a5fff408a137e4 /include
parent988ad28e7f94fc9e421bc5dc5338022b3ef78957 (diff)
parent91a54c11cbfbe3adc1df2f523c75ad76affb0ae9 (diff)
downloadsystem_core-c8472186e15ab6968342bae839277b82cf2584c4.tar.gz
system_core-c8472186e15ab6968342bae839277b82cf2584c4.tar.bz2
system_core-c8472186e15ab6968342bae839277b82cf2584c4.zip
merge from open-source master
Diffstat (limited to 'include')
-rw-r--r--include/arch/darwin-x86/AndroidConfig.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/arch/darwin-x86/AndroidConfig.h b/include/arch/darwin-x86/AndroidConfig.h
index 20e00001..363a8f73 100644
--- a/include/arch/darwin-x86/AndroidConfig.h
+++ b/include/arch/darwin-x86/AndroidConfig.h
@@ -146,7 +146,7 @@
*/
#if (defined(__ppc__) || defined(__ppc64__))
# define HAVE_BIG_ENDIAN
-#elif defined(__i386__)
+#elif (defined(__i386__) || defined(__x86_64__))
# define HAVE_LITTLE_ENDIAN
#endif
@@ -219,7 +219,7 @@
*/
#if (defined(__ppc__) || defined(__ppc64__))
# define ARCH_PPC
-#elif defined(__i386__)
+#elif (defined(__i386__) || defined(__x86_64__))
# define ARCH_X86
#endif