Move DLSUFFIX, AROPT, and CFLAGS_SL settings from template to

Makefile.port, since they are of no use to configure and much of the
library magic happens in Makefile.port anyway.

Use __alpha, not __alpha__, since the former is universally available.
Remove -DNOFIXADE from the compile command line and put it in the port
include file.

Author: petere

configure

@@ -115,16 +115,15 @@ AC_LINK_FILES([src/makefiles/Makefile.${template}], [src/Makefile.port])
 # Pick right test-and-set (TAS) code.  Most platforms have inline
 # assembler code in src/include/storage/s_lock.h, so we just use
 # a dummy file here.
-tas_file=dummy.s
-need_tas=no
 case $host in
   *-*-hpux*)        need_tas=yes; tas_file=hpux.s ;;
   sparc-*-solaris*) need_tas=yes; tas_file=solaris_sparc.s ;;
   i?86-*-solaris)   need_tas=yes; tas_file=solaris_i386.s ;;
+  *)                need_tas=no;  tas_file=dummy.s ;;
 esac
+AC_LINK_FILES([src/backend/port/tas/${tas_file}], [src/backend/port/tas.s])
 
 if test "$need_tas" = yes ; then
-  AC_LINK_FILES([src/backend/port/tas/${tas_file}], [src/backend/port/tas.s])
   TAS=tas.o
 fi
 AC_SUBST(TAS)
@@ -249,12 +248,7 @@ AC_PROG_CC_WORKS
 AC_EXEEXT
 AC_PROG_CPP
 AC_PROG_GCC_TRADITIONAL
-
 AC_SUBST(GCC)
-AC_SUBST(AROPT)
-AC_SUBST(SHARED_LIB)
-AC_SUBST(DLSUFFIX)
-AC_SUBST(DL_LIB)
 
 # Create compiler version string
 if test x"$GCC" = x"yes" ; then

configure.in

@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.102 2000/10/20 23:57:33 petere Exp $
+# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.103 2000/10/21 22:36:11 petere Exp $
 
 #------------------------------------------------------------------------------
 # All PostgreSQL makefiles include this file and use the variables it sets,
@@ -137,7 +137,6 @@ override CPPFLAGS += $(sort -I$(top_srcdir)/src/include -I$(top_builddir)/src/in
 CC = @CC@
 GCC = @GCC@
 CFLAGS = @CFLAGS@
-CFLAGS_SL = @SHARED_LIB@
 ifeq ($(GCC), yes)
   CFLAGS += -Wall -Wmissing-prototypes -Wmissing-declarations
 endif
@@ -158,15 +157,13 @@ FLEXFLAGS = @FLEXFLAGS@ $(LFLAGS)
 
 # Linking
 
-AROPT = @AROPT@
 LIBS = @LIBS@
 LD = @LD@
 with_gnu_ld = @with_gnu_ld@
 LDFLAGS = @LDFLAGS@ $(LIBS)
 KRB_LIBS = @KRB_LIBS@
 LDREL = -r
 LDOUT = -o
-DLSUFFIX = @DLSUFFIX@
 RANLIB = @RANLIB@
 LORDER = @LORDER@
 X = @EXEEXT@

src/Makefile.global.in

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.32 2000/10/07 14:39:07 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.33 2000/10/21 22:36:11 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,7 +17,7 @@
 #include <pwd.h>
 #include <unistd.h>
 
-#if defined(__alpha__) && !defined(linux)
+#if defined(__alpha) && !defined(linux)
 #include <sys/sysinfo.h>
 #include "machine/hal_sysinfo.h"
 #define ASSEMBLER
@@ -43,7 +43,7 @@ main(int argc, char *argv[])
 {
 	int			len;
 
-#if defined(__alpha__)
+#if defined(__alpha)
 #ifdef NOFIXADE
 	int			buffer[] = {SSIN_UACPROC, UAC_SIGBUS};
 
@@ -71,7 +71,7 @@ main(int argc, char *argv[])
 	syscall(SYS_sysmips, MIPS_FIXADE, 0, NULL, NULL, NULL);
 #endif
 
-#if defined(__alpha__)
+#if defined(__alpha)
 	if (setsysinfo(SSI_NVPAIRS, buffer, 1, (caddr_t) NULL,
 				   (unsigned long) NULL) < 0)
 		elog(NOTICE, "setsysinfo failed: %d\n", errno);

src/backend/main/main.c

@@ -1,12 +1,8 @@
+#define NOFIXADE
 #define USE_POSIX_TIME
 #define DISABLE_XOPEN_NLS
 #define HAS_TEST_AND_SET
 /*#include <sys/mman.h>*/			/* for msemaphore */
 /*typedef msemaphore slock_t;*/
 #include <alpha/builtins.h>
 typedef volatile long slock_t;
-
-/* some platforms define __alpha, but not __alpha__ */
-#if defined(__alpha) && !defined(__alpha__)
-#define __alpha__
-#endif

src/include/port/osf.h

@@ -1,3 +1,4 @@
+#define NOFIXADE
 #define USE_POSIX_TIME
 #define NEED_STRDUP
 

src/include/port/ultrix4.h

@@ -4,6 +4,19 @@ MAKE_EXPORTS= true
 
 RANLIB= touch
 MK_NO_LORDER= true
+AROPT = crs
+
+DLSUFFIX = .so
+ifneq ($(GCC), yes)
+  ifeq ($(host_os), aix3.2.5)
+    CFLAGS_SL = -e _nostart
+  endif
+  ifeq ($(host_os), aix4.1)
+    CFLAGS_SL = -bnoentry
+  endif
+endif
+CFLAGS_SL += -lc
+
 
 EXPSUFF= .exp
 IMPSUFF= .imp

src/makefiles/Makefile.aix

@@ -1,7 +1,13 @@
 MK_NO_LORDER=true
+AROPT = crs
+
 ifdef ELF_SYSTEM
 export_dynamic = -Wl,-E
 endif
+
+DLSUFFIX = .so
+CFLAGS_SL = -fpic -DPIC
+
 %.so: %.o
 	ln -fs $(top_srcdir)/src/backend/postgres _APP_
 	$(CC) -nostart -Xlinker -soname=$@ -o $@ _APP_ $<

src/makefiles/Makefile.beos

@@ -1,8 +1,22 @@
-# for bsdi 4.0 ELF
-# if we defined .so in template/bsdi_4.0
+AROPT = cq
+
+# bsdi 4.0 and later is ELF
+DLSUFFIX = .so
+ifeq ($(host_os), bsdi2.0)
+DLSUFFIX = .o
+endif
+ifeq ($(host_os), bsdi2.1)
+DLSUFFIX = .o
+endif
+ifeq ($(findstring bsdi3, $(host_os)), bsdi3)
+DLSUFFIX = .o
+endif
 
 ifeq ($(DLSUFFIX), .so)
+CFLAGS_SL = -fpic
 export_dynamic = -export-dynamic
+else
+CFLAGS_SL =
 endif
 
 %.so: %.o

src/makefiles/Makefile.bsdi

@@ -1,2 +1,6 @@
+AROPT = crs
+DLSUFFIX = .so
+CFLAGS_SL = -fpic
+
 %.so: %.o
 	$(CC) -shared -o $@ $<