postgresql: Fix build on riscv
PATCH 1/1 postgresql: Fix build on riscv
From: Khem Raj <[email protected]>
Remove duplicate code
Signed-off-by Khem Raj <[email protected]>
(cherry picked from commit aa22894fa352986a62c4530ad8facd8868b2e535)
[Fixup for Dunfell context]
Signed-off-by Armin Kuster <[email protected]>
--- .../postgresql/files/remove_duplicate.patch | 38 +++++++++++++++++++ .../recipes-dbs/postgresql/postgresql_12.9.bb | 1 + 2 files changed, 39 insertions(+) create mode 100644 meta-oe/recipes-dbs/postgresql/files/remove_duplicate.patch
meta-oe/recipes-dbs/postgresql/files/remove_duplicate.patch new file +38 -0
@@ -0,0 +1,38 @@ +Remove duplicate code for riscv + +Upstream-Status: Pending +Signed-off-by: Khem Raj <[email protected]> + +--- a/src/include/storage/s_lock.h ++++ b/src/include/storage/s_lock.h +@@ -341,30 +341,6 @@ tas(volatile slock_t *lock) + #endif /* HAVE_GCC__SYNC_INT32_TAS */ + #endif /* __arm__ || __arm || __aarch64__ || __aarch64 || __riscv */ + +- +-/* +- * RISC-V likewise uses __sync_lock_test_and_set(int *, int) if available. +- */ +-#if defined(__riscv) +-#ifdef HAVE_GCC__SYNC_INT32_TAS +-#define HAS_TEST_AND_SET +- +-#define TAS(lock) tas(lock) +- +-typedef int slock_t; +- +-static __inline__ int +-tas(volatile slock_t *lock) +-{ +- return __sync_lock_test_and_set(lock, 1); +-} +- +-#define S_UNLOCK(lock) __sync_lock_release(lock) +- +-#endif /* HAVE_GCC__SYNC_INT32_TAS */ +-#endif /* __riscv */ +- +- + /* S/390 and S/390x Linux (32- and 64-bit zSeries) */ + #if defined(__s390__) || defined(__s390x__) + #define HAS_TEST_AND_SET
meta-oe/recipes-dbs/postgresql/postgresql_12.9.bb +1 -0
@@ -6,6 +6,7 @@ SRC_URI += "\ file://not-check-libperl.patch \ file://0001-Add-support-for-RISC-V.patch \ file://0001-Improve-reproducibility.patch \ + file://remove_duplicate.patch \ " SRC_URI[sha256sum] = "89fda2de33ed04a98548e43f3ee5f15b882be17505d631fe0dd1a540a2b56dce"
Signature · 1 line
2.25.1