Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit9005a38

Browse files
author
Bryan Henderson
committed
Change portname "sparc" to "sunos4" and change some portname dependencies to
feature dependencies. Thanks Kurt J. Lidl.
1 parent071797f commit9005a38

File tree

12 files changed

+96
-151
lines changed

12 files changed

+96
-151
lines changed

‎src/BACKEND_DIRS

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,12 @@ port/BSD44_derived
5252
port/aix
5353
port/alpha
5454
port/bsdi
55-
port/bsdi_2_1
5655
port/dgux
5756
port/hpux
5857
port/i386_solaris
5958
port/irix5
6059
port/linux
61-
port/sparc
60+
port/sunos4
6261
port/sparc_solaris
6362
port/svr4
6463
port/ultrix4

‎src/Makefile.global

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.75 1996/11/27 08:13:44 bryanh Exp $
10+
# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.76 1996/12/04 03:05:45 bryanh Exp $
1111
#
1212
# NOTES
1313
# Essentially all Postgres make files include this file and use the
@@ -42,7 +42,7 @@
4242
# hpux HP PA-RISC on HP-UX 9.0
4343
# i386_solaris i386 Solaris
4444
# sparc_solaris SUN SPARC on Solaris 2.4
45-
#sparc SUN SPARC on SunOS 4.1.3
45+
#sunos4 SUN SPARC on SunOS 4.1.3
4646
# ultrix4 DEC MIPS on Ultrix 4.4
4747
# linux Intel x86 on Linux 1.2 and Linux ELF
4848
# (For non-ELF Linux, see LINUX_ELF below).
@@ -582,7 +582,7 @@ endif
582582

583583
#---------------------------------------------------------------------------
584584

585-
ifeq ($(PORTNAME),sparc)
585+
ifeq ($(PORTNAME),sunos4)
586586
# cc won't work!
587587
CC= gcc
588588

‎src/backend/access/common/heaptuple.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.16 1996/11/10 02:56:41 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.17 1996/12/04 03:05:55 bryanh Exp $
1212
*
1313
* NOTES
1414
* The old interface functions have been converted to macros
@@ -35,9 +35,9 @@
3535

3636
/* this is so the sparcstation debugger works */
3737

38-
#if !defined(NO_ASSERT_CHECKING)&& defined(sparc)
38+
#if !defined(NO_ASSERT_CHECKING)&& defined(sparc)&& defined(sunos4)
3939
#defineregister
40-
#endif/* !NO_ASSERT_CHECKING && sparc */
40+
#endif/* !NO_ASSERT_CHECKING && sparc&& sunos4*/
4141

4242
/* ----------------------------------------------------------------
4343
*misc support routines

‎src/backend/storage/file/fd.c

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Copyright (c) 1994, Regents of the University of California
77
*
88
* IDENTIFICATION
9-
* $Id: fd.c,v 1.9 1996/11/0805:58:21 momjian Exp $
9+
* $Id: fd.c,v 1.10 1996/12/04 03:05:58 bryanh Exp $
1010
*
1111
* NOTES:
1212
*
@@ -52,24 +52,20 @@
5252
#include"utils/palloc.h"
5353
#include"storage/fd.h"
5454

55-
#ifdefsparc
55+
#if defined(NEED_NOFILE_KLUDGE)
5656
/*
5757
* the SunOS 4 NOFILE is a lie, because the default limit is *not* the
5858
* maximum number of file descriptors you can have open.
5959
*
6060
* we have to either use this number (the default dtablesize) or
6161
* explicitly call setrlimit(RLIMIT_NOFILE, NOFILE).
62+
*
63+
* this braindamage apparently also affects solaris 2.X as well
6264
*/
6365
#include<sys/user.h>
6466
#undef NOFILE
6567
#defineNOFILE NOFILE_IN_U
66-
#endif/* sparc */
67-
68-
#if defined(sparc_solaris)|| defined(i386_solaris)
69-
#include<sys/user.h>
70-
#undef NOFILE
71-
#defineNOFILE 64
72-
#endif/* sparc_solaris || i386_solaris */
68+
#endif/* NEED_NOFILE_KLUDGE */
7369

7470
/*
7571
* Problem: Postgres does a system(ld...) to do dynamic loading. This

‎src/backend/storage/ipc/s_lock.c

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/s_lock.c,v 1.8 1996/11/10 03:02:26 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/s_lock.c,v 1.9 1996/12/04 03:06:04 bryanh Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -266,7 +266,7 @@ S_LOCK_FREE(slock_t *lock)
266266
* sun3
267267
*/
268268

