From nobody Mon Feb 21 11:32:40 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 7D9AE19D24ED; Mon, 21 Feb 2022 11:32:40 +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 4K2Ksh2pN2z4s9F; Mon, 21 Feb 2022 11:32:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645443160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qUJ0Z0oj+ip9hffVozpUMEqnik/lwSbIXcKXBNBPZu8=; b=igbuQN9lA5XxfhPheMN+tSFgiuuxgl3Czf/Q9Q/pUGIdfvF1UyoBnS9vY7h5QHZ0XkqN1K pB/mNorkrH9PIda4JNkVIfyq4cZ+k38aqzpTgo3nlZKZSJLItZPAzKyZQkV5kNKQwpMVTh lKc5y5PgzucHf7ylqbcxHqiicquG9X06Kn1pRlYhD6ZFAeurj3F9zU23KvwH1I1oECLU3G sgKBa7pUZR6ekeS+McSkf/csWExoT3JvGq0CFVmqikdkxd+xFQouvnaAcfAsPcpWI00Kgi 9XUvg2lu8X04VXJ6dsJ0PG6Po/P4EXI5QuwFGXEJjb98JGAM35YbNOScd8UNJA== 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 4030A76C0; Mon, 21 Feb 2022 11:32:40 +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 21LBWePE017697; Mon, 21 Feb 2022 11:32:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21LBWeBF017696; Mon, 21 Feb 2022 11:32:40 GMT (envelope-from git) Date: Mon, 21 Feb 2022 11:32:40 GMT Message-Id: <202202211132.21LBWeBF017696@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: d9e5933d29e7 - main - databases/mariadb106-server: fix build on powerpc64le List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org 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: d9e5933d29e73b4aa810969823f1b8ab923d8ce5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645443160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qUJ0Z0oj+ip9hffVozpUMEqnik/lwSbIXcKXBNBPZu8=; b=baQgQwWa3DGXzJwZeM46Cwo8YzNODVlE1AxU+8PlUPsROV1e1Gawv114usU5q9OzUWpQlt jrbTaoQSqR4oIo+I7AS9stJfi644bvGvI6zmgtbnB46/5m4/I2Fx6qlI9bY6zQ/BB40Opi IRbAkl1SKZXu3juyfsw0olukETIXpDhNEOoHGW2KpMqnuIQx142SInktfm5QlmHZKb3vWw B7QmzdkE9volwXolHVrViQVivFxNkWkP0bmdz9B/p1QO6YS7lwtLNLJpJh6JLc4W4ua0w4 92XWr0KFBRRU8CtOXJtMRacFas4vsB9aOSDqri/rw/kxdEdgGDVxqEYFNYIQlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645443160; a=rsa-sha256; cv=none; b=St2u9hO4DAjW/9Q11AwUJtXa/Yimy2mPCB/9L35lhdBq2M6oukE/iYmwsMOenn3YN36x21 siw5etybmXWxOSU/eETs8wFShJ3KDlMj8UY0SPYgxCQdSUQHJq8rpnqVxbYZWeBmMXlFK0 ggciPVTyqFfAeopvcNHkY3obGFz8bNXRVXicxKAnB1IBd5r4bydQaeFQzzZgWbVonT6C7z auRc/d8GW0TEokt7hVgqGeoHAEc0Ddq3qhD6C0STf9jXmPeRXMK7PMa+yFqmlRTQmUQL1G EIkYThSIaFj3AYfResZVkUtGn32Fx4WSYpA9vvItKuaGddLfl1A+NV/MYSW/4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=d9e5933d29e73b4aa810969823f1b8ab923d8ce5 commit d9e5933d29e73b4aa810969823f1b8ab923d8ce5 Author: Piotr Kubaj AuthorDate: 2022-02-21 11:30:34 +0000 Commit: Piotr Kubaj CommitDate: 2022-02-21 11:30:34 +0000 databases/mariadb106-server: fix build on powerpc64le Same issue as earlier mariadb ports. --- .../files/patch-include_my__cpu.h | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/databases/mariadb106-server/files/patch-include_my__cpu.h b/databases/mariadb106-server/files/patch-include_my__cpu.h new file mode 100644 index 000000000000..e205cbfa05e2 --- /dev/null +++ b/databases/mariadb106-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_