From cf9e96b856cb19c76a15e4c1bb8f99b0c26f46ee Mon Sep 17 00:00:00 2001 From: Joshua Peraza Date: Tue, 20 Mar 2018 15:14:16 -0700 Subject: [PATCH] elf: Use compiler macros in crashpad info size test note Bug: crashpad:30 Change-Id: If5bdd15dfc050ef57df0e3b59dd6a5e74d4a9b22 Reviewed-on: https://chromium-review.googlesource.com/972367 Reviewed-by: Mark Mentovai --- snapshot/crashpad_info_size_test_note.S | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/snapshot/crashpad_info_size_test_note.S b/snapshot/crashpad_info_size_test_note.S index a355a831..96b996db 100644 --- a/snapshot/crashpad_info_size_test_note.S +++ b/snapshot/crashpad_info_size_test_note.S @@ -16,7 +16,6 @@ // of finding the instance of CrashpadInfo g_crashpad_info without requiring // that symbol to be in the dynamic symbol table. -#include "build/build_config.h" #include "util/misc/elf_note_types.h" // namespace crashpad { @@ -41,16 +40,16 @@ name: name_end: .balign NOTE_ALIGN desc: -#if defined(ARCH_CPU_64_BITS) +#if defined(__LP64__) .quad TEST_CRASHPAD_INFO_SYMBOL #else -#if defined(ARCH_CPU_LITTLE_ENDIAN) +#if defined(__LITTLE_ENDIAN__) .long TEST_CRASHPAD_INFO_SYMBOL .long 0 #else .long 0 .long TEST_CRASHPAD_INFO_SYMBOL -#endif // ARCH_CPU_LITTLE_ENDIAN -#endif // ARCH_CPU_64_BITS +#endif // __LITTLE_ENDIAN__ +#endif // __LP64__ desc_end: .size info_size_test_note, .-info_size_test_note