Remove NEED_I386_TAS_ASM and instead just test for the compiler defines.

--
Bruce Momjian | http://candle.pha.pa.us
pgman (AT) candle (DOT) pha.pa.us | (610) 359-1001
+ If your life is a hard drive, | 13 Roberts Road
+ Christ can be your backup. | Newtown Square, Pennsylvania 19073

Index: src/backend/storage/lmgr/s_lock.c
================================================== =================
RCS file: /cvsroot/pgsql-server/src/backend/storage/lmgr/s_lock.c,v
retrieving revision 1.18
diff -c -c -r1.18 s_lock.c
*** src/backend/storage/lmgr/s_lock.c 22 Dec 2003 23:39:53 -0000 1.18
--- src/backend/storage/lmgr/s_lock.c 23 Dec 2003 00:31:00 -0000
***************
*** 232,240 ****



- #if defined(NEED_I386_TAS_ASM)
- /* non gcc i386 based things */
- #endif /* NEED_I386_TAS_ASM */
#endif /* not __GNUC__ */


--- 232,237 ----
Index: src/include/port/bsdi.h
================================================== =================
RCS file: /cvsroot/pgsql-server/src/include/port/bsdi.h,v
retrieving revision 1.10
diff -c -c -r1.10 bsdi.h
*** src/include/port/bsdi.h 22 Dec 2003 23:39:53 -0000 1.10
--- src/include/port/bsdi.h 23 Dec 2003 00:31:00 -0000
***************
*** 1,5 ****
#if defined(__i386__) || defined(__x86_64__)
- #define NEED_I386_TAS_ASM
typedef unsigned char slock_t;
#endif
#if defined(__ia64)
--- 1,4 ----
Index: src/include/port/freebsd.h
================================================== =================
RCS file: /cvsroot/pgsql-server/src/include/port/freebsd.h,v
retrieving revision 1.12
diff -c -c -r1.12 freebsd.h
*** src/include/port/freebsd.h 22 Dec 2003 23:39:53 -0000 1.12
--- src/include/port/freebsd.h 23 Dec 2003 00:31:00 -0000
***************
*** 1,5 ****
#if defined(__i386__) || defined(__x86_64__)
- #define NEED_I386_TAS_ASM
#define HAS_TEST_AND_SET
typedef unsigned char slock_t;
#endif
--- 1,4 ----
Index: src/include/port/netbsd.h
================================================== =================
RCS file: /cvsroot/pgsql-server/src/include/port/netbsd.h,v
retrieving revision 1.11
diff -c -c -r1.11 netbsd.h
*** src/include/port/netbsd.h 22 Dec 2003 23:39:53 -0000 1.11
--- src/include/port/netbsd.h 23 Dec 2003 00:31:00 -0000
***************
*** 1,5 ****
#if defined(__i386__) || defined(__x86_64__)
- #define NEED_I386_TAS_ASM
#define HAS_TEST_AND_SET
typedef unsigned char slock_t;
#endif
--- 1,4 ----
Index: src/include/port/openbsd.h
================================================== =================
RCS file: /cvsroot/pgsql-server/src/include/port/openbsd.h,v
retrieving revision 1.10
diff -c -c -r1.10 openbsd.h
*** src/include/port/openbsd.h 22 Dec 2003 23:39:53 -0000 1.10
--- src/include/port/openbsd.h 23 Dec 2003 00:31:00 -0000
***************
*** 1,5 ****
#if defined(__i386__) || defined(__x86_64__)
- #define NEED_I386_TAS_ASM
#define HAS_TEST_AND_SET
typedef unsigned char slock_t;
#endif
--- 1,4 ----
Index: src/include/port/sco.h
================================================== =================
RCS file: /cvsroot/pgsql-server/src/include/port/sco.h,v
retrieving revision 1.14
diff -c -c -r1.14 sco.h
*** src/include/port/sco.h 12 Sep 2003 15:49:34 -0000 1.14
--- src/include/port/sco.h 23 Dec 2003 00:31:00 -0000
***************
*** 2,8 ****
#define SCO_ACCEPT_BUG

#define HAS_TEST_AND_SET
- #define NEED_I386_TAS_ASM

#define USE_UNIVEL_CC

--- 2,7 ----
Index: src/include/port/univel.h
================================================== =================
RCS file: /cvsroot/pgsql-server/src/include/port/univel.h,v
retrieving revision 1.18
diff -c -c -r1.18 univel.h
*** src/include/port/univel.h 12 Sep 2003 15:49:34 -0000 1.18
--- src/include/port/univel.h 23 Dec 2003 00:31:00 -0000
***************
*** 1,5 ****
#define HAS_TEST_AND_SET
- #define NEED_I386_TAS_ASM

/***************************************
* Define this if you are compiling with
--- 1,4 ----
Index: src/include/port/unixware.h
================================================== =================
RCS file: /cvsroot/pgsql-server/src/include/port/unixware.h,v
retrieving revision 1.12
diff -c -c -r1.12 unixware.h
*** src/include/port/unixware.h 12 Sep 2003 15:49:34 -0000 1.12
--- src/include/port/unixware.h 23 Dec 2003 00:31:00 -0000
***************
*** 1,5 ****
#define HAS_TEST_AND_SET
- #define NEED_I386_TAS_ASM

/* see src/backend/libpq/pqcomm.c */
#define SCO_ACCEPT_BUG
--- 1,4 ----
Index: src/include/storage/s_lock.h
================================================== =================
RCS file: /cvsroot/pgsql-server/src/include/storage/s_lock.h,v
retrieving revision 1.118
diff -c -c -r1.118 s_lock.h
*** src/include/storage/s_lock.h 22 Dec 2003 23:36:38 -0000 1.118
--- src/include/storage/s_lock.h 23 Dec 2003 00:31:01 -0000
***************
*** 345,351 ****
* All non-gcc inlines
*/

! #if defined(NEED_I386_TAS_ASM) && defined(USE_UNIVEL_CC)
#define TAS(lock) tas(lock)

asm int
--- 345,351 ----
* All non-gcc inlines
*/

! #if defined(USE_UNIVEL_CC)
#define TAS(lock) tas(lock)

asm int
***************
*** 361,367 ****
popl %ebx
}

! #endif /* defined(NEED_I386_TAS_ASM) && defined(USE_UNIVEL_CC) */

#endif /* defined(__GNUC__) */

--- 361,367 ----
popl %ebx
}

! #endif /* defined(USE_UNIVEL_CC) */

#endif /* defined(__GNUC__) */



---------------------------(end of broadcast)---------------------------
TIP 8: explain analyze is your friend