From 050371fccdaeac8fa426c8e95aedf4edb541e829 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Tue, 13 Jul 1999 20:12:51 +0000
Subject: [PATCH] More cpu cleanups, only for 6.6.

---
 src/backend/main/main.c             |  8 ++++----
 src/backend/storage/buffer/s_lock.c |  6 +++---
 src/backend/utils/adt/float.c       |  4 ++--
 src/include/port/bsd.h              | 15 ++++++++-------
 src/include/port/bsdi.h             |  2 ++
 src/include/port/freebsd.h          |  1 +
 src/include/port/linux.h            | 12 ++++++------
 src/include/port/univel.h           |  1 +
 src/include/storage/s_lock.h        | 10 +++++-----
 9 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/src/backend/main/main.c b/src/backend/main/main.c
index dc16dd73be..25982e5fa4 100644
--- a/src/backend/main/main.c
+++ b/src/backend/main/main.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.23 1999/02/13 23:15:51 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.24 1999/07/13 20:12:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,7 +15,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#if defined(__alpha) && !defined(linux)
+#if defined(__alpha__) && !defined(linux)
 #include <sys/sysinfo.h>
 #include <machine/hal_sysinfo.h>
 #define ASSEMBLER
@@ -41,7 +41,7 @@ main(int argc, char *argv[])
 {
 	int			len;
 
-#if defined(__alpha)
+#if defined(__alpha__)
 #ifdef NOFIXADE
 	int			buffer[] = {SSIN_UACPROC, UAC_SIGBUS};
 
@@ -69,7 +69,7 @@ main(int argc, char *argv[])
 	syscall(SYS_sysmips, MIPS_FIXADE, 0, NULL, NULL, NULL);
 #endif
 
-#if defined(__alpha)
+#if defined(__alpha__)
 	if (setsysinfo(SSI_NVPAIRS, buffer, 1, (caddr_t) NULL,
 				   (unsigned long) NULL) < 0)
 		elog(NOTICE, "setsysinfo failed: %d\n", errno);
diff --git a/src/backend/storage/buffer/s_lock.c b/src/backend/storage/buffer/s_lock.c
index cf25e7e06c..0d02a1f684 100644
--- a/src/backend/storage/buffer/s_lock.c
+++ b/src/backend/storage/buffer/s_lock.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/Attic/s_lock.c,v 1.21 1999/06/06 20:19:35 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/Attic/s_lock.c,v 1.22 1999/07/13 20:12:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -143,7 +143,7 @@ success:			\n\
 
 #endif	 /* __powerpc__ */
 
-#if defined(__mips)
+#if defined(__mips__)
 static void
 tas_dummy()
 {
@@ -165,7 +165,7 @@ fail:				\n\
 	");
 }
 
-#endif	 /* __mips */
+#endif	 /* __mips__ */
 
 #else							/* defined(__GNUC__) */
 /***************************************************************************
diff --git a/src/backend/utils/adt/float.c b/src/backend/utils/adt/float.c
index 5f2a4f1523..55c9da6419 100644
--- a/src/backend/utils/adt/float.c
+++ b/src/backend/utils/adt/float.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.42 1999/05/25 16:12:02 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.43 1999/07/13 20:12:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -134,7 +134,7 @@ extern double rint(double x);
  * until the distributions are updated.
  *								--djm 12/16/96
  */
-#if ( defined(linux) && defined(__alpha) ) && !defined(UNSAFE_FLOATS)
+#if ( defined(linux) && defined(__alpha__) ) && !defined(UNSAFE_FLOATS)
 #define UNSAFE_FLOATS
 #endif
 
diff --git a/src/include/port/bsd.h b/src/include/port/bsd.h
index 9b8b0b6542..c3a6adb953 100644
--- a/src/include/port/bsd.h
+++ b/src/include/port/bsd.h
@@ -28,15 +28,16 @@
 #define HAS_TEST_AND_SET
 #endif
 
-#if defined(__powerpc__)
-#define HAS_TEST_AND_SET
-typedef unsigned int slock_t;
-
-#endif
 #if defined(__mips__)
 /* #	undef HAS_TEST_AND_SET */
 #endif
-#if !defined(__powerpc__)
-typedef unsigned char slock_t;
 
+#if defined(__powerpc__)
+#define HAS_TEST_AND_SET
+#endif
+
+#if defined(__powerpc__)
+typedef unsigned int slock_t;
+#else
+typedef unsigned char slock_t;
 #endif
diff --git a/src/include/port/bsdi.h b/src/include/port/bsdi.h
index cef69b8dc5..bb6cbb801e 100644
--- a/src/include/port/bsdi.h
+++ b/src/include/port/bsdi.h
@@ -4,6 +4,8 @@
 #if defined(__sparc__)
 #define NEED_SPARC_TAS_ASM
 #endif
+
 #define USE_POSIX_TIME
 #define HAS_TEST_AND_SET
+
 typedef unsigned char slock_t;
diff --git a/src/include/port/freebsd.h b/src/include/port/freebsd.h
index 5e3af51cbc..162ff5acfd 100644
--- a/src/include/port/freebsd.h
+++ b/src/include/port/freebsd.h
@@ -27,4 +27,5 @@
 #if defined(__mips__)
 /* #	undef HAS_TEST_AND_SET */
 #endif
+
 typedef unsigned char slock_t;
diff --git a/src/include/port/linux.h b/src/include/port/linux.h
index da57b2b9a3..eed59333e0 100644
--- a/src/include/port/linux.h
+++ b/src/include/port/linux.h
@@ -8,18 +8,18 @@
 #define USE_POSIX_TIME
 #define HAS_TEST_AND_SET
 
-#if defined(__powerpc__)
+#if if defined(__i386__)
+typedef unsigned char slock_t;
+
+#elif defined(__powerpc__)
 typedef unsigned int slock_t;
 
-#elif defined(__alpha)
+#elif defined(__alpha__)
 typedef long int slock_t;
 
-#elif defined(__mips)
+#elif defined(__mips__)
 typedef unsigned int slock_t;
 
-#else							/* i386 probably */
-typedef unsigned char slock_t;
-
 #endif
 
 #if (__GLIBC__ >= 2)
diff --git a/src/include/port/univel.h b/src/include/port/univel.h
index e8c066f7c5..91ff2c6b36 100644
--- a/src/include/port/univel.h
+++ b/src/include/port/univel.h
@@ -4,6 +4,7 @@
 
 #define HAS_TEST_AND_SET
 #define NEED_I386_TAS_ASM
+
 /***************************************
  * Define this if you are compiling with
  * the native UNIXWARE C compiler.
diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
index 85561a60da..3125d822ec 100644
--- a/src/include/storage/s_lock.h
+++ b/src/include/storage/s_lock.h
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.62 1999/07/13 20:00:36 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.63 1999/07/13 20:12:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -78,7 +78,7 @@ extern void s_lock_sleep(unsigned spin);
  * All the gcc inlines
  */
 
-#if defined(__alpha)
+#if defined(__alpha__)
 #define TAS(lock) tas(lock)
 #define S_UNLOCK(lock) { __asm__("mb"); *(lock) = 0; }
 
@@ -104,7 +104,7 @@ __asm__("    ldq   $0, %0              \n\
 	return (int) _res;
 }
 
-#endif	 /* __alpha */
+#endif	 /* __alpha__ */
 
 
 
@@ -226,7 +226,7 @@ tas(volatile slock_t *lock)
  * All non gcc
  */
 
-#if defined(__alpha)
+#if defined(__alpha__)
 /*
  * OSF/1 (Alpha AXP)
  *
@@ -237,7 +237,7 @@ tas(volatile slock_t *lock)
 #define S_UNLOCK(lock)	msem_unlock((lock), 0)
 #define S_INIT_LOCK(lock)	msem_init((lock), MSEM_UNLOCKED)
 #define S_LOCK_FREE(lock)	(!(lock)->msem_state)
-#endif	 /* __alpha */
+#endif	 /* __alpha__ */