postgresql: fix for atomic operations in aarch64

.. is needed also in the older version.

Version: 9.2.4-3
Resolves: #970661
This commit is contained in:
Pavel Raiskup 2013-06-13 10:33:54 +02:00
parent cac63b3ab0
commit 0415e338bc
2 changed files with 40 additions and 19 deletions

View File

@ -1,21 +1,37 @@
From: Tom Lane <tgl@sss.pgh.pa.us> diff --git a/postgresql-9.1.9/src/include/storage/s_lock.h b/postgresql-9.1.9/src/include/storage/s_lock.h
Date: Tue, 4 Jun 2013 19:42:02 +0000 (-0400) index 987fb9c..1ba718c 100644
Subject: Add ARM64 (aarch64) support to s_lock.h. --- a/postgresql-9.1.9/src/include/storage/s_lock.h
X-Git-Url: http://git.postgresql.org/gitweb/?p=postgresql.git;a=commitdiff_plain;h=612ecf311bf253cdb0c54252854c5298aa668203 +++ b/postgresql-9.1.9/src/include/storage/s_lock.h
@@ -296,6 +296,29 @@ tas(volatile slock_t *lock)
#endif /* __arm__ */
Add ARM64 (aarch64) support to s_lock.h.
Use the same gcc atomic functions as we do on newer ARM chips.
(Basically this is a copy and paste of the __arm__ code block,
but omitting the SWPB option since that definitely won't work.)
Back-patch to 9.2. The patch would work further back, but we'd also
need to update config.guess/config.sub in older branches to make them
build out-of-the-box, and there hasn't been demand for it.
Mark Salter
---
+/*
+ * On ARM64, we use __sync_lock_test_and_set(int *, int) if available.
+ */
+#if defined(__aarch64__) || defined(__aarch64)
+#ifdef HAVE_GCC_INT_ATOMICS
+#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_INT_ATOMICS */
+#endif /* __aarch64__ */
+
+
/* S/390 and S/390x Linux (32- and 64-bit zSeries) */
#if defined(__s390__) || defined(__s390x__)
#define HAS_TEST_AND_SET
diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
index d4a783f..29124b1 100644 index d4a783f..29124b1 100644
--- a/src/include/storage/s_lock.h --- a/src/include/storage/s_lock.h

View File

@ -337,7 +337,6 @@ benchmarks.
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1
%patch6 -p1 %patch6 -p1
%patch7 -p1 -b .atomic-aarch64
# We used to run autoconf here, but there's no longer any real need to, # We used to run autoconf here, but there's no longer any real need to,
# since Postgres ships with a reasonably modern configure script. # since Postgres ships with a reasonably modern configure script.
@ -357,6 +356,9 @@ cp -p config/config.guess postgresql-%{prevversion}/config/config.guess
cp -p config/config.sub postgresql-%{prevversion}/config/config.sub cp -p config/config.sub postgresql-%{prevversion}/config/config.sub
%endif %endif
# the %%{SOURCE3} must be unpacked before this patch is applied
%patch7 -p1 -b .atomic-aarch64
# remove .gitignore files to ensure none get into the RPMs (bug #642210) # remove .gitignore files to ensure none get into the RPMs (bug #642210)
find . -type f -name .gitignore | xargs rm find . -type f -name .gitignore | xargs rm
@ -1106,6 +1108,9 @@ fi
%endif %endif
%changelog %changelog
* Thu Jun 13 2013 Pavel Raiskup <praiskup@redhat.com> - 9.2.4-2
- add atomic operations support for aarch64 to preupgrade version also (#970661)
* Thu Jun 13 2013 Jan Stanek <jstanek@redhat.com> - 9.2.4-3 * Thu Jun 13 2013 Jan Stanek <jstanek@redhat.com> - 9.2.4-3
- added patch for manual pages (#948933) - added patch for manual pages (#948933)