Merge from PG master upto d5cb3bab564e0927ffac7c8729eacf181a12dd40

This is the result of the "git merge remotes/PGSQL/master" upto the said commit
point. We have done some basic analysis, fixed compilation problems etc, but
bulk of the logical problems in conflict resolution etc will be handled by
subsequent commits.

5 files changed, 17 insertions, 46 deletions

diff --git a/src/template/darwin b/src/template/darwin
index 542f706b0f..ea6d3b0b04 100644
--- a/src/template/darwin
+++ b/src/template/darwin
@@ -1,9 +1,12 @@
 # src/template/darwin
 
-# Select appropriate semaphore support.  Darwin 6.0 (Mac OS X 10.2) and up
-# support System V semaphores; before that we have to use POSIX semaphores,
-# which are less good for our purposes because they eat a file descriptor
-# per backend per max_connection slot.
+# Note: Darwin is the original code name for macOS, also known as OS X.
+# We still use "darwin" as the port name, partly because config.guess does.
+
+# Select appropriate semaphore support.  Darwin 6.0 (macOS 10.2) and up
+# support System V semaphores; before that we have to use named POSIX
+# semaphores, which are less good for our purposes because they eat a
+# file descriptor per backend per max_connection slot.
 case $host_os in
   darwin[015].*)
     USE_NAMED_POSIX_SEMAPHORES=1
diff --git a/src/template/freebsd b/src/template/freebsd
index 772e2f1a5f..a82d5a494c 100644
--- a/src/template/freebsd
+++ b/src/template/freebsd
@@ -1 +1,6 @@
 # src/template/freebsd
+
+# Prefer unnamed POSIX semaphores if available, unless user overrides choice
+if test x"$PREFERRED_SEMAPHORES" = x"" ; then
+  PREFERRED_SEMAPHORES=UNNAMED_POSIX
+fi
diff --git a/src/template/linux b/src/template/linux
index 3eb5ad2428..f820bf7280 100644
--- a/src/template/linux
+++ b/src/template/linux
@@ -1,5 +1,10 @@
 # src/template/linux
 
+# Prefer unnamed POSIX semaphores if available, unless user overrides choice
+if test x"$PREFERRED_SEMAPHORES" = x"" ; then
+  PREFERRED_SEMAPHORES=UNNAMED_POSIX
+fi
+
 # Force _GNU_SOURCE on; plperl is broken with Perl 5.8.0 otherwise
 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 
diff --git a/src/template/sco b/src/template/sco
deleted file mode 100644
index 9a736da8be..0000000000
--- 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 d08fca1e6b..0000000000
--- 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"