Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / breakpad / src / common / android / include / elf.h

diff --git a/src/breakpad/src/common/android/include/elf.h b/src/breakpad/src/common/android/include/elf.h
index af50a79..b2a28df 100644 (file)
--- a/src/breakpad/src/common/android/include/elf.h
+++ b/src/breakpad/src/common/android/include/elf.h
@@ -38,7 +38,7 @@ extern "C" {
 #endif  // __cplusplus
 
 // The Android <elf.h> provides BSD-based definitions for the ElfXX_Nhdr
-// types 
+// types
 // always source-compatible with the GLibc/kernel ones. To overcome this
 // issue without modifying a lot of code in Breakpad, use an ugly macro
 // renaming trick with #include_next
@@ -110,9 +110,14 @@ typedef struct {
 
 
 // __WORDSIZE is GLibc-specific and used by Google Breakpad on Linux.
-// All Android platforms are 32-bit for now.
 #ifndef __WORDSIZE
+#if defined(__i386__) ||  defined(__ARM_EABI__) || defined(__mips__)
 #define __WORDSIZE 32
+#elif defined(__x86_64__) || defined(__aarch64__)
+#define __WORDSIZE 64
+#else
+#error "Unsupported Android CPU ABI"
+#endif
 #endif
 
 // The Android headers don't always define this constant.