diff mbox series

[meta-oe,hardknott] postgresql: Fix build on riscv

Message ID 20220420005806.1297147-1-akuster808@gmail.com
State New
Headers show
Series [meta-oe,hardknott] postgresql: Fix build on riscv | expand

Commit Message

akuster808 April 20, 2022, 12:58 a.m. UTC 
From: Khem Raj <raj.khem@gmail.com>

Remove duplicate code

Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit aa22894fa352986a62c4530ad8facd8868b2e535)
[Fixup for Hardknott context]
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../postgresql/files/remove_duplicate.patch   | 38 +++++++++++++++++++
 .../recipes-dbs/postgresql/postgresql_13.5.bb |  1 +
 2 files changed, 39 insertions(+)
 create mode 100644 meta-oe/recipes-dbs/postgresql/files/remove_duplicate.patch
diff mbox series

Patch

diff --git a/meta-oe/recipes-dbs/postgresql/files/remove_duplicate.patch b/meta-oe/recipes-dbs/postgresql/files/remove_duplicate.patch
new file mode 100644
index 0000000000..92a3dcc710
--- /dev/null
+++ b/meta-oe/recipes-dbs/postgresql/files/remove_duplicate.patch
@@ -0,0 +1,38 @@ 
+Remove duplicate code for riscv
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+--- 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
diff --git a/meta-oe/recipes-dbs/postgresql/postgresql_13.5.bb b/meta-oe/recipes-dbs/postgresql/postgresql_13.5.bb
index 81193e30e5..1588c30282 100644
--- a/meta-oe/recipes-dbs/postgresql/postgresql_13.5.bb
+++ b/meta-oe/recipes-dbs/postgresql/postgresql_13.5.bb
@@ -7,6 +7,7 @@  SRC_URI += "\
    file://0001-Add-support-for-RISC-V.patch \
    file://0001-Improve-reproducibility.patch \
    file://0001-configure.in-bypass-autoconf-2.69-version-check.patch \
+   file://remove_duplicate.patch \
 "
 
 SRC_URI[sha256sum] = "9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3"