More cpu cleanups, only for 6.6.

This commit is contained in:
Bruce Momjian
1999-07-13 20:12:51 +00:00
parent 540c114225
commit 050371fccd
9 changed files with 32 additions and 27 deletions

View File

@ -28,15 +28,16 @@
#define HAS_TEST_AND_SET
#endif
#if defined(__powerpc__)
#define HAS_TEST_AND_SET
typedef unsigned int slock_t;
#endif
#if defined(__mips__)
/* # undef HAS_TEST_AND_SET */
#endif
#if !defined(__powerpc__)
typedef unsigned char slock_t;
#if defined(__powerpc__)
#define HAS_TEST_AND_SET
#endif
#if defined(__powerpc__)
typedef unsigned int slock_t;
#else
typedef unsigned char slock_t;
#endif

View File

@ -4,6 +4,8 @@
#if defined(__sparc__)
#define NEED_SPARC_TAS_ASM
#endif
#define USE_POSIX_TIME
#define HAS_TEST_AND_SET
typedef unsigned char slock_t;

View File

@ -27,4 +27,5 @@
#if defined(__mips__)
/* # undef HAS_TEST_AND_SET */
#endif
typedef unsigned char slock_t;

View File

@ -8,18 +8,18 @@
#define USE_POSIX_TIME
#define HAS_TEST_AND_SET
#if defined(__powerpc__)
#if if defined(__i386__)
typedef unsigned char slock_t;
#elif defined(__powerpc__)
typedef unsigned int slock_t;
#elif defined(__alpha)
#elif defined(__alpha__)
typedef long int slock_t;
#elif defined(__mips)
#elif defined(__mips__)
typedef unsigned int slock_t;
#else /* i386 probably */
typedef unsigned char slock_t;
#endif
#if (__GLIBC__ >= 2)

View File

@ -4,6 +4,7 @@
#define HAS_TEST_AND_SET
#define NEED_I386_TAS_ASM
/***************************************
* Define this if you are compiling with
* the native UNIXWARE C compiler.

View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.62 1999/07/13 20:00:36 momjian Exp $
* $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.63 1999/07/13 20:12:51 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -78,7 +78,7 @@ extern void s_lock_sleep(unsigned spin);
* All the gcc inlines
*/
#if defined(__alpha)
#if defined(__alpha__)
#define TAS(lock) tas(lock)
#define S_UNLOCK(lock) { __asm__("mb"); *(lock) = 0; }
@ -104,7 +104,7 @@ __asm__(" ldq $0, %0 \n\
return (int) _res;
}
#endif /* __alpha */
#endif /* __alpha__ */
@ -226,7 +226,7 @@ tas(volatile slock_t *lock)
* All non gcc
*/
#if defined(__alpha)
#if defined(__alpha__)
/*
* OSF/1 (Alpha AXP)
*
@ -237,7 +237,7 @@ tas(volatile slock_t *lock)
#define S_UNLOCK(lock) msem_unlock((lock), 0)
#define S_INIT_LOCK(lock) msem_init((lock), MSEM_UNLOCKED)
#define S_LOCK_FREE(lock) (!(lock)->msem_state)
#endif /* __alpha */
#endif /* __alpha__ */