[src/trunk]: src/external/gpl3/gcc/dist/gcc disable our local hack to check a...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/231207eecb44
branches:  trunk
changeset: 344252:231207eecb44
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Mar 18 10:07:52 2016 +0000

description:
disable our local hack to check alloc alignment on arm, as the define
is no longer compile-time constant and CTASSERT() fails.

diffstat:

 external/gpl3/gcc/dist/gcc/tree-ssa-ccp.c |  6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diffs (27 lines):

diff -r c47e8f066332 -r 231207eecb44 external/gpl3/gcc/dist/gcc/tree-ssa-ccp.c
--- a/external/gpl3/gcc/dist/gcc/tree-ssa-ccp.c Fri Mar 18 09:18:04 2016 +0000
+++ b/external/gpl3/gcc/dist/gcc/tree-ssa-ccp.c Fri Mar 18 10:07:52 2016 +0000
@@ -2851,7 +2851,8 @@
  */
 
 #if defined(__alpha__) || defined(__amd64__) || defined(__sparc64__)   \
-     ||        (defined(__arm__) && defined(__ARM_EABI)) || defined(__powerpc__) \
+     ||        (defined(__arm__) && defined(__ARM_EABI__)) \
+     || defined(__powerpc__) \
      || ((defined(__mips__) || defined(__riscv__)) && defined(_LP64))
 #define        JEMALLOC_TINY_MIN_2POW  3
 #endif
@@ -2872,10 +2873,13 @@
 #define        TARGET_64BIT    0
 #endif
 
+/* ARM has a non-constant MALLOC_ABI_ALIGNMENT since GCC 5.  */
+#if !defined(__arm__)
 #ifdef __CTASSERT
 __CTASSERT((8<<JEMALLOC_TINY_MIN_2POW) == MALLOC_ABI_ALIGNMENT);
 #else
 #error compiling on an older NetBSD version?
 #endif
+#endif
 
 #endif