diff --git a/src/backend/storage/lmgr/s_lock.c b/src/backend/storage/lmgr/s_lock.c
index 8434e8d6c8f34cb049f00dcd95cc3d3bf799b3fb..df1c5a53e96eae211ea87af8be8ebecc227edd8d 100644
--- 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
index 467c74382c685a2087a57b3c8d2815e6c89e6a73..2b19bf9482b2ebe8a383826a9e93c8019daccc3b 100644
--- 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
index 5c5b77ede964d59d4f3901934e652edcfdb3978a..ae36a5cd4e2cacc8f62dee879a10b0a26d81379b 100644
--- 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
index 5c5b77ede964d59d4f3901934e652edcfdb3978a..ae36a5cd4e2cacc8f62dee879a10b0a26d81379b 100644
--- 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
index 5c5b77ede964d59d4f3901934e652edcfdb3978a..ae36a5cd4e2cacc8f62dee879a10b0a26d81379b 100644
--- 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
index b4f1e30605709c1913b208fc32ade887c4802806..861f5ada2fed80c7d8006a8da5fdc8a2213e1fce 100644
--- 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
index b81fbc47b193d6e29f1e7c50362f95bd7798b86f..83dd6cc03f91a0334817d36977a19f728a4232be 100644
--- 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
index 734c2ef0fa7cfb5c22c5048a6e33a12968ff289c..b4818fa20c48fbec57d557f4d943f5b0b569bbd8 100644
--- 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
index a6d6006b0811be4f30ccb37ca734193323efc642..2456d573b5b7b5e6fb6270d6be7af838749b4e1c 100644
--- 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__) */