Commit 887b5a7b authored by Bruce Momjian's avatar Bruce Momjian

Remove NEED_I386_TAS_ASM and just test for compiler defines.

parent f66b0ff0
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * 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 ...@@ -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__ */ #endif /* not __GNUC__ */
......
#if defined(__i386__) || defined(__x86_64__) #if defined(__i386__) || defined(__x86_64__)
#define NEED_I386_TAS_ASM
typedef unsigned char slock_t; typedef unsigned char slock_t;
#endif #endif
#if defined(__ia64) #if defined(__ia64)
......
#if defined(__i386__) || defined(__x86_64__) #if defined(__i386__) || defined(__x86_64__)
#define NEED_I386_TAS_ASM
#define HAS_TEST_AND_SET #define HAS_TEST_AND_SET
typedef unsigned char slock_t; typedef unsigned char slock_t;
#endif #endif
......
#if defined(__i386__) || defined(__x86_64__) #if defined(__i386__) || defined(__x86_64__)
#define NEED_I386_TAS_ASM
#define HAS_TEST_AND_SET #define HAS_TEST_AND_SET
typedef unsigned char slock_t; typedef unsigned char slock_t;
#endif #endif
......
#if defined(__i386__) || defined(__x86_64__) #if defined(__i386__) || defined(__x86_64__)
#define NEED_I386_TAS_ASM
#define HAS_TEST_AND_SET #define HAS_TEST_AND_SET
typedef unsigned char slock_t; typedef unsigned char slock_t;
#endif #endif
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
#define SCO_ACCEPT_BUG #define SCO_ACCEPT_BUG
#define HAS_TEST_AND_SET #define HAS_TEST_AND_SET
#define NEED_I386_TAS_ASM
#define USE_UNIVEL_CC #define USE_UNIVEL_CC
......
#define HAS_TEST_AND_SET #define HAS_TEST_AND_SET
#define NEED_I386_TAS_ASM
/*************************************** /***************************************
* Define this if you are compiling with * Define this if you are compiling with
......
#define HAS_TEST_AND_SET #define HAS_TEST_AND_SET
#define NEED_I386_TAS_ASM
/* see src/backend/libpq/pqcomm.c */ /* see src/backend/libpq/pqcomm.c */
#define SCO_ACCEPT_BUG #define SCO_ACCEPT_BUG
......
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * 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) ...@@ -345,7 +345,7 @@ tas(volatile slock_t *lock)
* All non-gcc inlines * All non-gcc inlines
*/ */
#if defined(NEED_I386_TAS_ASM) && defined(USE_UNIVEL_CC) #if defined(USE_UNIVEL_CC)
#define TAS(lock) tas(lock) #define TAS(lock) tas(lock)
asm int asm int
...@@ -361,7 +361,7 @@ tas(volatile slock_t *s_lock) ...@@ -361,7 +361,7 @@ tas(volatile slock_t *s_lock)
popl %ebx popl %ebx
} }
#endif /* defined(NEED_I386_TAS_ASM) && defined(USE_UNIVEL_CC) */ #endif /* defined(USE_UNIVEL_CC) */
#endif /* defined(__GNUC__) */ #endif /* defined(__GNUC__) */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment