From c5c4b2ae6e33f8541d6d6300276fff3381706d81 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 4 Apr 2018 19:18:14 +0200 Subject: [PATCH] re PR other/85161 (Test case failures in libbacktrace on powerpc64 BE starting with r253456) PR other/85161 * elf.c (elf_zlib_fetch): Fix up predefined macro names in test for big endian, only use 32-bit loads if endianity macros are predefined and indicate big or little endian. From-SVN: r259096 --- libbacktrace/ChangeLog | 7 +++++++ libbacktrace/elf.c | 9 ++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog index 64733a82ca2..85c8742b8a8 100644 --- a/libbacktrace/ChangeLog +++ b/libbacktrace/ChangeLog @@ -1,3 +1,10 @@ +2018-04-04 Jakub Jelinek + + PR other/85161 + * elf.c (elf_zlib_fetch): Fix up predefined macro names in test for + big endian, only use 32-bit loads if endianity macros are predefined + and indicate big or little endian. + 2018-02-14 Igor Tsimbalist PR target/84148 diff --git a/libbacktrace/elf.c b/libbacktrace/elf.c index 19da5a97b23..0fd5e6f9d0d 100644 --- a/libbacktrace/elf.c +++ b/libbacktrace/elf.c @@ -1086,12 +1086,19 @@ elf_zlib_fetch (const unsigned char **ppin, const unsigned char *pinend, return 0; } +#if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) \ + && defined(__ORDER_BIG_ENDIAN__) \ + && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ \ + || __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) /* We've ensured that PIN is aligned. */ next = *(const uint32_t *)pin; -#if __BYTE_ORDER == __ORDER_BIG_ENDIAN +#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ next = __builtin_bswap32 (next); #endif +#else + next = pin[0] | (pin[1] << 8) | (pin[2] << 16) | (pin[3] << 24); +#endif val |= (uint64_t)next << bits; bits += 32; -- 2.30.2