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

Commitaba8c12

Browse files
committed
We have tested the patches on three platforms:
NetBSD/macppcLinuxPPCFreeBSD 2.2.6-RELEASEAll of them seem happy with the regression test. Note that, however,compiling with optimization enabled on NetBSD/macppc causes an initdbfailure (other two platforms are ok). After checking the asm code, weare suspecting that might be a compiler(egcs) bug.Tatsuo Ishii
1 parente94fffc commitaba8c12

File tree

11 files changed

+41
-14
lines changed

11 files changed

+41
-14
lines changed

‎src/Makefile.shlib

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Copyright (c) 1998, Regents of the University of California
77
#
88
# IDENTIFICATION
9-
# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.6 1999/01/17 06:18:08 momjian Exp $
9+
# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.7 1999/03/14 16:02:57 momjian Exp $
1010
#
1111
#-------------------------------------------------------------------------
1212

@@ -73,7 +73,11 @@ ifeq ($(PORTNAME), bsd)
7373
ifdef BSD_SHLIB
7474
install-shlib-dep:= install-shlib
7575
shlib:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
76-
LDFLAGS_SL:= -x -Bshareable -Bforcearchive
76+
ifdef ELF_SYSTEM
77+
LDFLAGS_SL:= -x -Bshareable -soname $(shlib)
78+
else
79+
LDFLAGS_SL:= -x -Bshareable -Bforcearchive
80+
endif
7781
CFLAGS+= $(CFLAGS_SL)
7882
endif
7983
endif

‎src/backend/port/dynloader/bsd.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ BSD44_derived_dlsym(void *handle, const char *name)
7979
#if defined(__mips__)|| (defined(__NetBSD__)&& defined(vax))
8080
sprintf(error_message,"dlsym (%s) failed",name);
8181
returnNULL;
82+
#elif defined(__ELF__)
83+
returndlsym(handle,name);
8284
#else
8385
void*vp;
8486
charbuf[BUFSIZ];

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

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/backend/storage/buffer/Attic/s_lock.c,v 1.17 1999/02/13 23:18:02 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/buffer/Attic/s_lock.c,v 1.18 1999/03/14 16:03:00 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -118,7 +118,7 @@ _success:\n\
118118

119119
#endif/* __m68k__ */
120120

121-
#if defined(PPC)
121+
#if defined(__powerpc__)
122122
/* Note: need a nice gcc constrained asm version so it can be inlined */
123123
staticvoid
124124
tas_dummy()
@@ -140,7 +140,7 @@ success:\n\
140140
");
141141
}
142142

143-
#endif/*PPC */
143+
#endif/*__powerpc__ */
144144

145145
#if defined(__mips)
146146
staticvoid

‎src/backend/utils/adt/dt.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/adt/Attic/dt.c,v 1.65 1999/02/13 23:19:11 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.66 1999/03/14 16:03:04 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -4533,7 +4533,7 @@ EncodeTimeSpan(struct tm * tm, double fsec, int style, char *str)
45334533
}/* EncodeTimeSpan() */
45344534

45354535

4536-
#if defined(linux)&& defined(PPC)
4536+
#if defined(linux)&& defined(__powerpc__)
45374537
int
45384538
datetime_is_epoch(doublej)
45394539
{

‎src/config.guess

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
129129
mac68k:OpenBSD:*:*)
130130
echo m68k-apple-openbsd${UNAME_RELEASE}
131131
exit 0 ;;
132+
macppc:NetBSD:*:*)
133+
echo powerpc-apple-netbsd${UNAME_RELEASE}
134+
exit 0;;
132135
powerpc:machten:*:*)
133136
echo powerpc-apple-machten${UNAME_RELEASE}
134137
exit 0 ;;

