summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Eisentraut2001-09-24 20:10:44 +0000
committerPeter Eisentraut2001-09-24 20:10:44 +0000
commit8401f06efd814f3e1eaf5fbe2068594ab919aeb7 (patch)
tree06a1e9eb1b373c99f46c6bbff49e1f97476f69bf
parent2df4087a702d6828d3824fcc96d27b2fdd2b958c (diff)
Treat __s390x__ the same as __s390__. (taken from RPM patch set)
-rw-r--r--src/include/port/linux.h2
-rw-r--r--src/include/storage/s_lock.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/include/port/linux.h b/src/include/port/linux.h
index 2dc8c45867c..c5d58489ba1 100644
--- a/src/include/port/linux.h
+++ b/src/include/port/linux.h
@@ -33,7 +33,7 @@ typedef unsigned int slock_t;
#define HAS_TEST_AND_SET
-#elif defined(__s390__)
+#elif defined(__s390__) || defined(__s390x__)
typedef unsigned int slock_t;
#define HAS_TEST_AND_SET
diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
index 86fc8e2c869..2188dcd9f20 100644
--- a/src/include/storage/s_lock.h
+++ b/src/include/storage/s_lock.h
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.93 2001/05/24 15:53:34 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.94 2001/09/24 20:10:44 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -162,7 +162,7 @@ tas(volatile slock_t *lock)
#endif /* __arm__ */
-#if defined(__s390__)
+#if defined(__s390__) || defined(__s390x__)
/*
* S/390 Linux
*/