From 1af6b56427fa5afbca88849c428bc872d60ad941 Mon Sep 17 00:00:00 2001 From: "Marc G. Fournier" Date: Mon, 27 Apr 1998 14:46:51 +0000 Subject: [PATCH] From: Ryan Kirkpatrick Ok, I have finally gotten all of the defines for Dec/Alpha and Linux/Alpha sorted out as Marc asked. There is no longer any need for '-Dalpha' or '-Dlinuxalpha' in either the Dec/Alpha or the Linux/Alpha template files (./src/template/{alpha,linuxalpha}). I have replaced every instance of 'alpha' or '__alpha__' with '__alpha', as that appears to be the common symbol between C compilers on both operating systems (RH4.2 & DecUnix 4.0b) for alpha. --- doc/Makefile | 4 ++-- src/backend/main/main.c | 8 ++++---- src/backend/storage/buffer/s_lock.c | 4 ++-- src/backend/utils/adt/float.c | 4 ++-- src/include/port/linux.h | 4 ++-- src/include/storage/s_lock.h | 8 ++++---- src/include/utils/memutils.h | 4 ++-- src/template/alpha | 2 +- src/template/linuxalpha | 2 +- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index f4b54d54cb..9ce27f035d 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -8,11 +8,11 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/doc/Makefile,v 1.7 1998/04/17 03:58:11 thomas Exp $ +# $Header: /cvsroot/pgsql/doc/Makefile,v 1.8 1998/04/27 14:41:50 scrappy Exp $ # #---------------------------------------------------------------------------- -PGDOCS= $(POSTGRESDIR)/doc +PGDOCS= /home/projects/pgsql/ftp/www/html/docs2 SRCDIR= ../src TAR= tar diff --git a/src/backend/main/main.c b/src/backend/main/main.c index a654163cb8..9178570129 100644 --- a/src/backend/main/main.c +++ b/src/backend/main/main.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.16 1998/04/11 21:14:47 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.17 1998/04/27 14:43:02 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -15,7 +15,7 @@ #include #include -#if defined(alpha) && !defined(linux) +#if defined(__alpha) && !defined(linux) #include #include #define ASSEMBLER @@ -42,7 +42,7 @@ main(int argc, char *argv[]) { int len; -#if defined(alpha) +#if defined(__alpha) #ifdef NOFIXADE int buffer[] = {SSIN_UACPROC, UAC_SIGBUS}; @@ -70,7 +70,7 @@ main(int argc, char *argv[]) syscall(SYS_sysmips, MIPS_FIXADE, 0, NULL, NULL, NULL); #endif -#if defined(alpha) +#if defined(__alpha) if (setsysinfo(SSI_NVPAIRS, buffer, 1, (caddr_t) NULL, (unsigned long) NULL) < 0) { diff --git a/src/backend/storage/buffer/s_lock.c b/src/backend/storage/buffer/s_lock.c index 1a194eb4a4..a3f6373564 100644 --- a/src/backend/storage/buffer/s_lock.c +++ b/src/backend/storage/buffer/s_lock.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/buffer/Attic/s_lock.c,v 1.3 1998/02/26 04:35:28 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/buffer/Attic/s_lock.c,v 1.4 1998/04/27 14:43:15 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -37,7 +37,7 @@ #include "storage/ipc.h" #include "storage/s_lock.h" -#if defined(__alpha__) && defined(linux) +#if defined(__alpha) && defined(linux) void S_LOCK(slock_t *lock) { diff --git a/src/backend/utils/adt/float.c b/src/backend/utils/adt/float.c index 6f27e14c39..b5c79d304b 100644 --- a/src/backend/utils/adt/float.c +++ b/src/backend/utils/adt/float.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.30 1998/04/12 02:58:17 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.31 1998/04/27 14:43:38 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -132,7 +132,7 @@ extern int isinf(double x); * until the distributions are updated. * --djm 12/16/96 */ -#if ( defined(linux) && defined(alpha) ) && !defined(UNSAFE_FLOATS) +#if ( defined(linux) && defined(__alpha) ) && !defined(UNSAFE_FLOATS) #define UNSAFE_FLOATS #endif diff --git a/src/include/port/linux.h b/src/include/port/linux.h index 1a7f74b8b9..b2a9cd1cb0 100644 --- a/src/include/port/linux.h +++ b/src/include/port/linux.h @@ -13,7 +13,7 @@ #if defined(PPC) typedef unsigned int slock_t; -#elif defined(__alpha__) +#elif defined(__alpha) typedef long int slock_t; #else @@ -42,6 +42,6 @@ typedef unsigned char slock_t; #undef NEED_I386_TAS_ASM #endif -#if defined(__alpha__) +#if defined(__alpha) #undef NEED_I386_TAS_ASM #endif diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h index 89612c1b71..e7b3104a65 100644 --- a/src/include/storage/s_lock.h +++ b/src/include/storage/s_lock.h @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.28 1998/03/01 04:47:24 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.29 1998/04/27 14:45:33 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -97,7 +97,7 @@ * (see storage/ipc.h). */ -#if (defined(__alpha__) || defined(__alpha)) && !defined(linux) +#if defined(__alpha) && !defined(linux) #define S_LOCK(lock) do \ { \ @@ -340,7 +340,7 @@ again: #endif /* NEED_I386_TAS_ASM */ -#if defined(__alpha__) && defined(linux) +#if defined(__alpha) && defined(linux) void S_LOCK(slock_t *lock); @@ -348,7 +348,7 @@ void S_LOCK(slock_t *lock); #define S_INIT_LOCK(lock) S_UNLOCK(lock) -#endif /* defined(__alpha__) && defined(linux) */ +#endif /* defined(__alpha) && defined(linux) */ #if defined(linux) && defined(sparc) diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h index aaec736914..71a2581676 100644 --- a/src/include/utils/memutils.h +++ b/src/include/utils/memutils.h @@ -15,7 +15,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: memutils.h,v 1.15 1998/04/12 02:58:22 scrappy Exp $ + * $Id: memutils.h,v 1.16 1998/04/27 14:46:17 scrappy Exp $ * * NOTES * some of the information in this file will be moved to @@ -67,7 +67,7 @@ s...) */ #if defined(sun) && ! defined(sparc) #define LONGALIGN(LEN) SHORTALIGN(LEN) -#elif defined (alpha) +#elif defined (__alpha) /* * even though "long alignment" should really be on 8-byte boundaries for diff --git a/src/template/alpha b/src/template/alpha index ec287496bc..3da0dfe93a 100644 --- a/src/template/alpha +++ b/src/template/alpha @@ -5,7 +5,7 @@ AROPT:crs # This is defined here because a bunch of clients include tmp/c.h, # which is where the work is done on HP-UX. It only affects the # backend on Ultrix and OSF/1. -CFLAGS:-DNOFIXADE -Dalpha +CFLAGS:-DNOFIXADE SHARED_LIB: ALL: SRCH_INC: diff --git a/src/template/linuxalpha b/src/template/linuxalpha index 163e1a6ee4..65415dd3a5 100644 --- a/src/template/linuxalpha +++ b/src/template/linuxalpha @@ -1,5 +1,5 @@ AROPT:crs -CFLAGS:-O2 -Dalpha -Dlinuxalpha +CFLAGS:-O2 SHARED_LIB:-fpic ALL: SRCH_INC: -- 2.40.0