From owner-svn-src-all@freebsd.org Tue Aug 18 09:09:29 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0A1569BC0A4; Tue, 18 Aug 2015 09:09:29 +0000 (UTC) (envelope-from jasone@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D4E7FB7F; Tue, 18 Aug 2015 09:09:28 +0000 (UTC) (envelope-from jasone@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7I99SHx026464; Tue, 18 Aug 2015 09:09:28 GMT (envelope-from jasone@FreeBSD.org) Received: (from jasone@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7I99S1L026462; Tue, 18 Aug 2015 09:09:28 GMT (envelope-from jasone@FreeBSD.org) Message-Id: <201508180909.t7I99S1L026462@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jasone set sender to jasone@FreeBSD.org using -f From: Jason Evans Date: Tue, 18 Aug 2015 09:09:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r286877 - in head/contrib/jemalloc: . include/jemalloc X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Aug 2015 09:09:29 -0000 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