Added hppa implementation of test and set.

4 files changed, 71 insertions, 12 deletions

diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index 3112a7210af0..6186a3009538 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/postgresql
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.80 2004/01/07 00:01:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.81 2004/01/15 14:25:50 gmsoft Exp $
+
+  15 Jan 2004; root <root@gentoo.org> postgresql-7.4.1-r1.ebuild,
+  files/postgresql-7.4.1-hppa-testandset.patch:
+  Added hppa implementation of test and set.
 
   06 Jan 2004; <agriffis@gentoo.org> postgresql-7.3.5.ebuild,
   postgresql-7.4.1-r1.ebuild:
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index d65bd8e8119a..1d881be915d8 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -1,21 +1,22 @@
-MD5 60067f44e9580717c6f75d7d8265cdc0 ChangeLog 13721
+MD5 320e8c61313986c1dee5c0601df18c2b ChangeLog 13879
 MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
-MD5 e1188a1c01977a25f5c3f7e2f415129c postgresql-7.3.5.ebuild 8508
 MD5 7242b7bebfa1e8d11384bfb997ecda5b postgresql-7.3.4-r1.ebuild 8090
+MD5 e1188a1c01977a25f5c3f7e2f415129c postgresql-7.3.5.ebuild 8508
 MD5 105fabcd8accf9c0f533da136c767aa9 postgresql-7.4.1.ebuild 8276
-MD5 3fec7ff1a77fab413ddb56ed6f8c9e71 postgresql-7.4.1-r1.ebuild 8459
-MD5 7b4771ec5dd5bcb3f47495cca2fb3482 files/digest-postgresql-7.3.5 288
-MD5 3f7fdc0edd471b911d75caf118d6b7e2 files/digest-postgresql-7.4.1 288
-MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-7.4.1 302
-MD5 0c7826b3fcbba5971ff5d5a3f3c4a8ba files/pg_autovacuum.init-7.4.1 1101
+MD5 418db21605309d5c0322b65bac9cf8c7 postgresql-7.4.1-r1.ebuild 8531
 MD5 de93df43e2bc632828c53eac67680692 files/digest-postgresql-7.3.4-r1 135
-MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.1 390
-MD5 5a0b8275ed1af0691ba041b5074d5590 files/postgresql-7.4.1-gentoo.patch 631
 MD5 fb171f76854a5249b2be2773b4336a4a files/postgresql-7.4-gentoo.patch 623
 MD5 2b0c84d2c26622573d4e2b7e0518fdad files/postgresql.conf 375
 MD5 4e148f930c09bddec23d157f9c446020 files/postgresql.init 937
 MD5 b0b26f2f466f14fcab3085e2ce726413 files/postgresql.init-7.3.4 1138
-MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.1-vacuum-delay.patch 8918
+MD5 7b4771ec5dd5bcb3f47495cca2fb3482 files/digest-postgresql-7.3.5 288
 MD5 b0b26f2f466f14fcab3085e2ce726413 files/postgresql.init-7.3.5 1138
+MD5 3f7fdc0edd471b911d75caf118d6b7e2 files/digest-postgresql-7.4.1 288
+MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-7.4.1 302
+MD5 0c7826b3fcbba5971ff5d5a3f3c4a8ba files/pg_autovacuum.init-7.4.1 1101
+MD5 5a0b8275ed1af0691ba041b5074d5590 files/postgresql-7.4.1-gentoo.patch 631
+MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.1-vacuum-delay.patch 8918
+MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.1 390
 MD5 fe2e030e20b8ae2c4f0169de5d42c0a7 files/postgresql.init-7.4.1 1145
 MD5 3f7fdc0edd471b911d75caf118d6b7e2 files/digest-postgresql-7.4.1-r1 288
+MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.1-hppa-testandset.patch 1596
diff --git a/dev-db/postgresql/files/postgresql-7.4.1-hppa-testandset.patch b/dev-db/postgresql/files/postgresql-7.4.1-hppa-testandset.patch
new file mode 100644
index 000000000000..010a42a4088e
--- /dev/null
+++ b/dev-db/postgresql/files/postgresql-7.4.1-hppa-testandset.patch
@@ -0,0 +1,52 @@
+diff -urN postgresql-7.4.1.orig/src/include/port/linux.h postgresql-7.4.1/src/include/port/linux.h
+--- postgresql-7.4.1.orig/src/include/port/linux.h	2003-10-26 01:41:10.000000000 +0000
++++ postgresql-7.4.1/src/include/port/linux.h	2004-01-09 20:22:50.000000000 +0000
+@@ -3,6 +3,11 @@
+ 
+ #define HAS_TEST_AND_SET
+ 
++#elif defined(__hppa__)
++typedef struct { int sema[4]; } slock_t;
++
++#define HAS_TEST_AND_SET
++
+ #elif defined(__sparc__)
+ typedef unsigned char slock_t;
+ 
+diff -urN postgresql-7.4.1.orig/src/include/storage/s_lock.h postgresql-7.4.1/src/include/storage/s_lock.h
+--- postgresql-7.4.1.orig/src/include/storage/s_lock.h	2003-11-04 09:43:56.000000000 +0000
++++ postgresql-7.4.1/src/include/storage/s_lock.h	2004-01-09 20:12:15.000000000 +0000
+@@ -112,6 +112,33 @@
+ 
+ #endif	 /* __i386__ || __x86_64__ */
+ 
++#if defined(__hppa__) || defined(__hppa)
++#define TAS(lock) tas(lock)
++
++#define __ldcw(a) ({ \
++	unsigned int __ret;						\
++	__asm__ __volatile__("ldcw 0(%2),%0"				\
++				: "=r" (__ret), "=m" (*(a)) : "r" (a));	\
++	__ret;								\
++})
++
++#define __PA_LDCW_ALIGNMENT 16
++#define __ldcw_align(a) ({ \
++	volatile unsigned int __ret = (unsigned int) a;					\
++	if ((__ret & ~(__PA_LDCW_ALIGNMENT - 1)) < (unsigned int) a)			\
++		__ret = (__ret & ~(__PA_LDCW_ALIGNMENT - 1)) + __PA_LDCW_ALIGNMENT;	\
++	(unsigned int *) __ret;								\
++})
++
++static __inline__ int
++tas(volatile slock_t *lock)
++{
++	volatile unsigned int *a = __ldcw_align (lock);
++	return (__ldcw(a) == 0);
++}
++
++#endif	/* __hppa__ || __hppa */
++
+ 
+ /* Intel Itanium */
+ #if defined(__ia64__) || defined(__ia64)
diff --git a/dev-db/postgresql/postgresql-7.4.1-r1.ebuild b/dev-db/postgresql/postgresql-7.4.1-r1.ebuild
index a550de8afd26..191ea5b8f291 100644
--- a/dev-db/postgresql/postgresql-7.4.1-r1.ebuild
+++ b/dev-db/postgresql/postgresql-7.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.1-r1.ebuild,v 1.3 2004/01/07 00:01:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.1-r1.ebuild,v 1.4 2004/01/15 14:25:50 gmsoft Exp $
 
 DESCRIPTION="sophisticated Object-Relational DBMS."
 
@@ -82,6 +82,8 @@ src_unpack() {
 		cd ${S} || die
 		epatch ${FILESDIR}/${P}-vacuum-delay.patch
 	fi
+
+	[ "${ARCH}" = "hppa" ] && epatch ${FILESDIR}/${P}-hppa-testandset.patch
 }
 
 src_compile() {