269-
#if(defined(sun3)&& ! defined(sparc))
269+
#if defined(sun3)
270270

271271
void
272272
S_LOCK(slock_t*lock)
@@ -307,13 +307,13 @@ tas_dummy()
307307
asm(".data");
308308
}
309309

310-
#endif
310+
#endif/* sun3 */
311311

312312
/*
313-
*SPARC (SunOS 4)
313+
*sparc machines
314314
*/
315315

316-
#if defined(sparc)&& !defined(sparc_solaris)
316+
#if defined(NEED_SPARC_TAS_ASM)
317317

318318
/* if we're using -ansi w/ gcc, use __asm__ instead of asm */
319319
#if defined(__STRICT_ANSI__)
@@ -375,18 +375,14 @@ S_INIT_LOCK(unsigned char *addr)
375375
*addr=0;
376376
}
377377

378-
#endif/*sparc */
378+
#endif/*NEED_SPARC_TAS_ASM */
379379

380380
/*
381-
*Linux and friends
381+
*i386 based things
382382
*/
383383

384-
#if defined(BSD44_derived)|| \
385-
defined(bsdi)|| \
386-
defined(bsdi_2_1)|| \
387-
defined(linux)
384+
#if defined(NEED_I386_TAS_ASM)
388385

389-
390386
int
391387
tas(slock_t*m)
392388
{
@@ -414,7 +410,7 @@ S_INIT_LOCK(slock_t *lock)
414410
S_UNLOCK(lock);
415411
}
416412

417-
#endif/*linux and friends */
413+
#endif/*NEED_I386_TAS_ASM */
418414

419415

420416
#endif/* HAS_TEST_AND_SET */

