Date: Tue, 20 Apr 2021 05:09:11 GMT From: =?utf-8?B?TG/Dr2MgQmFydG9sZXR0aQ==?= <lbartoletti@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: b91ca3ff3626 - main - databases/postgresql*: Fix build on riscv64 Message-ID: <202104200509.13K59B1E082027@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by lbartoletti: URL: https://cgit.FreeBSD.org/ports/commit/?id=b91ca3ff3626dbb917aeb82243d140a50ad148b8 commit b91ca3ff3626dbb917aeb82243d140a50ad148b8 Author: Loïc Bartoletti <lbartoletti@FreeBSD.org> AuthorDate: 2021-04-20 04:54:15 +0000 Commit: Loïc Bartoletti <lbartoletti@FreeBSD.org> 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) */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104200509.13K59B1E082027>