aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2016-10-11 11:26:04 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2016-10-11 11:26:04 -0400
commit2b860f52ed1b1784cdf3f03886805f5bf250ea74 (patch)
tree4aa437fa6abe5d253038305c5670cb29281da1b0 /src
parentc7e56811fa38cbc39efd6bdd4bb45f2f0444803e (diff)
downloadpostgresql-2b860f52ed1b1784cdf3f03886805f5bf250ea74.tar.gz
postgresql-2b860f52ed1b1784cdf3f03886805f5bf250ea74.zip
Remove "sco" and "unixware" ports.
SCO OpenServer and SCO UnixWare are more or less dead platforms. We have never had a buildfarm member testing the "sco" port, and the last "unixware" member was last heard from in 2012, so it's fair to doubt that the code even compiles anymore on either one. Remove both ports. We can always undo this if someone shows up with an interest in maintaining and testing these platforms. Discussion: <17177.1476136994@sss.pgh.pa.us>
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.global.in1
-rw-r--r--src/Makefile.shlib24
-rw-r--r--src/backend/libpq/pqcomm.c10
-rw-r--r--src/backend/port/dynloader/sco.c7
-rw-r--r--src/backend/port/dynloader/sco.h46
-rw-r--r--src/backend/port/dynloader/unixware.c7
-rw-r--r--src/backend/port/dynloader/unixware.h49
-rw-r--r--src/include/port/sco.h7
-rw-r--r--src/include/port/unixware.h11
-rw-r--r--src/include/storage/s_lock.h23
-rw-r--r--src/makefiles/Makefile.sco13
-rw-r--r--src/makefiles/Makefile.unixware35
-rw-r--r--src/port/getrusage.c1
-rw-r--r--src/template/sco1
-rw-r--r--src/template/unixware41
15 files changed, 0 insertions, 276 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index e1e2c0adaf2..ea61eb518f1 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -265,7 +265,6 @@ UUID_LIBS = @UUID_LIBS@
UUID_EXTRA_OBJS = @UUID_EXTRA_OBJS@
LD = @LD@
with_gnu_ld = @with_gnu_ld@
-ld_R_works = @ld_R_works@
# We want -L for libpgport.a and libpgcommon.a to be first in LDFLAGS. We
# also need LDFLAGS to be a "recursively expanded" variable, else adjustments
diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index 87c80c5d01b..358d90837ce 100644
--- a/src/Makefile.shlib
+++ b/src/Makefile.shlib
@@ -236,30 +236,6 @@ ifeq ($(PORTNAME), solaris)
endif
endif
-ifeq ($(PORTNAME), sco)
- ifeq ($(GCC), yes)
- LINK.shared = $(CC) -shared
- else
- LINK.shared = $(CC) -G
- endif
- LINK.shared += -Wl,-z,text
- ifdef soname
- LINK.shared += -Wl,-h,$(soname)
- endif
-endif
-
-ifeq ($(PORTNAME), unixware)
- ifeq ($(GCC), yes)
- LINK.shared = $(CC) -shared
- else
- LINK.shared = $(CC) -G
- endif
- LINK.shared += -Wl,-z,text
- ifdef soname
- LINK.shared += -Wl,-h,$(soname)
- endif
-endif
-
ifeq ($(PORTNAME), cygwin)
LINK.shared = $(CC) -shared
ifdef SO_MAJOR_VERSION
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
index bae96bf18fb..affa9bb7ab8 100644
--- a/src/backend/libpq/pqcomm.c
+++ b/src/backend/libpq/pqcomm.c
@@ -683,16 +683,6 @@ StreamConnection(pgsocket server_fd, Port *port)
return STATUS_ERROR;
}
-#ifdef SCO_ACCEPT_BUG
-
- /*
- * UnixWare 7+ and OpenServer 5.0.4 are known to have this bug, but it
- * shouldn't hurt to catch it for all versions of those platforms.
- */
- if (port->raddr.addr.ss_family == 0)
- port->raddr.addr.ss_family = AF_UNIX;
-#endif
-
/* fill in the server (local) address */
port->laddr.salen = sizeof(port->laddr.addr);
if (getsockname(port->sock,
diff --git a/src/backend/port/dynloader/sco.c b/src/backend/port/dynloader/sco.c
deleted file mode 100644
index 1e24f494ac9..00000000000
--- a/src/backend/port/dynloader/sco.c
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * src/backend/port/dynloader/sco.c
- *
- * Dummy file used for nothing at this point
- *
- * see sco.h
- */
diff --git a/src/backend/port/dynloader/sco.h b/src/backend/port/dynloader/sco.h
deleted file mode 100644
index 86f23837295..00000000000
--- a/src/backend/port/dynloader/sco.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * sco.h
- * port-specific prototypes for SCO 3.2v5.2
- *
- *
- * Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
- * Portions Copyright (c) 1994, Regents of the University of California
- *
- * src/backend/port/dynloader/sco.h
- *
- *-------------------------------------------------------------------------
- */
-#ifndef PORT_PROTOS_H
-#define PORT_PROTOS_H
-
-#include <dlfcn.h>
-#include "utils/dynamic_loader.h" /* pgrminclude ignore */
-
-/*
- * Dynamic Loader on SCO 3.2v5.0.2
- *
- * this dynamic loader uses the system dynamic loading interface for shared
- * libraries (ie. dlopen/dlsym/dlclose). The user must specify a shared
- * library as the file to be dynamically loaded.
- */
-
-/*
- * In some older systems, the RTLD_NOW flag isn't defined and the mode
- * argument to dlopen must always be 1. The RTLD_GLOBAL flag is wanted
- * if available, but it doesn't exist everywhere.
- * If it doesn't exist, set it to 0 so it has no effect.
- */
-#ifndef RTLD_NOW
-#define RTLD_NOW 1
-#endif
-#ifndef RTLD_GLOBAL
-#define RTLD_GLOBAL 0
-#endif
-
-#define pg_dlopen(f) dlopen((f), RTLD_NOW | RTLD_GLOBAL)
-#define pg_dlsym dlsym
-#define pg_dlclose dlclose
-#define pg_dlerror dlerror
-
-#endif /* PORT_PROTOS_H */
diff --git a/src/backend/port/dynloader/unixware.c b/src/backend/port/dynloader/unixware.c
deleted file mode 100644
index afb36dfe99f..00000000000
--- a/src/backend/port/dynloader/unixware.c
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * src/backend/port/dynloader/unixware.c
- *
- * Dummy file used for nothing at this point
- *
- * see unixware.h
- */
diff --git a/src/backend/port/dynloader/unixware.h b/src/backend/port/dynloader/unixware.h
deleted file mode 100644
index 130a9a25d58..00000000000
--- a/src/backend/port/dynloader/unixware.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * src/backend/port/dynloader/unixware.h
- *
- *-------------------------------------------------------------------------
- *
- * unixware.h
- * port-specific prototypes for Intel x86/UNIXWARE 7
- *
- *
- * Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
- * Portions Copyright (c) 1994, Regents of the University of California
- *
- * unixware.h,v 1.2 1995/03/17 06:40:18 andrew Exp
- *
- *-------------------------------------------------------------------------
- */
-#ifndef PORT_PROTOS_H
-#define PORT_PROTOS_H
-
-#include <dlfcn.h>
-#include "utils/dynamic_loader.h" /* pgrminclude ignore */
-
-/*
- * Dynamic Loader on UnixWare.
- *
- * this dynamic loader uses the system dynamic loading interface for shared
- * libraries (ie. dlopen/dlsym/dlclose). The user must specify a shared
- * library as the file to be dynamically loaded.
- */
-
-/*
- * In some older systems, the RTLD_NOW flag isn't defined and the mode
- * argument to dlopen must always be 1. The RTLD_GLOBAL flag is wanted
- * if available, but it doesn't exist everywhere.
- * If it doesn't exist, set it to 0 so it has no effect.
- */
-#ifndef RTLD_NOW
-#define RTLD_NOW 1
-#endif
-#ifndef RTLD_GLOBAL
-#define RTLD_GLOBAL 0
-#endif
-
-#define pg_dlopen(f) dlopen((f), RTLD_NOW | RTLD_GLOBAL)
-#define pg_dlsym dlsym
-#define pg_dlclose dlclose
-#define pg_dlerror dlerror
-
-#endif /* PORT_PROTOS_H */
diff --git a/src/include/port/sco.h b/src/include/port/sco.h
deleted file mode 100644
index 30811450c93..00000000000
--- a/src/include/port/sco.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * src/include/port/sco.h
- *
- * see src/backend/libpq/pqcomm.c */
-#define SCO_ACCEPT_BUG
-
-#define USE_UNIVEL_CC
diff --git a/src/include/port/unixware.h b/src/include/port/unixware.h
deleted file mode 100644
index e068820957e..00000000000
--- a/src/include/port/unixware.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * src/include/port/unixware.h
- *
- * see src/backend/libpq/pqcomm.c */
-#define SCO_ACCEPT_BUG
-
-/***************************************
- * Define this if you are compiling with
- * the native UNIXWARE C compiler.
- ***************************************/
-#define USE_UNIVEL_CC
diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
index 7aad2de43d0..3fe29cede65 100644
--- a/src/include/storage/s_lock.h
+++ b/src/include/storage/s_lock.h
@@ -706,29 +706,6 @@ typedef unsigned char slock_t;
#if !defined(HAS_TEST_AND_SET) /* We didn't trigger above, let's try here */
-#if defined(USE_UNIVEL_CC) /* Unixware compiler */
-#define HAS_TEST_AND_SET
-
-typedef unsigned char slock_t;
-
-#define TAS(lock) tas(lock)
-
-asm int
-tas(volatile slock_t *s_lock)
-{
-/* UNIVEL wants %mem in column 1, so we don't pgindent this file */
-%mem s_lock
- pushl %ebx
- movl s_lock, %ebx
- movl $255, %eax
- lock
- xchgb %al, (%ebx)
- popl %ebx
-}
-
-#endif /* defined(USE_UNIVEL_CC) */
-
-
#if defined(__hppa) || defined(__hppa__) /* HP PA-RISC, GCC and HP compilers */
/*
* HP's PA-RISC
diff --git a/src/makefiles/Makefile.sco b/src/makefiles/Makefile.sco
deleted file mode 100644
index 993861570ac..00000000000
--- a/src/makefiles/Makefile.sco
+++ /dev/null
@@ -1,13 +0,0 @@
-AROPT = cr
-export_dynamic = -Wl,-Bexport
-
-DLSUFFIX = .so
-ifeq ($(GCC), yes)
-CFLAGS_SL = -fpic
-else
-CFLAGS_SL = -K PIC
-endif
-
-# Rule for building a shared library from a single .o file
-%.so: %.o
- $(LD) -G -Bdynamic -o $@ $<
diff --git a/src/makefiles/Makefile.unixware b/src/makefiles/Makefile.unixware
deleted file mode 100644
index a52717b2688..00000000000
--- a/src/makefiles/Makefile.unixware
+++ /dev/null
@@ -1,35 +0,0 @@
-AROPT = crs
-ifeq ($(with_gnu_ld), yes)
- export_dynamic = -Wl,-E
-else
- export_dynamic = -Wl,-Bexport
-endif
-
-ifeq ($(ld_R_works), yes)
-ifeq ($(with_gnu_ld), yes)
- rpath = -Wl,-rpath,'$(rpathdir)'
-else
- rpath = -Wl,-R'$(rpathdir)'
-endif
-endif
-
-# Unixware needs threads for everything that uses libpq
-CFLAGS += $(PTHREAD_CFLAGS)
-
-DLSUFFIX = .so
-ifeq ($(GCC), yes)
-CFLAGS_SL = -fpic
-else
-CFLAGS_SL = -K PIC
-endif
-ifeq ($(GCC), yes)
-SO_FLAGS = -shared
-else
-SO_FLAGS = -G
-endif
-
-# Rule for building a shared library from a single .o file
-%.so: %.o
- $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) $(SO_FLAGS) -o $@ $<
-
-sqlmansect = 5sql
diff --git a/src/port/getrusage.c b/src/port/getrusage.c
index a6f1ef2681e..d24af923394 100644
--- a/src/port/getrusage.c
+++ b/src/port/getrusage.c
@@ -18,7 +18,6 @@
#include "rusagestub.h"
/* This code works on:
- * sco
* solaris_i386
* solaris_sparc
* hpux 9.*
diff --git a/src/template/sco b/src/template/sco
deleted file mode 100644
index 9a736da8be7..00000000000
--- a/src/template/sco
+++ /dev/null
@@ -1 +0,0 @@
-CC="$CC -b elf"
diff --git a/src/template/unixware b/src/template/unixware
deleted file mode 100644
index d08fca1e6be..00000000000
--- a/src/template/unixware
+++ /dev/null
@@ -1,41 +0,0 @@
-if test "$GCC" != yes; then
- # The -Kno_host is for a bug in the compiler. See -hackers
- # discussion on 7-8/Aug/2003.
- cat >conftest.c <<__EOF__
-extern char *strcpy(char *, const char *);
-
-static void f(char *p, int n){
- strcpy(p+n,"");
-}
-void g(void){
- f(0, 0);
-}
-__EOF__
-
- # Debugging and optimization are mutually exclusive
- if test "$enable_debug" != yes; then
- CFLAGS="-O"
- fi
- if $CC -c -O -Kinline conftest.c >conftest.err 2>&1; then
- CFLAGS="$CFLAGS -Kinline"
- else
- CFLAGS="$CFLAGS -Kinline,no_host"
- fi
- rm -f conftest.*
-
- PTHREAD_CFLAGS="-Kpthread"
-
-# The effect of doing threading for the backend does not work
-# because of a threading bug that appears in the regression tests:
-#
-# in make check, the plpgsql test (plpgsql.sql)
-# set statement_timeout to 1000;
-# select blockme();
-# reset statement_timeout;
-#
-# per report from Olivier PRENANT <ohp@pyrenet.fr>
-
-fi
-
-# Unixware's ldap library reportedly needs these too
-EXTRA_LDAP_LIBS="-llber -lresolv"