‎src/backend/utils/cache/catcache.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.5 1996/11/13 20:50:04 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.6 1996/12/04 03:06:09 bryanh Exp $
1111
*
1212
* Notes:
1313
*XXX This needs to use exception.h to handle recovery when
@@ -740,7 +740,7 @@ SearchSysCache(struct catcache *cache,
740740
Datumv4)
741741
{
742742
unsignedhash;
743-
CatCTup*ct;
743+
CatCTup*ct=NULL;
744744
CatCTup*nct;
745745
CatCTup*nct2;
746746
Dlelem*elt;

‎src/bin/psql/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.15 1996/11/26 07:38:24 bryanh Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.16 1996/12/04 03:06:16 bryanh Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -32,7 +32,7 @@ ifeq ($(USE_READLINE), true)
3232
ifeq ($(PORTNAME), ultrix4)
3333
LD_ADD+= -ltermcap
3434
else
35-
ifeq ($(PORTNAME),sparc)
35+
ifeq ($(PORTNAME),sunos4)
3636
LD_ADD+= -ltermcap
3737
else
3838
ifeq ($(PORTNAME), linux)

‎src/include/c.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Id: c.h,v 1.4 1996/11/14 06:06:39 bryanh Exp $
10+
* $Id: c.h,v 1.5 1996/12/04 03:06:21 bryanh Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -747,7 +747,7 @@ extern char *form(char *fmt, ...);
747747
#include"port/hpux/fixade.h"/* for 8.07 unaligned access fixup */
748748
#endif/* hpux */
749749

750-
#if defined(sparc)&& !defined(sparc_solaris)
750+
#if defined(sunos4)
751751
#definememmove(d,s,l)bcopy(s, d, l)
752752
#endif
753753

‎src/include/config.h

Lines changed: 58 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525
# define NEED_SYS_SELECT_H
2626
# defineHAVE_TZSET
2727
# defineHAVE_ANSI_CPP
28+
# defineSB_PAD 44
29+
# defineHAS_TEST_AND_SET
30+
typedefunsignedintslock_t;
2831
#endif
2932

3033
#if defined(alpha)
@@ -34,18 +37,44 @@
3437
# define NEED_ISINF
3538
# defineHAS_LONG_LONG
3639
# defineNEED_UNION_SEMUN
40+
# define SB_PAD 40
41+
# defineHAS_TEST_AND_SET
42+
typedefmsemaphoreslock_t;
3743
#endif
3844

39-
#if defined(BSD44_derived)|| \
40-
defined(bsdi)
45+
#if defined(BSD44_derived)
4146
# defineUSE_LIMITS_H
4247
# defineUSE_POSIX_TIME
4348
# defineNEED_CBRT
49+
# defineNEED_I386_TAS_ASM
50+
# defineSB_PAD 56
51+
# defineHAS_TEST_AND_SET
52+
# if defined(__mips__)
53+
# undef HAS_TEST_AND_SET
54+
# endif
55+
typedefunsignedcharslock_t;
56+
#endif
57+
58+
#if defined(bsdi)
59+
# if defined(i386)
60+
# defineNEED_I386_TAS_ASM
61+
# defineSB_PAD 56
62+
# endif
63+
# if defined(sparc)
64+
# defineNEED_SPARC_TAS_ASM
65+
# defineSB_PAD 56
66+
# endif
4467
# if defined(PRE_BSDI_2_1)
4568
# defineNEED_UNION_SEMUN
4669
# endif
70+
# defineUSE_LIMITS_H
71+
# defineUSE_POSIX_TIME
72+
# defineNEED_CBRT
73+
# defineHAS_TEST_AND_SET
74+
typedefunsignedcharslock_t;
4775
#endif
4876

77+
4978
#if defined(dgux)
5079
# defineLINUX_ELF
5180
# defineNEED_UNION_SEMUN
@@ -60,6 +89,9 @@
6089
# defineNEED_CBRT
6190
# defineNEED_RINT
6291
# defineNEED_UNION_SEMUN
92+
# define SB_PAD 44
93+
# defineHAS_TEST_AND_SET
94+
typedefstruct {intsem[4]; }slock_t;
6395
#endif
6496

6597
#if defined(i386_solaris)
@@ -71,6 +103,10 @@
71103
# defineHAVE_TZSET
72104
# defineNEED_UNION_SEMUN
73105
# define SYSV_DIRENT
106+
# defineNEED_NOFILE_KLUDGE
107+
# defineSB_PAD 56
108+
# defineHAS_TEST_AND_SET
109+
typedefunsignedcharslock_t;
74110
#endif
75111

76112
#if defined(irix5)
@@ -81,6 +117,9 @@
81117
# defineNO_VFORK
82118
# defineHAVE_TZSET
83119
# defineSYSV_DIRENT
120+
# defineSB_PAD 44
121+
# defineHAS_TEST_AND_SET
122+
typedefabilock_tslock_t;
84123
#endif
85124

86125
#if defined(linux)
@@ -94,22 +133,24 @@
94133
# defineUSE_POSIX_TIME
95134
# defineHAVE_TZSET
96135
# defineNEED_CBRT
136+
# defineNEED_I386_TAS_ASM
137+
# defineSB_PAD 56
138+
# defineHAS_TEST_AND_SET
139+
typedefunsignedcharslock_t;
97140
#endif
98141

142+
/* does anybody use this? */
99143
#if defined(next)
100144
# defineSIGJMP_BUF
101145
# defineNEED_SIG_JMP
146+
# defineSB_PAD 56
147+
typedefstructmutexslock_t;
102148
#endif
103149

104150
#if defined(sequent)
105151
# defineNEED_UNION_SEMUN
106152
#endif
107153

108-
#if defined(sparc)&& !defined(sparc_solaris)
109-
# defineUSE_POSIX_TIME
110-
# undef HAVE_MEMMOVE
111-
#endif
112-
113154
#if defined(sparc_solaris)
114155
# defineUSE_POSIX_TIME
115156
# define USE_POSIX_SIGNALS
@@ -120,6 +161,15 @@
120161
# defineHAVE_TZSET
121162
# defineNEED_UNION_SEMUN
122163
# define SYSV_DIRENT
164+
# defineNEED_NOFILE_KLUDGE
165+
# defineSB_PAD 56
166+
#endif
167+
168+
#if defined(sunos4)
169+
# defineUSE_POSIX_TIME
170+
# defineNEED_NOFILE_KLUDGE
171+
# defineSB_PAD 56
172+
# undef HAVE_MEMMOVE
123173
#endif
124174

125175
#if defined(svr4)
@@ -150,6 +200,7 @@
150200
# define USE_POSIX_TIME
151201
# defineNEED_UNION_SEMUN
152202
# define NEED_STRDUP
203+
# defineSB_PAD 60
153204
#endif
154205

155206

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp