This applied patch remove NEED_SPARC_TAS_ASM and instead uses __sparc ||

bmomjian · bmomjian · commit 9114cb1c5f09 · 2003-12-22T23:39:53.000Z
__sparc__.
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.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
@@ -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
@@ -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
@@ -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
@@ -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

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.17 2003/11/29 19:51:57 pgsql Exp $`
	`12`	`+ * $PostgreSQL: pgsql/src/backend/storage/lmgr/s_lock.c,v 1.18 2003/12/22 23:39:53 momjian Exp $`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`15`	`15`	`*/`
`@@ -208,7 +208,7 @@ tas_dummy() /* really means: extern int tas(slock_t`
`208`	`208`
`209`	`209`
`210`	`210`
`211`		`-#if defined(NEED_SPARC_TAS_ASM)`
	`211`	`+#if defined(__sparc__) \|\| defined(__sparc)`
`212`	`212`	`/*`
`213`	`213`	`* sparc machines not using gcc`
`214`	`214`	`*/`
`@@ -227,7 +227,7 @@ tas_dummy() /* really means: extern int tas(slock_t`
`227`	`227`	`asm("retl");`
`228`	`228`	`asm("nop");`
`229`	`229`	`}`
`230`		`-#endif /* NEED_SPARC_TAS_ASM */`
	`230`	`+#endif /* __sparc \|\| __sparc__ */`
`231`	`231`
`232`	`232`
`233`	`233`