From 9114cb1c5f09f6a006c2b228281c31cd0909bcd4 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Mon, 22 Dec 2003 23:39:53 +0000 Subject: [PATCH] This applied patch remove NEED_SPARC_TAS_ASM and instead uses __sparc || __sparc__. --- src/backend/storage/lmgr/s_lock.c | 6 +++--- src/include/port/bsdi.h | 1 - src/include/port/freebsd.h | 1 - src/include/port/netbsd.h | 1 - src/include/port/openbsd.h | 1 - 5 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/backend/storage/lmgr/s_lock.c b/src/backend/storage/lmgr/s_lock.c index 176a2d5d03..8434e8d6c8 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.17 2003/11/29 19:51:57 pgsql Exp $ + * $PostgreSQL: pgsql/src/backend/storage/lmgr/s_lock.c,v 1.18 2003/12/22 23:39:53 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -208,7 +208,7 @@ tas_dummy() /* really means: extern int tas(slock_t -#if defined(NEED_SPARC_TAS_ASM) +#if defined(__sparc__) || defined(__sparc) /* * sparc machines not using gcc */ @@ -227,7 +227,7 @@ tas_dummy() /* really means: extern int tas(slock_t asm("retl"); asm("nop"); } -#endif /* NEED_SPARC_TAS_ASM */ +#endif /* __sparc || __sparc__ */ diff --git a/src/include/port/bsdi.h b/src/include/port/bsdi.h index c1ec729d81..467c74382c 100644 --- a/src/include/port/bsdi.h +++ b/src/include/port/bsdi.h @@ -6,7 +6,6 @@ typedef unsigned char slock_t; typedef unsigned int slock_t; #endif #if defined(__sparc__) -#define NEED_SPARC_TAS_ASM typedef unsigned char slock_t; #endif diff --git a/src/include/port/freebsd.h b/src/include/port/freebsd.h index 386584e9a3..5c5b77ede9 100644 --- a/src/include/port/freebsd.h +++ b/src/include/port/freebsd.h @@ -10,7 +10,6 @@ typedef unsigned int slock_t; #endif #if defined(__sparc__) -#define NEED_SPARC_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 386584e9a3..5c5b77ede9 100644 --- a/src/include/port/netbsd.h +++ b/src/include/port/netbsd.h @@ -10,7 +10,6 @@ typedef unsigned int slock_t; #endif #if defined(__sparc__) -#define NEED_SPARC_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 386584e9a3..5c5b77ede9 100644 --- a/src/include/port/openbsd.h +++ b/src/include/port/openbsd.h @@ -10,7 +10,6 @@ typedef unsigned int slock_t; #endif #if defined(__sparc__) -#define NEED_SPARC_TAS_ASM #define HAS_TEST_AND_SET typedef unsigned char slock_t; #endif -- 2.11.0