Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 1af6b56

Browse files
committed
From: Ryan Kirkpatrick <rkirkpat@nag.cs.colorado.edu>
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.
1 parent 718430e commit 1af6b56

File tree

9 files changed

+20
-20
lines changed

9 files changed

+20
-20
lines changed

doc/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
#
99
#
1010
# IDENTIFICATION
11-
# $Header: /cvsroot/pgsql/doc/Makefile,v 1.7 1998/04/17 03:58:11 thomas Exp $
11+
# $Header: /cvsroot/pgsql/doc/Makefile,v 1.8 1998/04/27 14:41:50 scrappy Exp $
1212
#
1313
#----------------------------------------------------------------------------
1414

15-
PGDOCS= $(POSTGRESDIR)/doc
15+
PGDOCS= /home/projects/pgsql/ftp/www/html/docs2
1616
SRCDIR= ../src
1717

1818
TAR= tar

src/backend/main/main.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.16 1998/04/11 21:14:47 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.17 1998/04/27 14:43:02 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414
#include <stdio.h>
1515
#include <string.h>
1616
#include <unistd.h>
1717

18-
#if defined(alpha) && !defined(linux)
18+
#if defined(__alpha) && !defined(linux)
1919
#include <sys/sysinfo.h>
2020
#include <machine/hal_sysinfo.h>
2121
#define ASSEMBLER
@@ -42,7 +42,7 @@ main(int argc, char *argv[])
4242
{
4343
int len;
4444

45-
#if defined(alpha)
45+
#if defined(__alpha)
4646
#ifdef NOFIXADE
4747
int buffer[] = {SSIN_UACPROC, UAC_SIGBUS};
4848

@@ -70,7 +70,7 @@ main(int argc, char *argv[])
7070
syscall(SYS_sysmips, MIPS_FIXADE, 0, NULL, NULL, NULL);
7171
#endif
7272

73-
#if defined(alpha)
73+
#if defined(__alpha)
7474
if (setsysinfo(SSI_NVPAIRS, buffer, 1, (caddr_t) NULL,
7575
(unsigned long) NULL) < 0)
7676
{

src/backend/storage/buffer/s_lock.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/storage/buffer/Attic/s_lock.c,v 1.3 1998/02/26 04:35:28 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/buffer/Attic/s_lock.c,v 1.4 1998/04/27 14:43:15 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -37,7 +37,7 @@
3737
#include "storage/ipc.h"
3838
#include "storage/s_lock.h"
3939

40-
#if defined(__alpha__) && defined(linux)
40+
#if defined(__alpha) && defined(linux)
4141
void
4242
S_LOCK(slock_t *lock)
4343
{

src/backend/utils/adt/float.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.30 1998/04/12 02:58:17 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.31 1998/04/27 14:43:38 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -132,7 +132,7 @@ extern int isinf(double x);
132132
* until the distributions are updated.
133133
* --djm 12/16/96
134134
*/
135-
#if ( defined(linux) && defined(alpha) ) && !defined(UNSAFE_FLOATS)
135+
#if ( defined(linux) && defined(__alpha) ) && !defined(UNSAFE_FLOATS)
136136
#define UNSAFE_FLOATS
137137
#endif
138138

src/include/port/linux.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#if defined(PPC)
1414
typedef unsigned int slock_t;
1515

16-
#elif defined(__alpha__)
16+
#elif defined(__alpha)
1717
typedef long int slock_t;
1818

1919
#else
@@ -42,6 +42,6 @@ typedef unsigned char slock_t;
4242
#undef NEED_I386_TAS_ASM
4343
#endif
4444

45-
#if defined(__alpha__)
45+
#if defined(__alpha)
4646
#undef NEED_I386_TAS_ASM
4747
#endif

src/include/storage/s_lock.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.28 1998/03/01 04:47:24 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.29 1998/04/27 14:45:33 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -97,7 +97,7 @@
9797
* (see storage/ipc.h).
9898
*/
9999

100-
#if (defined(__alpha__) || defined(__alpha)) && !defined(linux)
100+
#if defined(__alpha) && !defined(linux)
101101

102102
#define S_LOCK(lock) do \
103103
{ \
@@ -340,15 +340,15 @@ S_LOCK(char *lval)
340340
#endif /* NEED_I386_TAS_ASM */
341341

342342

343-
#if defined(__alpha__) && defined(linux)
343+
#if defined(__alpha) && defined(linux)
344344

345345
void S_LOCK(slock_t *lock);
346346

347347
#define S_UNLOCK(lock) { __asm__("mb"); *(lock) = 0; }
348348

349349
#define S_INIT_LOCK(lock) S_UNLOCK(lock)
350350

351-
#endif /* defined(__alpha__) && defined(linux) */
351+
#endif /* defined(__alpha) && defined(linux) */
352352

353353
#if defined(linux) && defined(sparc)
354354

src/include/utils/memutils.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*
1616
* Copyright (c) 1994, Regents of the University of California
1717
*
18-
* $Id: memutils.h,v 1.15 1998/04/12 02:58:22 scrappy Exp $
18+
* $Id: memutils.h,v 1.16 1998/04/27 14:46:17 scrappy Exp $
1919
*
2020
* NOTES
2121
* some of the information in this file will be moved to
@@ -67,7 +67,7 @@ s...)
6767
*/
6868
#if defined(sun) && ! defined(sparc)
6969
#define LONGALIGN(LEN) SHORTALIGN(LEN)
70-
#elif defined (alpha)
70+
#elif defined (__alpha)
7171

7272
/*
7373
* even though "long alignment" should really be on 8-byte boundaries for

src/template/alpha

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ AROPT:crs
55
# This is defined here because a bunch of clients include tmp/c.h,
66
# which is where the work is done on HP-UX. It only affects the
77
# backend on Ultrix and OSF/1.
8-
CFLAGS:-DNOFIXADE -Dalpha
8+
CFLAGS:-DNOFIXADE
99
SHARED_LIB:
1010
ALL:
1111
SRCH_INC:

src/template/linuxalpha

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
AROPT:crs
2-
CFLAGS:-O2 -Dalpha -Dlinuxalpha
2+
CFLAGS:-O2
33
SHARED_LIB:-fpic
44
ALL:
55
SRCH_INC:

0 commit comments

Comments
 (0)