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

[Marius Strobl]

Author: marius
Date: Wed Jan 31 21:56:23 2018
New Revision: 328639
URL: https://svnweb.freebsd.org/changeset/base/328639

Log:
  Account for the fact that jemalloc 5.0.0 dropped STATIC_PAGE_SHIFT
  in favor for using LG_PAGE directly and, thus, for the fact that
  host and target don't necessarily use pages of the same sizes.
  
  Approved by:	jasone

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	Wed Jan 31 21:46:37 2018	(r328638)
+++ head/contrib/jemalloc/FREEBSD-diffs	Wed Jan 31 21:56:23 2018	(r328639)
@@ -153,7 +153,7 @@ index 00000000..355b565c
 + * each supported architecture.
 + */
 +#undef JEMALLOC_TLS_MODEL
-+#undef STATIC_PAGE_SHIFT
++#undef LG_PAGE
 +#undef LG_VADDR
 +#undef LG_SIZEOF_PTR
 +#undef LG_SIZEOF_INT
@@ -212,7 +212,7 @@ index 00000000..355b565c
 +#  define JEMALLOC_TLS_MODEL	/* Default. */
 +#endif
 +
-+#define	STATIC_PAGE_SHIFT	PAGE_SHIFT
++#define	LG_PAGE			PAGE_SHIFT
 +#define	LG_SIZEOF_INT		2
 +#define	LG_SIZEOF_LONG		LG_SIZEOF_PTR
 +#define	LG_SIZEOF_INTMAX_T	3

Modified: head/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h
==============================================================================
--- head/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h	Wed Jan 31 21:46:37 2018	(r328638)
+++ head/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h	Wed Jan 31 21:56:23 2018	(r328639)
@@ -17,7 +17,7 @@
  * each supported architecture.
  */
 #undef JEMALLOC_TLS_MODEL
-#undef STATIC_PAGE_SHIFT
+#undef LG_PAGE
 #undef LG_VADDR
 #undef LG_SIZEOF_PTR
 #undef LG_SIZEOF_INT
@@ -76,7 +76,7 @@
 #  define JEMALLOC_TLS_MODEL	/* Default. */
 #endif
 
-#define	STATIC_PAGE_SHIFT	PAGE_SHIFT
+#define	LG_PAGE			PAGE_SHIFT
 #define	LG_SIZEOF_INT		2
 #define	LG_SIZEOF_LONG		LG_SIZEOF_PTR
 #define	LG_SIZEOF_INTMAX_T	3