summaryrefslogtreecommitdiffstats
path: root/contrib/jemalloc/FREEBSD-diffs
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/jemalloc/FREEBSD-diffs')
-rw-r--r--contrib/jemalloc/FREEBSD-diffs32
1 files changed, 32 insertions, 0 deletions
diff --git a/contrib/jemalloc/FREEBSD-diffs b/contrib/jemalloc/FREEBSD-diffs
index 6c20441..6b5e52b 100644
--- a/contrib/jemalloc/FREEBSD-diffs
+++ b/contrib/jemalloc/FREEBSD-diffs
@@ -46,6 +46,38 @@ index c4a44e3..4626e9b 100644
+ in FreeBSD 11.0.</para>
+ </refsect1>
</refentry>
+diff --git a/include/jemalloc/internal/arena.h b/include/jemalloc/internal/arena.h
+index b1de2b6..da6b6d2 100644
+--- a/include/jemalloc/internal/arena.h
++++ b/include/jemalloc/internal/arena.h
+@@ -718,8 +718,13 @@ arena_miscelm_get_mutable(arena_chunk_t *chunk, size_t pageind)
+ JEMALLOC_ALWAYS_INLINE const arena_chunk_map_misc_t *
+ arena_miscelm_get_const(const arena_chunk_t *chunk, size_t pageind)
+ {
++#if 1 /* Work around gcc bug. */
++ arena_chunk_t *mchunk = (arena_chunk_t *)chunk;
+
++ return (arena_miscelm_get_mutable(mchunk, pageind));
++#else
+ return (arena_miscelm_get_mutable((arena_chunk_t *)chunk, pageind));
++#endif
+ }
+
+ JEMALLOC_ALWAYS_INLINE size_t
+@@ -778,8 +783,13 @@ arena_mapbitsp_get_mutable(arena_chunk_t *chunk, size_t pageind)
+ JEMALLOC_ALWAYS_INLINE const size_t *
+ arena_mapbitsp_get_const(const arena_chunk_t *chunk, size_t pageind)
+ {
++#if 1 /* Work around gcc bug. */
++ arena_chunk_t *mchunk = (arena_chunk_t *)chunk;
+
++ return (arena_mapbitsp_get_mutable(mchunk, pageind));
++#else
+ return (arena_mapbitsp_get_mutable((arena_chunk_t *)chunk, pageind));
++#endif
+ }
+
+ JEMALLOC_ALWAYS_INLINE size_t
diff --git a/include/jemalloc/internal/jemalloc_internal.h.in b/include/jemalloc/internal/jemalloc_internal.h.in
index 51bf897..7de22ea 100644
--- a/include/jemalloc/internal/jemalloc_internal.h.in
OpenPOWER on IntegriCloud