NetBSD/Alpha porting fixes from tom@minnesota.com.

This commit is contained in:
Tom Lane 2000-12-31 03:34:01 +00:00
parent 4723b2b99b
commit fada8ee41f
2 changed files with 16 additions and 9 deletions

View File

@ -13,7 +13,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.35 2000/11/25 03:45:47 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.36 2000/12/31 03:34:01 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -25,13 +25,16 @@
#include <locale.h> #include <locale.h>
#endif #endif
#if defined(__alpha) && !defined(linux) && !defined(__FreeBSD__) #if defined(__alpha) && !defined(linux) && !defined(__FreeBSD__) && !defined(__NetBSD__)
#include <sys/sysinfo.h> #include <sys/sysinfo.h>
#include "machine/hal_sysinfo.h" #include "machine/hal_sysinfo.h"
#define ASSEMBLER #define ASSEMBLER
#include <sys/proc.h> #include <sys/proc.h>
#undef ASSEMBLER #undef ASSEMBLER
#endif #endif
#if defined(__NetBSD__)
#include <sys/param.h>
#endif
#include "miscadmin.h" #include "miscadmin.h"
#include "bootstrap/bootstrap.h" #include "bootstrap/bootstrap.h"

View File

@ -1,43 +1,47 @@
#if defined(__i386__) #if defined(__i386__)
#define NEED_I386_TAS_ASM #define NEED_I386_TAS_ASM
#define HAS_TEST_AND_SET #define HAS_TEST_AND_SET
typedef unsigned char slock_t;
#endif #endif
#if defined(__sparc__) #if defined(__sparc__)
#define NEED_SPARC_TAS_ASM #define NEED_SPARC_TAS_ASM
#define HAS_TEST_AND_SET #define HAS_TEST_AND_SET
typedef unsigned char slock_t;
#endif #endif
#if defined(__vax__) #if defined(__vax__)
#define NEED_VAX_TAS_ASM #define NEED_VAX_TAS_ASM
#define HAS_TEST_AND_SET #define HAS_TEST_AND_SET
typedef unsigned char slock_t;
#endif #endif
#if defined(__ns32k__) #if defined(__ns32k__)
#define NEED_NS32K_TAS_ASM #define NEED_NS32K_TAS_ASM
#define HAS_TEST_AND_SET #define HAS_TEST_AND_SET
typedef unsigned char slock_t;
#endif #endif
#if defined(__m68k__) #if defined(__m68k__)
#define HAS_TEST_AND_SET #define HAS_TEST_AND_SET
typedef unsigned char slock_t;
#endif #endif
#if defined(__arm__) #if defined(__arm__)
#define HAS_TEST_AND_SET #define HAS_TEST_AND_SET
typedef unsigned char slock_t;
#endif #endif
#if defined(__mips__) #if defined(__mips__)
/* # undef HAS_TEST_AND_SET */ /* # undef HAS_TEST_AND_SET */
#endif #endif
#if defined(__alpha__)
#define HAS_TEST_AND_SET
typedef unsigned long slock_t;
#endif
#if defined(__powerpc__) #if defined(__powerpc__)
#define HAS_TEST_AND_SET #define HAS_TEST_AND_SET
#endif
#if defined(__powerpc__)
typedef unsigned int slock_t; typedef unsigned int slock_t;
#else
typedef unsigned char slock_t;
#endif #endif