svn commit: r286877 - in head/contrib/jemalloc: . include/jemalloc

[Jason Evans]

Author: jasone
Date: Tue Aug 18 09:09:27 2015
New Revision: 286877
URL: https://svnweb.freebsd.org/changeset/base/286877

Log:
  Re-add LG_SIZEOF_PTR definition for __aarch64__.
  
  This definition was erroneously removed during the 4.0.0 import.

Modified:
  head/contrib/jemalloc/FREEBSD-diffs
  head/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h

Modified: head/contrib/jemalloc/FREEBSD-diffs
==============================================================================
--- head/contrib/jemalloc/FREEBSD-diffs	Tue Aug 18 09:05:59 2015	(r286876)
+++ head/contrib/jemalloc/FREEBSD-diffs	Tue Aug 18 09:09:27 2015	(r286877)
@@ -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

Modified: head/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h
==============================================================================
--- head/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h	Tue Aug 18 09:05:59 2015	(r286876)
+++ head/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h	Tue Aug 18 09:09:27 2015	(r286877)
@@ -40,6 +40,9 @@
 #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