Remove NEED_I386_TAS_ASM and just test for compiler defines.

bmomjian · bmomjian · commit 887b5a7be0ef · 2003-12-23T00:32:06.000Z
diff --git a/src/backend/storage/lmgr/s_lock.c b/src/backend/storage/lmgr/s_lock.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/lmgr/s_lock.c,v 1.18 2003/12/22 23:39:53 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/lmgr/s_lock.c,v 1.19 2003/12/23 00:32:06 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -232,9 +232,6 @@ tas_dummy()						/* really means: extern int tas(slock_t
 
 
 
-#if defined(NEED_I386_TAS_ASM)
-/* non gcc i386 based things */
-#endif   /* NEED_I386_TAS_ASM */
 #endif   /* not __GNUC__ */
 
 
diff --git a/src/include/port/bsdi.h b/src/include/port/bsdi.h
@@ -1,5 +1,4 @@
 #if defined(__i386__) || defined(__x86_64__)
-#define NEED_I386_TAS_ASM
 typedef unsigned char slock_t;
 #endif
 #if defined(__ia64)
diff --git a/src/include/port/freebsd.h b/src/include/port/freebsd.h
@@ -1,5 +1,4 @@
 #if defined(__i386__) || defined(__x86_64__)
-#define NEED_I386_TAS_ASM
 #define HAS_TEST_AND_SET
 typedef unsigned char slock_t;
 #endif
diff --git a/src/include/port/netbsd.h b/src/include/port/netbsd.h
@@ -1,5 +1,4 @@
 #if defined(__i386__) || defined(__x86_64__)
-#define NEED_I386_TAS_ASM
 #define HAS_TEST_AND_SET
 typedef unsigned char slock_t;
 #endif
diff --git a/src/include/port/openbsd.h b/src/include/port/openbsd.h
@@ -1,5 +1,4 @@
 #if defined(__i386__) || defined(__x86_64__)
-#define NEED_I386_TAS_ASM
 #define HAS_TEST_AND_SET
 typedef unsigned char slock_t;
 #endif
diff --git a/src/include/port/sco.h b/src/include/port/sco.h
@@ -2,7 +2,6 @@
 #define SCO_ACCEPT_BUG
 
 #define HAS_TEST_AND_SET
-#define NEED_I386_TAS_ASM
 
 #define USE_UNIVEL_CC
 
diff --git a/src/include/port/univel.h b/src/include/port/univel.h
@@ -1,5 +1,4 @@
 #define HAS_TEST_AND_SET
-#define NEED_I386_TAS_ASM
 
 /***************************************
  * Define this if you are compiling with
diff --git a/src/include/port/unixware.h b/src/include/port/unixware.h
@@ -1,5 +1,4 @@
 #define HAS_TEST_AND_SET
-#define NEED_I386_TAS_ASM
 
 /* see src/backend/libpq/pqcomm.c */
 #define SCO_ACCEPT_BUG
diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
@@ -63,7 +63,7 @@
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- *	  $PostgreSQL: pgsql/src/include/storage/s_lock.h,v 1.118 2003/12/22 23:36:38 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/include/storage/s_lock.h,v 1.119 2003/12/23 00:32:06 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -345,7 +345,7 @@ tas(volatile slock_t *lock)
  * All non-gcc inlines
  */
 
-#if defined(NEED_I386_TAS_ASM) && defined(USE_UNIVEL_CC)
+#if defined(USE_UNIVEL_CC)
 #define TAS(lock)	tas(lock)
 
 asm int
@@ -361,7 +361,7 @@ tas(volatile slock_t *s_lock)
 	popl %ebx
 }
 
-#endif	 /* defined(NEED_I386_TAS_ASM) && defined(USE_UNIVEL_CC) */
+#endif	 /* defined(USE_UNIVEL_CC) */
 
 #endif	 /* defined(__GNUC__) */
 

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`*`
`11`	`11`	`* IDENTIFICATION`
`12`		`- * $PostgreSQL: pgsql/src/backend/storage/lmgr/s_lock.c,v 1.18 2003/12/22 23:39:53 momjian Exp $`
	`12`	`+ * $PostgreSQL: pgsql/src/backend/storage/lmgr/s_lock.c,v 1.19 2003/12/23 00:32:06 momjian Exp $`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`15`	`15`	`*/`
`@@ -232,9 +232,6 @@ tas_dummy() /* really means: extern int tas(slock_t`
`232`	`232`
`233`	`233`
`234`	`234`
`235`		`-#if defined(NEED_I386_TAS_ASM)`
`236`		`-/* non gcc i386 based things */`
`237`		`-#endif /* NEED_I386_TAS_ASM */`
`238`	`235`	`#endif /* not __GNUC__ */`
`239`	`236`
`240`	`237`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#if defined(__i386__) \|\| defined(__x86_64__)`
`2`		`-#define NEED_I386_TAS_ASM`
`3`	`2`	`typedef unsigned char slock_t;`
`4`	`3`	`#endif`
`5`	`4`	`#if defined(__ia64)`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#define HAS_TEST_AND_SET`
`2`		`-#define NEED_I386_TAS_ASM`
`3`	`2`
`4`	`3`	`/***************************************`
`5`	`4`	`* Define this if you are compiling with`