summaryrefslogtreecommitdiffstats
path: root/contrib/jemalloc/FREEBSD-diffs
diff options
context:
space:
mode:
authorjasone <jasone@FreeBSD.org>2015-08-18 09:09:27 +0000
committerjasone <jasone@FreeBSD.org>2015-08-18 09:09:27 +0000
commit66d56e8283c0df313916ad770a6ebe16badd2520 (patch)
treec79e652e15d8a6c07e5e6aa93d1ea64b7fb320a1 /contrib/jemalloc/FREEBSD-diffs
parent2c2a86d063c6b44c738a1a5fb7aa3f9b7a2631a2 (diff)
downloadFreeBSD-src-66d56e8283c0df313916ad770a6ebe16badd2520.zip
FreeBSD-src-66d56e8283c0df313916ad770a6ebe16badd2520.tar.gz
Re-add LG_SIZEOF_PTR definition for __aarch64__.
This definition was erroneously removed during the 4.0.0 import.
Diffstat (limited to 'contrib/jemalloc/FREEBSD-diffs')
-rw-r--r--contrib/jemalloc/FREEBSD-diffs11
1 files changed, 9 insertions, 2 deletions
diff --git a/contrib/jemalloc/FREEBSD-diffs b/contrib/jemalloc/FREEBSD-diffs
index 572e096..8452677 100644
--- a/contrib/jemalloc/FREEBSD-diffs
+++ b/contrib/jemalloc/FREEBSD-diffs
@@ -117,10 +117,10 @@ index dbf6aa7..f87dba8 100644
jemalloc_postfork_child
diff --git a/include/jemalloc/jemalloc_FreeBSD.h b/include/jemalloc/jemalloc_FreeBSD.h
new file mode 100644
-index 0000000..66d6da5
+index 0000000..c5113b9
--- /dev/null
+++ b/include/jemalloc/jemalloc_FreeBSD.h
-@@ -0,0 +1,137 @@
+@@ -0,0 +1,144 @@
+/*
+ * Override settings that were generated in jemalloc_defs.h as necessary.
+ */
@@ -163,6 +163,9 @@ index 0000000..66d6da5
+#ifdef __arm__
+# define LG_SIZEOF_PTR 2
+#endif
++#ifdef __aarch64__
++# define LG_SIZEOF_PTR 3
++#endif
+#ifdef __mips__
+#ifdef __mips_n64
+# define LG_SIZEOF_PTR 3
@@ -180,6 +183,10 @@ index 0000000..66d6da5
+# define JEMALLOC_TLS_MODEL /* Default. */
+#endif
+
++#ifndef CPU_SPINWAIT
++# define CPU_SPINWAIT do {} while (0)
++#endif
++
+#define STATIC_PAGE_SHIFT PAGE_SHIFT
+#define LG_SIZEOF_INT 2
+#define LG_SIZEOF_LONG LG_SIZEOF_PTR
OpenPOWER on IntegriCloud