Module Name: src
Committed By: mrg
Date: Fri Mar 18 10:07:52 UTC 2016
Modified Files:
src/external/gpl3/gcc/dist/gcc: tree-ssa-ccp.c
Log Message:
disable our local hack to check alloc alignment on arm, as the define
is no longer compile-time constant and CTASSERT() fails.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/dist/gcc/tree-ssa-ccp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/gcc/tree-ssa-ccp.c
diff -u src/external/gpl3/gcc/dist/gcc/tree-ssa-ccp.c:1.5 src/external/gpl3/gcc/dist/gcc/tree-ssa-ccp.c:1.6
--- src/external/gpl3/gcc/dist/gcc/tree-ssa-ccp.c:1.5 Sun Jan 24 09:43:31 2016
+++ src/external/gpl3/gcc/dist/gcc/tree-ssa-ccp.c Fri Mar 18 10:07:52 2016
@@ -2851,7 +2851,8 @@ make_pass_fold_builtins (gcc::context *c
*/
#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 @@ make_pass_fold_builtins (gcc::context *c
#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