‎src/configure.in

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,12 @@ case "$host_os" in
2222
bsdi*) os=bsdi need_tas=no ;;
2323
freebsd3*|freebsd4*) os=freebsd need_tas=no elf=yes ;;
2424
freebsd1*|freebsd2*) os=freebsd need_tas=no ;;
25-
netbsd*|openbsd*) os=bsd need_tas=no ;;
25+
netbsd*)
26+
os=bsd need_tas=no
27+
case "$host_cpu" in
28+
powerpc) elf=yes ;;
29+
esac ;;
30+
openbsd*) os=bsd need_tas=no ;;
2631
dgux*) os=dgux need_tas=no ;;
2732
aix*) os=aix need_tas=no ;;
2833
nextstep*) os=nextstep need_tas=no ;;

‎src/include/port/bsd.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,13 @@
2424
#defineHAS_TEST_AND_SET
2525
#endif
2626

27+
#if defined(__powerpc__)
28+
#defineHAS_TEST_AND_SET
29+
typedefunsignedintslock_t;
30+
#endif
2731
#if defined(__mips__)
2832
/* #undef HAS_TEST_AND_SET */
2933
#endif
34+
#if !defined(__powerpc__)
3035
typedefunsignedcharslock_t;
36+
#endif

‎src/include/port/linux.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#defineUSE_POSIX_TIME
99
#defineHAS_TEST_AND_SET
1010

11-
#if defined(PPC)
11+
#if defined(__powerpc__)
1212
typedefunsignedintslock_t;
1313

1414
#elif defined(__alpha)
@@ -34,6 +34,6 @@ typedef unsigned char slock_t;
3434
/* #define HAVE_SIGSETJMP 1 */
3535
#endif
3636

37-
#if defined(PPC)
37+
#if defined(__powerpc__)
3838
#undef HAVE_INT_TIMEZONE
3939
#endif

‎src/include/utils/dt.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
* Copyright (c) 1994, Regents of the University of California
1010
*
11-
* $Id: dt.h,v 1.37 1999/03/06 22:58:11 tgl Exp $
11+
* $Id: dt.h,v 1.38 1999/03/14 16:03:16 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -228,7 +228,7 @@ typedef struct
228228
#defineDATETIME_IS_NOEND(j)(j == DT_NOEND)
229229

230230
#defineDATETIME_CURRENT(j){j = DT_CURRENT;}
231-
#if defined(linux)&& defined(PPC)
231+
#if defined(linux)&& defined(__powerpc__)
232232
externintdatetime_is_current(doublej);
233233

234234
#defineDATETIME_IS_CURRENT(j)datetime_is_current(j)
@@ -237,7 +237,7 @@ extern intdatetime_is_current(double j);
237237
#endif
238238

239239
#defineDATETIME_EPOCH(j){j = DT_EPOCH;}
240-
#if defined(linux)&& defined(PPC)
240+
#if defined(linux)&& defined(__powerpc__)
241241
externintdatetime_is_epoch(doublej);
242242

243243
#defineDATETIME_IS_EPOCH(j)datetime_is_epoch(j)

‎src/makefiles/Makefile.bsd

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1+
ifdef ELF_SYSTEM
2+
LDFLAGS += -Wl,-E
3+
endif
14
%.so: %.o
5+
ifdef ELF_SYSTEM
6+
$(LD) -x -Bshareable -o $@ $<
7+
else
28
$(LD) -x -r -o $<.obj $<
39
@echo building shared object $@
410
@rm -f $@.pic
@@ -7,3 +13,4 @@
713
@rm -f $@
814
$(LD) -x -Bshareable -Bforcearchive \
915
-o $@ $@.pic
16+
endif

‎src/test/regress/expected/euc_jp.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
QUERY: drop table �׻����Ѹ�;
2-
ERROR: Relation �׻����Ѹ� Does Not Exist!
2+
ERROR: Relation'�׻����Ѹ�' does not exist
33
QUERY: create table �׻����Ѹ� (�Ѹ� text, ʬ�ॳ���� varchar, ����1A���� char(16));
44
QUERY: create index �׻����Ѹ�index1 on �׻����Ѹ� using btree (�Ѹ�);
55
QUERY: create index �׻����Ѹ�index2 on �׻����Ѹ� using hash (ʬ�ॳ����);

0 commit comments

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