From owner-dev-commits-ports-all@freebsd.org Tue Apr 20 05:09:11 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 EEADA5E4256; Tue, 20 Apr 2021 05:09:11 +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 4FPWtv5qBXz3mTF; Tue, 20 Apr 2021 05:09:11 +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 AFB944C94; Tue, 20 Apr 2021 05:09:11 +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 13K59Bls082028; Tue, 20 Apr 2021 05:09:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13K59B1E082027; Tue, 20 Apr 2021 05:09:11 GMT (envelope-from git) Date: Tue, 20 Apr 2021 05:09:11 GMT Message-Id: <202104200509.13K59B1E082027@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?B?TG/Dr2MgQmFydG9sZXR0aQ==?= Subject: git: b91ca3ff3626 - main - databases/postgresql*: Fix build on riscv64 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lbartoletti X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b91ca3ff3626dbb917aeb82243d140a50ad148b8 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: Tue, 20 Apr 2021 05:09:12 -0000 The branch main has been updated by lbartoletti: URL: https://cgit.FreeBSD.org/ports/commit/?id=b91ca3ff3626dbb917aeb82243d140a50ad148b8 commit b91ca3ff3626dbb917aeb82243d140a50ad148b8 Author: Loïc Bartoletti AuthorDate: 2021-04-20 04:54:15 +0000 Commit: Loïc Bartoletti CommitDate: 2021-04-20 04:56:53 +0000 databases/postgresql*: Fix build on riscv64 Reported by: tmunro Reviewed by: girgen --- .../files/patch-src_include_storage_s__lock.h | 20 ++++++++++++++++++++ .../files/patch-src_include_storage_s__lock.h | 20 ++++++++++++++++++++ .../files/patch-src_include_storage_s__lock.h | 20 ++++++++++++++++++++ .../files/patch-src_include_storage_s__lock.h | 20 ++++++++++++++++++++ 4 files changed, 80 insertions(+) diff --git a/databases/postgresql10-server/files/patch-src_include_storage_s__lock.h b/databases/postgresql10-server/files/patch-src_include_storage_s__lock.h new file mode 100644 index 000000000000..19c945a36126 --- /dev/null +++ b/databases/postgresql10-server/files/patch-src_include_storage_s__lock.h @@ -0,0 +1,20 @@ +--- src/include/storage/s_lock.h.orig 2021-04-15 09:05:25 UTC ++++ src/include/storage/s_lock.h +@@ -320,7 +320,7 @@ tas(volatile slock_t *lock) + * We use the int-width variant of the builtin because it works on more chips + * than other widths. + */ +-#if defined(__arm__) || defined(__arm) || defined(__aarch64__) || defined(__aarch64) ++#if defined(__arm__) || defined(__arm) || defined(__aarch64__) || defined(__aarch64) || defined(__riscv) + #ifdef HAVE_GCC__SYNC_INT32_TAS + #define HAS_TEST_AND_SET + +@@ -337,7 +337,7 @@ tas(volatile slock_t *lock) + #define S_UNLOCK(lock) __sync_lock_release(lock) + + #endif /* HAVE_GCC__SYNC_INT32_TAS */ +-#endif /* __arm__ || __arm || __aarch64__ || __aarch64 */ ++#endif /* __arm__ || __arm || __aarch64__ || __aarch64 || __riscv */ + + + /* S/390 and S/390x Linux (32- and 64-bit zSeries) */ diff --git a/databases/postgresql11-server/files/patch-src_include_storage_s__lock.h b/databases/postgresql11-server/files/patch-src_include_storage_s__lock.h new file mode 100644 index 000000000000..401a2a7337cb --- /dev/null +++ b/databases/postgresql11-server/files/patch-src_include_storage_s__lock.h @@ -0,0 +1,20 @@ +--- src/include/storage/s_lock.h.orig 2021-04-15 17:59:43 UTC ++++ src/include/storage/s_lock.h +@@ -320,7 +320,7 @@ tas(volatile slock_t *lock) + * We use the int-width variant of the builtin because it works on more chips + * than other widths. + */ +-#if defined(__arm__) || defined(__arm) || defined(__aarch64__) || defined(__aarch64) ++#if defined(__arm__) || defined(__arm) || defined(__aarch64__) || defined(__aarch64) || defined(__riscv) + #ifdef HAVE_GCC__SYNC_INT32_TAS + #define HAS_TEST_AND_SET + +@@ -337,7 +337,7 @@ tas(volatile slock_t *lock) + #define S_UNLOCK(lock) __sync_lock_release(lock) + + #endif /* HAVE_GCC__SYNC_INT32_TAS */ +-#endif /* __arm__ || __arm || __aarch64__ || __aarch64 */ ++#endif /* __arm__ || __arm || __aarch64__ || __aarch64 || __riscv */ + + + /* S/390 and S/390x Linux (32- and 64-bit zSeries) */ diff --git a/databases/postgresql12-server/files/patch-src_include_storage_s__lock.h b/databases/postgresql12-server/files/patch-src_include_storage_s__lock.h new file mode 100644 index 000000000000..19c945a36126 --- /dev/null +++ b/databases/postgresql12-server/files/patch-src_include_storage_s__lock.h @@ -0,0 +1,20 @@ +--- src/include/storage/s_lock.h.orig 2021-04-15 09:05:25 UTC ++++ src/include/storage/s_lock.h +@@ -320,7 +320,7 @@ tas(volatile slock_t *lock) + * We use the int-width variant of the builtin because it works on more chips + * than other widths. + */ +-#if defined(__arm__) || defined(__arm) || defined(__aarch64__) || defined(__aarch64) ++#if defined(__arm__) || defined(__arm) || defined(__aarch64__) || defined(__aarch64) || defined(__riscv) + #ifdef HAVE_GCC__SYNC_INT32_TAS + #define HAS_TEST_AND_SET + +@@ -337,7 +337,7 @@ tas(volatile slock_t *lock) + #define S_UNLOCK(lock) __sync_lock_release(lock) + + #endif /* HAVE_GCC__SYNC_INT32_TAS */ +-#endif /* __arm__ || __arm || __aarch64__ || __aarch64 */ ++#endif /* __arm__ || __arm || __aarch64__ || __aarch64 || __riscv */ + + + /* S/390 and S/390x Linux (32- and 64-bit zSeries) */ diff --git a/databases/postgresql13-server/files/patch-src_include_storage_s__lock.h b/databases/postgresql13-server/files/patch-src_include_storage_s__lock.h new file mode 100644 index 000000000000..19c945a36126 --- /dev/null +++ b/databases/postgresql13-server/files/patch-src_include_storage_s__lock.h @@ -0,0 +1,20 @@ +--- src/include/storage/s_lock.h.orig 2021-04-15 09:05:25 UTC ++++ src/include/storage/s_lock.h +@@ -320,7 +320,7 @@ tas(volatile slock_t *lock) + * We use the int-width variant of the builtin because it works on more chips + * than other widths. + */ +-#if defined(__arm__) || defined(__arm) || defined(__aarch64__) || defined(__aarch64) ++#if defined(__arm__) || defined(__arm) || defined(__aarch64__) || defined(__aarch64) || defined(__riscv) + #ifdef HAVE_GCC__SYNC_INT32_TAS + #define HAS_TEST_AND_SET + +@@ -337,7 +337,7 @@ tas(volatile slock_t *lock) + #define S_UNLOCK(lock) __sync_lock_release(lock) + + #endif /* HAVE_GCC__SYNC_INT32_TAS */ +-#endif /* __arm__ || __arm || __aarch64__ || __aarch64 */ ++#endif /* __arm__ || __arm || __aarch64__ || __aarch64 || __riscv */ + + + /* S/390 and S/390x Linux (32- and 64-bit zSeries) */