From owner-dev-commits-ports-all@freebsd.org Mon Sep 27 15:02:07 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AA5E56B78A3; Mon, 27 Sep 2021 15:02:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HJ5TC4BMDz3QK2; Mon, 27 Sep 2021 15:02:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6A57B12EF0; Mon, 27 Sep 2021 15:02:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 18RF279F061483; Mon, 27 Sep 2021 15:02:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18RF27Yk061482; Mon, 27 Sep 2021 15:02:07 GMT (envelope-from git) Date: Mon, 27 Sep 2021 15:02:07 GMT Message-Id: <202109271502.18RF27Yk061482@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: ab9e723ecd1c - main - databases/mariadb104-server: fix build on powerpc64le MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ab9e723ecd1c68a2cb9bb8c479b7e19dd825db26 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Sep 2021 15:02:07 -0000 The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=ab9e723ecd1c68a2cb9bb8c479b7e19dd825db26 commit ab9e723ecd1c68a2cb9bb8c479b7e19dd825db26 Author: Piotr Kubaj AuthorDate: 2021-09-27 14:59:56 +0000 Commit: Piotr Kubaj CommitDate: 2021-09-27 14:59:56 +0000 databases/mariadb104-server: fix build on powerpc64le Same fix as for databases/mariadb105-server. --- .../files/patch-include_my__cpu.h | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/databases/mariadb104-server/files/patch-include_my__cpu.h b/databases/mariadb104-server/files/patch-include_my__cpu.h new file mode 100644 index 000000000000..e205cbfa05e2 --- /dev/null +++ b/databases/mariadb104-server/files/patch-include_my__cpu.h @@ -0,0 +1,48 @@ +--- include/my_cpu.h.orig 2021-09-27 13:32:48 UTC ++++ include/my_cpu.h +@@ -23,7 +23,8 @@ + The defines are the same ones used by the linux kernel + */ + +-#ifdef _ARCH_PWR8 ++#if defined(_ARCH_PWR8) ++#if defined(linux) + #include + /* Very low priority */ + #define HMT_very_low() __ppc_set_ppr_very_low() +@@ -37,6 +38,22 @@ + #define HMT_medium_high() __ppc_set_ppr_med_high() + /* High priority */ + #define HMT_high() asm volatile("or 3,3,3") ++#elif defined(__FreeBSD__) ++#include ++#include ++/* Very low priority */ ++#define HMT_very_low() __asm__ volatile ("or 31,31,31") ++/* Low priority */ ++#define HMT_low() __asm__ volatile ("or 1,1,1") ++/* Medium low priority */ ++#define HMT_medium_low() __asm__ volatile ("or 6,6,6") ++/* Medium priority */ ++#define HMT_medium() __asm__ volatile ("or 2,2,2") ++/* Medium high priority */ ++#define HMT_medium_high() __asm__ volatile ("or 5,5,5") ++/* High priority */ ++#define HMT_high() asm volatile("or 3,3,3") ++#endif + #else + #define HMT_very_low() + #define HMT_low() +@@ -81,7 +98,12 @@ static inline void MY_RELAX_CPU(void) + __asm__ __volatile__ ("pause"); + #endif + #elif defined(_ARCH_PWR8) ++#if defined(linux) + __ppc_get_timebase(); ++#elif defined(__FreeBSD__) ++ uint64_t __tb; ++ __asm__ volatile ("mfspr %0, 268" : "=r" (__tb)); ++#endif + #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__) + /* Mainly, prevent the compiler from optimizing away delay loops */ + #ifdef _aarch64_