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.

20 files changed, 6 insertions, 93 deletions

diff --git a/src/template/aix b/src/template/aix
index 8b81c6e154..75cd678a28 100644
--- a/src/template/aix
+++ b/src/template/aix
@@ -1,23 +1,16 @@
-AROPT=crs
-DLSUFFIX=.so
-
 if test "$GCC" = yes ; then
   CFLAGS=-pipe
   CXXFLAGS=-pipe
-  SHARED_LIB=-lc
 else # not GCC
   case $host_os in
     aix3.2.5)
       CFLAGS='-qchars=signed -qmaxmem=8192 -qhalt=w -qsrcmsg'
-      SHARED_LIB='-e _nostart -lc'
       ;;
     aix4.1)
       CFLAGS='-qchars=signed -qmaxmem=8192 -qhalt=w -qsrcmsg -qcheck=divzero'
-      SHARED_LIB='-bnoentry -lc'
       ;;
     aix4.2 | aix4.3)
       CFLAGS='-qmaxmem=16384 -qhalt=w -qsrcmsg -qlanglvl=extended -qlonglong'
-      SHARED_LIB='-lc'
       ;;
   esac
 fi # not GCC
diff --git a/src/template/beos b/src/template/beos
index 9375b3aa66..c435200929 100644
--- a/src/template/beos
+++ b/src/template/beos
@@ -1,4 +1 @@
-AROPT=crs
-SHARED_LIB='-fpic -DPIC'
 CFLAGS='-O2'
-DLSUFFIX=.so
diff --git a/src/template/bsdi b/src/template/bsdi
index 1ea345595e..d6698e7772 100644
--- a/src/template/bsdi
+++ b/src/template/bsdi
@@ -1,4 +1,3 @@
-AROPT=cq
 CFLAGS='-O2 -pipe'
 
 case $host_cpu in
@@ -11,12 +10,6 @@ esac
 
 case $host_os in
   bsdi2.0 | bsdi2.1 | bsdi3*)
-    SHARED_LIB=
-    DLSUFFIX=.o
     CC=gcc2
     ;;
-  *)
-    SHARED_LIB=-fpic
-    DLSUFFIX=.so
-    ;;
 esac
diff --git a/src/template/dgux b/src/template/dgux
index c086419841..7abc138a9f 100644
--- a/src/template/dgux
+++ b/src/template/dgux
@@ -1,4 +1 @@
-AROPT=crs
 CFLAGS=
-SHARED_LIB=-fpic
-DLSUFFIX=.so
diff --git a/src/template/freebsd b/src/template/freebsd
index ba10deb6b2..c3706a6517 100644
--- a/src/template/freebsd
+++ b/src/template/freebsd
@@ -1,4 +1 @@
-AROPT=cq
-SHARED_LIB='-fpic -DPIC'
 CFLAGS='-O2 -m486 -pipe'
-DLSUFFIX=.so
diff --git a/src/template/hpux b/src/template/hpux
index 91057f3c91..2c3754ef7d 100644
--- a/src/template/hpux
+++ b/src/template/hpux
@@ -1,14 +1,8 @@
-AROPT=crs
-DLSUFFIX=.sl
-
 if test "$GCC" = yes ; then
   CFLAGS=-O2
-  SHARED_LIB=-fPIC
-  DL_LIB=/usr/lib/libdld.sl
   CCC=g++
 else
   CFLAGS=-Ae
-  SHARED_LIB=+z
   CPP='cc -E -Ae'
   CCC=aCC
 fi
diff --git a/src/template/irix5 b/src/template/irix5
index c1652186c4..7abc138a9f 100644
--- a/src/template/irix5
+++ b/src/template/irix5
@@ -1,4 +1 @@
-AROPT=crs
 CFLAGS=
-SHARED_LIB=
-DLSUFFIX=.so
diff --git a/src/template/linux b/src/template/linux
index 0c2d660194..02371c1d04 100644
--- a/src/template/linux
+++ b/src/template/linux
@@ -1,7 +1,4 @@
-AROPT=crs
 CFLAGS=-O2
-SHARED_LIB=-fpic
-DLSUFFIX=.so
 
 case $host_cpu in
   mips*)   CFLAGS="$CFLAGS -mips2";;
diff --git a/src/template/netbsd b/src/template/netbsd
index 38fa1df795..bfbcbdd597 100644
--- a/src/template/netbsd
+++ b/src/template/netbsd
@@ -1,4 +1 @@
-AROPT=cq
-SHARED_LIB='-fpic -DPIC'
 CFLAGS='-O2 -pipe'
-DLSUFFIX=.so
diff --git a/src/template/openbsd b/src/template/openbsd
index 38fa1df795..bfbcbdd597 100644
--- a/src/template/openbsd
+++ b/src/template/openbsd
@@ -1,4 +1 @@
-AROPT=cq
-SHARED_LIB='-fpic -DPIC'
 CFLAGS='-O2 -pipe'
