diff options
| author | Michael Forney <mforney@mforney.org> | 2020-03-16 23:08:02 -0700 |
|---|---|---|
| committer | Mike Frysinger <vapier@chromium.org> | 2020-03-17 06:30:52 +0000 |
| commit | 23e6fbf571a6638ce9642fc1f50baf1af0f54268 (patch) | |
| tree | c3ec1270f8769b6baf2eacbc029de6adbd9b6603 /src/common/android/include | |
| parent | Roll src/src/third_party/lss/ f70e2f164..fd00dbbd0 (2 commits) (diff) | |
| download | breakpad-23e6fbf571a6638ce9642fc1f50baf1af0f54268.tar.xz | |
Use ULONG_MAX instead of __WORDSIZE to determine native ELF architecture
__WORDSIZE is an internal libc definition. Instead, we can use
ULONG_MAX from limits.h, whose value corresponds to the machine's
native word size.
This allows us to remove the fallback definition of __WORDSIZE in
the Android compatibility headers.
Bug: google-breakpad:631
Change-Id: I7b9e6f3b2121f78ccad9e32bf26acac518aefd8f
Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/2107100
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Diffstat (limited to 'src/common/android/include')
| -rw-r--r-- | src/common/android/include/elf.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/common/android/include/elf.h b/src/common/android/include/elf.h index b2a28df4..e6f0c672 100644 --- a/src/common/android/include/elf.h +++ b/src/common/android/include/elf.h @@ -109,17 +109,6 @@ typedef struct { } Elf64_Dyn; -// __WORDSIZE is GLibc-specific and used by Google Breakpad on Linux. -#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. #ifndef EM_X86_64 #define EM_X86_64 62 |