-DLSUFFIX=.so
diff --git a/src/template/osf b/src/template/osf
index aa1a84317b..f41a0557d6 100644
--- a/src/template/osf
+++ b/src/template/osf
@@ -1,21 +1,9 @@
-AROPT=crs
-
-# NOFIXADE disallows unaligned access.
-#   on Ultrix and OSF/1 it invokes an explicit syscall.
-#   on HP-UX it turns off certain compiler options.
-# This is defined here because a bunch of clients include tmp/c.h,
-# which is where the work is done on HP-UX.  It only affects the
-# backend on Ultrix and OSF/1.
-
 if test "$GCC" = yes ; then
-  CFLAGS='-D__alpha__ -DNOFIXADE'
+  CFLAGS=
   CCC=g++
 else
-  CFLAGS='-D__alpha__ -DNOFIXADE -std -O4 -Olimit 2000'
-  LDFLAGS='-rpath $(libdir)'
+  CC="$CC -std"
+  CFLAGS='-O4 -Olimit 2000'
   CCC=cxx
-  CXXFLAGS='-D__alpha__ -DNOFIXADE -O4 -Olimit 2000'
+  CXXFLAGS='-O4 -Olimit 2000'
 fi
-
-DLSUFFIX=.so
-SHARED_LIB=
diff --git a/src/template/qnx4 b/src/template/qnx4
index 001f1715c9..cea09e25ee 100644
--- a/src/template/qnx4
+++ b/src/template/qnx4
@@ -1,6 +1,3 @@
-AROPT=cr
 CFLAGS=
 LIBS=-lunix
-SHARED_LIB=
-DLSUFFIX=.so
 CXXFLAGS=-I/usr/local/lib/gcc-lib/i386-pc-qnx4/egcs-2.91.60/include/g++
diff --git a/src/template/sco b/src/template/sco
index 8de1c8c271..8b3a7bf0b7 100644
--- a/src/template/sco
+++ b/src/template/sco
@@ -1,5 +1,2 @@
-AROPT=cq
 CFLAGS=
-SHARED_LIB='-K PIC'
-DLSUFFIX=.so
 CC="$CC -b elf"
diff --git a/src/template/solaris b/src/template/solaris
index d77bec50b2..33d40cfb87 100644
--- a/src/template/solaris
+++ b/src/template/solaris
@@ -1,11 +1,6 @@
-AROPT=crs
-DLSUFFIX=.so
-
 if test "$GCC" = yes ; then
   CFLAGS=
-  SHARED_LIB=-fPIC
 else
   CC="$CC -Xa"			# relaxed ISO C mode
   CFLAGS=-v			# -v is like gcc -Wall
-  SHARED_LIB=-KPIC
 fi
diff --git a/src/template/sunos4 b/src/template/sunos4
index 6c26fabf29..7abc138a9f 100644
--- a/src/template/sunos4
+++ b/src/template/sunos4
@@ -1,10 +1 @@
-AROPT=cr
-DLSUFFIX=.so
-
-if test "$GCC" = yes ; then
-  CFLAGS=
-  SHARED_LIB=-fPIC
-else
-  CFLAGS=
-  SHARED_LIB=-PIC
-fi
+CFLAGS=
diff --git a/src/template/svr4 b/src/template/svr4
index c1652186c4..7abc138a9f 100644
--- a/src/template/svr4
+++ b/src/template/svr4
@@ -1,4 +1 @@
-AROPT=crs
 CFLAGS=
-SHARED_LIB=
-DLSUFFIX=.so
diff --git a/src/template/ultrix4 b/src/template/ultrix4
index d708414ec4..7abc138a9f 100644
--- a/src/template/ultrix4
+++ b/src/template/ultrix4
@@ -1,4 +1 @@
-AROPT=crs
-CFLAGS=-DNOFIXADE
-SHARED_LIB='-G 0'
-DLSUFFIX=.so
+CFLAGS=
diff --git a/src/template/univel b/src/template/univel
index 8bc70f1ae9..025fbda7bf 100644
--- a/src/template/univel
+++ b/src/template/univel
@@ -1,5 +1,2 @@
-AROPT=crs
 CFLAGS='-v -O -K i486,host,inline,loop_unroll -Dsvr4'
-SHARED_LIB='-K PIC'
-DLSUFFIX=.so
 LIBS=-lc89 
diff --git a/src/template/unixware b/src/template/unixware
index 989285e8fc..a7e715bdc3 100644
--- a/src/template/unixware
+++ b/src/template/unixware
@@ -1,6 +1,3 @@
-AROPT=crs
 CFLAGS='-O -K host,inline,loop_unroll,alloca -Dsvr4'
-SHARED_LIB='-K PIC'
 SRCH_INC='/opt/include'
 SRCH_LIB='/opt/lib'
-DLSUFFIX=.so
diff --git a/src/template/win b/src/template/win
index d5734c0a8a..fb2f10ea92 100644
--- a/src/template/win
+++ b/src/template/win
@@ -1,6 +1,4 @@
-AROPT=crs
 CFLAGS=-O2
 SRCH_INC=/usr/local/include
 SRCH_LIB=/usr/local/lib
-DLSUFFIX=.dll
 LIBS=-lcygipc