From 3eec6ee145976fe0fcecc0199e179d90178daa6d Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Sat, 15 Jul 2000 15:54:52 +0000 Subject: Rename templates to match names in makefiles/Makefile.* and include/port. Read templates after compiler is detected. Convert all templates to real shell scripts. Rename bsd->openbsd, alpha->osf. --- src/include/port/alpha.h | 10 ---------- src/include/port/bsd.h | 45 ------------------------------------------ src/include/port/openbsd.h | 45 ++++++++++++++++++++++++++++++++++++++++++ src/include/port/osf.h | 10 ++++++++++ src/makefiles/Makefile.alpha | 2 -- src/makefiles/Makefile.bsd | 16 --------------- src/makefiles/Makefile.openbsd | 16 +++++++++++++++ src/makefiles/Makefile.osf | 2 ++ src/template/.similar | 34 ------------------------------- src/template/aix | 23 +++++++++++++++++++++ src/template/aix_325 | 8 -------- src/template/aix_41 | 8 -------- src/template/aix_42 | 8 -------- src/template/aix_gcc | 9 --------- src/template/alpha_cc | 17 ---------------- src/template/alpha_gcc | 14 ------------- src/template/bsdi | 22 +++++++++++++++++++++ src/template/bsdi_2.0 | 8 -------- src/template/bsdi_2.1 | 8 -------- src/template/bsdi_4.0 | 8 -------- src/template/bsdi_4.0_sparc | 8 -------- src/template/cygwin32 | 8 -------- src/template/dgux | 12 ++++------- src/template/freebsd | 10 ++++------ src/template/generic | 7 ------- src/template/hpux | 14 +++++++++++++ src/template/hpux_cc | 11 ----------- src/template/hpux_gcc | 10 ---------- src/template/irix5 | 11 ++++------- src/template/linux | 9 +++++++++ src/template/linux_alpha | 9 --------- src/template/linux_arm | 7 ------- src/template/linux_i386 | 7 ------- src/template/linux_m68k | 7 ------- src/template/linux_mips | 7 ------- src/template/linux_ppc | 7 ------- src/template/linux_sparc | 7 ------- src/template/netbsd | 10 ++++------ src/template/nextstep | 11 ++++------- src/template/openbsd | 10 ++++------ src/template/osf | 21 ++++++++++++++++++++ src/template/qnx | 9 --------- src/template/qnx4 | 6 ++++++ src/template/sco | 13 +++++------- src/template/solaris_i386 | 11 +++++++++++ src/template/solaris_i386_cc | 8 -------- src/template/solaris_i386_gcc | 7 ------- src/template/solaris_sparc | 10 ++++++++++ src/template/solaris_sparc_cc | 8 -------- src/template/solaris_sparc_gcc | 7 ------- src/template/sunos4 | 10 ++++++++++ src/template/sunos4_cc | 8 -------- src/template/sunos4_gcc | 7 ------- src/template/svr4 | 11 ++++------- src/template/ultrix4 | 11 ++++------- src/template/univel | 13 +++++------- src/template/unixware | 13 ++++++------ src/template/win | 6 ++++++ 58 files changed, 253 insertions(+), 421 deletions(-) delete mode 100644 src/include/port/alpha.h delete mode 100644 src/include/port/bsd.h create mode 100644 src/include/port/openbsd.h create mode 100644 src/include/port/osf.h delete mode 100644 src/makefiles/Makefile.alpha delete mode 100644 src/makefiles/Makefile.bsd create mode 100644 src/makefiles/Makefile.openbsd create mode 100644 src/makefiles/Makefile.osf delete mode 100644 src/template/.similar create mode 100644 src/template/aix delete mode 100644 src/template/aix_325 delete mode 100644 src/template/aix_41 delete mode 100644 src/template/aix_42 delete mode 100644 src/template/aix_gcc delete mode 100644 src/template/alpha_cc delete mode 100644 src/template/alpha_gcc create mode 100644 src/template/bsdi delete mode 100644 src/template/bsdi_2.0 delete mode 100644 src/template/bsdi_2.1 delete mode 100644 src/template/bsdi_4.0 delete mode 100644 src/template/bsdi_4.0_sparc delete mode 100644 src/template/cygwin32 delete mode 100644 src/template/generic create mode 100644 src/template/hpux delete mode 100644 src/template/hpux_cc delete mode 100644 src/template/hpux_gcc create mode 100644 src/template/linux delete mode 100644 src/template/linux_alpha delete mode 100644 src/template/linux_arm delete mode 100644 src/template/linux_i386 delete mode 100644 src/template/linux_m68k delete mode 100644 src/template/linux_mips delete mode 100755 src/template/linux_ppc delete mode 100644 src/template/linux_sparc create mode 100644 src/template/osf delete mode 100644 src/template/qnx create mode 100644 src/template/qnx4 create mode 100644 src/template/solaris_i386 delete mode 100644 src/template/solaris_i386_cc delete mode 100644 src/template/solaris_i386_gcc create mode 100644 src/template/solaris_sparc delete mode 100644 src/template/solaris_sparc_cc delete mode 100644 src/template/solaris_sparc_gcc create mode 100644 src/template/sunos4 delete mode 100644 src/template/sunos4_cc delete mode 100644 src/template/sunos4_gcc create mode 100644 src/template/win (limited to 'src') diff --git a/src/include/port/alpha.h b/src/include/port/alpha.h deleted file mode 100644 index 90c5a8af6c..0000000000 --- a/src/include/port/alpha.h +++ /dev/null @@ -1,10 +0,0 @@ -#define USE_POSIX_TIME -#define DISABLE_XOPEN_NLS -#define HAS_TEST_AND_SET -#include /* for msemaphore */ -typedef msemaphore slock_t; - -/* some platforms define __alpha, but not __alpha__ */ -#if defined(__alpha) && !defined(__alpha__) -#define __alpha__ -#endif diff --git a/src/include/port/bsd.h b/src/include/port/bsd.h deleted file mode 100644 index dc01930325..0000000000 --- a/src/include/port/bsd.h +++ /dev/null @@ -1,45 +0,0 @@ -#define USE_POSIX_TIME - -#if defined(__i386__) -#define NEED_I386_TAS_ASM -#define HAS_TEST_AND_SET -#endif - -#if defined(__sparc__) -#define NEED_SPARC_TAS_ASM -#define HAS_TEST_AND_SET -#endif - -#if defined(__vax__) -#define NEED_VAX_TAS_ASM -#define HAS_TEST_AND_SET -#endif - -#if defined(__ns32k__) -#define NEED_NS32K_TAS_ASM -#define HAS_TEST_AND_SET -#endif - -#if defined(__m68k__) -#define HAS_TEST_AND_SET -#endif - -#if defined(__arm__) -#define HAS_TEST_AND_SET -#endif - -#if defined(__mips__) -/* # undef HAS_TEST_AND_SET */ -#endif - -#if defined(__powerpc__) -#define HAS_TEST_AND_SET -#endif - -#if defined(__powerpc__) -typedef unsigned int slock_t; - -#else -typedef unsigned char slock_t; - -#endif diff --git a/src/include/port/openbsd.h b/src/include/port/openbsd.h new file mode 100644 index 0000000000..dc01930325 --- /dev/null +++ b/src/include/port/openbsd.h @@ -0,0 +1,45 @@ +#define USE_POSIX_TIME + +#if defined(__i386__) +#define NEED_I386_TAS_ASM +#define HAS_TEST_AND_SET +#endif + +#if defined(__sparc__) +#define NEED_SPARC_TAS_ASM +#define HAS_TEST_AND_SET +#endif + +#if defined(__vax__) +#define NEED_VAX_TAS_ASM +#define HAS_TEST_AND_SET +#endif + +#if defined(__ns32k__) +#define NEED_NS32K_TAS_ASM +#define HAS_TEST_AND_SET +#endif + +#if defined(__m68k__) +#define HAS_TEST_AND_SET +#endif + +#if defined(__arm__) +#define HAS_TEST_AND_SET +#endif + +#if defined(__mips__) +/* # undef HAS_TEST_AND_SET */ +#endif + +#if defined(__powerpc__) +#define HAS_TEST_AND_SET +#endif + +#if defined(__powerpc__) +typedef unsigned int slock_t; + +#else +typedef unsigned char slock_t; + +#endif diff --git a/src/include/port/osf.h b/src/include/port/osf.h new file mode 100644 index 0000000000..90c5a8af6c --- /dev/null +++ b/src/include/port/osf.h @@ -0,0 +1,10 @@ +#define USE_POSIX_TIME +#define DISABLE_XOPEN_NLS +#define HAS_TEST_AND_SET +#include /* for msemaphore */ +typedef msemaphore slock_t; + +/* some platforms define __alpha, but not __alpha__ */ +#if defined(__alpha) && !defined(__alpha__) +#define __alpha__ +#endif diff --git a/src/makefiles/Makefile.alpha b/src/makefiles/Makefile.alpha deleted file mode 100644 index a9e8e948ec..0000000000 --- a/src/makefiles/Makefile.alpha +++ /dev/null @@ -1,2 +0,0 @@ -%.so: %.o - $(LD) -shared -expect_unresolved '*' -o $@ $< diff --git a/src/makefiles/Makefile.bsd b/src/makefiles/Makefile.bsd deleted file mode 100644 index 14ebbfecf3..0000000000 --- a/src/makefiles/Makefile.bsd +++ /dev/null @@ -1,16 +0,0 @@ -ifdef ELF_SYSTEM -LDFLAGS += -Wl,-E -endif -%.so: %.o -ifdef ELF_SYSTEM - $(LD) -x -Bshareable -o $@ $< -else - $(LD) $(LDREL) $(LDOUT) $<.obj -x $< - @echo building shared object $@ - @rm -f $@.pic - @${AR} cq $@.pic `lorder $<.obj | tsort` - ${RANLIB} $@.pic - @rm -f $@ - $(LD) -x -Bshareable -Bforcearchive \ - -o $@ $@.pic -endif diff --git a/src/makefiles/Makefile.openbsd b/src/makefiles/Makefile.openbsd new file mode 100644 index 0000000000..14ebbfecf3 --- /dev/null +++ b/src/makefiles/Makefile.openbsd @@ -0,0 +1,16 @@ +ifdef ELF_SYSTEM +LDFLAGS += -Wl,-E +endif +%.so: %.o +ifdef ELF_SYSTEM + $(LD) -x -Bshareable -o $@ $< +else + $(LD) $(LDREL) $(LDOUT) $<.obj -x $< + @echo building shared object $@ + @rm -f $@.pic + @${AR} cq $@.pic `lorder $<.obj | tsort` + ${RANLIB} $@.pic + @rm -f $@ + $(LD) -x -Bshareable -Bforcearchive \ + -o $@ $@.pic +endif diff --git a/src/makefiles/Makefile.osf b/src/makefiles/Makefile.osf new file mode 100644 index 0000000000..a9e8e948ec --- /dev/null +++ b/src/makefiles/Makefile.osf @@ -0,0 +1,2 @@ +%.so: %.o + $(LD) -shared -expect_unresolved '*' -o $@ $< diff --git a/src/template/.similar b/src/template/.similar deleted file mode 100644 index f19ce14d03..0000000000 --- a/src/template/.similar +++ /dev/null @@ -1,34 +0,0 @@ -# Format of this file is expr-style-regular-expression=templatefilename -alpha[a-z0-9]*-unknown-linux-gnu=linux_alpha -alpha[a-z0-9]*-dec-osf=alpha_cc -arm-unknown-linux-gnu=linux_arm -hppa[0-9.]*-hp-hpux=hpux_cc -hppa1.1-stratus-sysv4=svr4 -i.86-next-nextstep3=nextstep -i.86-pc-bsdi2.0=bsdi_2.0 -i.86-pc-bsdi2.1=bsdi_2.1 -i.86-pc-bsdi3=bsdi_2.1 -i.86-pc-bsdi4=bsdi_4.0 -i.86-pc-cygwin=cygwin32 -i.86-pc-linux-gnu=linux_i386 -i.86-pc-sco3.2v=sco -i.86-pc-solaris=solaris_i386_gcc -i.86-pc-sunos5=solaris_i386_gcc -i.86-unknown-freebsd=freebsd -i.86-unknown-netbsd=netbsd -m68k-unknown-linux=linux_m68k -mips-pc-linux-gnu=linux_mips -mips-sgi-irix=irix5 -mipsel-unknown-linux-gnu=linux_mips -powerpc-ibm-aix3.2.5=aix_325 -powerpc-ibm-aix4.1=aix_41 -powerpc-ibm-aix4.2=aix_42 -powerpc-ibm-aix4.3=aix_42 -powerpc-unknown-linux-gnu=linux_ppc -rs6000-ibm-aix4.2=aix_42 -rs6000-ibm-aix4.3=aix_42 -sparc-sun-solaris=solaris_sparc_gcc -sparc-sun-sunos4=sunos4_gcc -sparc-sun-sunos5=solaris_sparc_gcc -sparc-unknown-bsdi4=bsdi_4.0_sparc -sparc-unknown-linux-gnu=linux_sparc diff --git a/src/template/aix b/src/template/aix new file mode 100644 index 0000000000..8b81c6e154 --- /dev/null +++ b/src/template/aix @@ -0,0 +1,23 @@ +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/aix_325 b/src/template/aix_325 deleted file mode 100644 index 36c468b2b5..0000000000 --- a/src/template/aix_325 +++ /dev/null @@ -1,8 +0,0 @@ -AROPT:crs -CFLAGS:-qchars=signed -qmaxmem=8192 -qhalt=w -qsrcmsg -SHARED_LIB:-e _nostart -lc -ALL: -SRCH_INC: -SRCH_LIB: -DLSUFFIX:.so -CC:xlc diff --git a/src/template/aix_41 b/src/template/aix_41 deleted file mode 100644 index 54f0dd0992..0000000000 --- a/src/template/aix_41 +++ /dev/null @@ -1,8 +0,0 @@ -AROPT:crs -CFLAGS:-qchars=signed -qmaxmem=8192 -qhalt=w -qsrcmsg -qcheck=divzero -SHARED_LIB:-bnoentry -lc -ALL: -SRCH_INC: -SRCH_LIB: -DLSUFFIX:.so -CC:xlc diff --git a/src/template/aix_42 b/src/template/aix_42 deleted file mode 100644 index ff4ad9a689..0000000000 --- a/src/template/aix_42 +++ /dev/null @@ -1,8 +0,0 @@ -AROPT:crs -CFLAGS:-qmaxmem=16384 -qhalt=w -qsrcmsg -qlanglvl=extended -qlonglong -SHARED_LIB:-lc -ALL: -SRCH_INC: -SRCH_LIB: -DLSUFFIX:.so -CC:xlc diff --git a/src/template/aix_gcc b/src/template/aix_gcc deleted file mode 100644 index 3a77172133..0000000000 --- a/src/template/aix_gcc +++ /dev/null @@ -1,9 +0,0 @@ -AROPT:crs -CFLAGS:-pipe -CXXFLAGS:-pipe -SHARED_LIB:-lc -ALL: -SRCH_INC: -SRCH_LIB: -DLSUFFIX:.so -CC:gcc diff --git a/src/template/alpha_cc b/src/template/alpha_cc deleted file mode 100644 index 3ddf1133a0..0000000000 --- a/src/template/alpha_cc +++ /dev/null @@ -1,17 +0,0 @@ -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. -CC:cc -CFLAGS:-D__alpha__ -DNOFIXADE -std -O4 -Olimit 2000 -LDFLAGS='-rpath $(LIBDIR)' -SHARED_LIB: -ALL: -SRCH_INC: -SRCH_LIB: -DLSUFFIX:.so -CCC:cxx -CXXFLAGS:-D__alpha__ -DNOFIXADE -O4 -Olimit 2000 diff --git a/src/template/alpha_gcc b/src/template/alpha_gcc deleted file mode 100644 index 5f53298f71..0000000000 --- a/src/template/alpha_gcc +++ /dev/null @@ -1,14 +0,0 @@ -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. -CC:gcc -CFLAGS:-D__alpha__ -DNOFIXADE -SHARED_LIB: -ALL: -SRCH_INC: -SRCH_LIB: -DLSUFFIX:.so diff --git a/src/template/bsdi b/src/template/bsdi new file mode 100644 index 0000000000..f57663ddb0 --- /dev/null +++ b/src/template/bsdi @@ -0,0 +1,22 @@ +AROPT=cq +CFLAGS='-O2 -pipe' + +case $host_cpu in + i?86) CFLAGS="$CFLAGS -m486";; +esac + +case $host_os in + bsdi2.0) CFLAGS="$CFLAGS -DPRE_BSDI_2_1";; +esac + +case $host_os in + bsdi2.0 | bsdi2.1 | bsdi3) + SHARED_LIB= + DLSUFFIX=.o + CC=gcc2 + ;; + bsdi4) + SHARED_LIB=-fpic + DLSUFFIX=.so + ;; +esac diff --git a/src/template/bsdi_2.0 b/src/template/bsdi_2.0 deleted file mode 100644 index bcef190cf6..0000000000 --- a/src/template/bsdi_2.0 +++ /dev/null @@ -1,8 +0,0 @@ -AROPT:cq -CFLAGS:-O2 -m486 -pipe -DPRE_BSDI_2_1 -SHARED_LIB: -ALL: -SRCH_INC: -SRCH_LIB: -DLSUFFIX:.o -CC:gcc2 diff --git a/src/template/bsdi_2.1 b/src/template/bsdi_2.1 deleted file mode 100644 index 8a15d25aac..0000000000 --- a/src/template/bsdi_2.1 +++ /dev/null @@ -1,8 +0,0 @@ -AROPT:cq -CFLAGS:-O2 -m486 -pipe -SHARED_LIB: -ALL: -SRCH_INC: -SRCH_LIB: -DLSUFFIX:.o -CC:gcc2 diff --git a/src/template/bsdi_4.0 b/src/template/bsdi_4.0 deleted file mode 100644 index 5621715ef4..0000000000 --- a/src/template/bsdi_4.0 +++ /dev/null @@ -1,8 +0,0 @@ -AROPT:cq -CFLAGS:-O2 -m486 -pipe -SHARED_LIB:-fpic -ALL: -SRCH_INC: -SRCH_LIB: -DLSUFFIX:.so -CC:gcc diff --git a/src/template/bsdi_4.0_sparc b/src/template/bsdi_4.0_sparc deleted file mode 100644 index 2c861be120..0000000000 --- a/src/template/bsdi_4.0_sparc +++ /dev/null @@ -1,8 +0,0 @@ -AROPT:cq -CFLAGS:-O2 -pipe -SHARED_LIB:-fpic -ALL: -SRCH_INC: -SRCH_LIB: -DLSUFFIX:.so -CC:gcc diff --git a/src/template/cygwin32 b/src/template/cygwin32 deleted file mode 100644 index be6e4c28cf..0000000000 --- a/src/template/cygwin32 +++ /dev/null @@ -1,8 +0,0 @@ -AROPT:crs -CFLAGS:-O2 -SHARED_LIB: -ALL: -SRCH_INC:/usr/local/include -SRCH_LIB:/usr/local/lib -DLSUFFIX:.dll -LIBS:-lcygipc diff --git a/src/template/dgux b/src/template/dgux index a35179872d..c086419841 100644 --- a/src/template/dgux +++ b/src/template/dgux @@ -1,8 +1,4 @@ -AROPT:crs -CFLAGS: -LIBS:-lsocket -lnsl -SHARED_LIB:-fpic -ALL: -SRCH_INC: -SRCH_LIB: -DLSUFFIX:.so +AROPT=crs +CFLAGS= +SHARED_LIB=-fpic +DLSUFFIX=.so diff --git a/src/template/freebsd b/src/template/freebsd index fd8ae769cd..ba10deb6b2 100644 --- a/src/template/freebsd +++ b/src/template/freebsd @@ -1,6 +1,4 @@ -AROPT:cq -SHARED_LIB:-fpic -DPIC -CFLAGS:-O2 -m486 -pipe -SRCH_INC: -SRCH_LIB: -DLSUFFIX:.so +AROPT=cq +SHARED_LIB='-fpic -DPIC' +CFLAGS='-O2 -m486 -pipe' +DLSUFFIX=.so diff --git a/src/template/generic b/src/template/generic deleted file mode 100644 index 5f8e51d313..0000000000 --- a/src/template/generic +++ /dev/null @@ -1,7 +0,0 @@ -AROPT:crs -CFLAGS: -SHARED_LIB: -ALL: -SRCH_INC: -SRCH_LIB: -DLSUFFIX:.so diff --git a/src/template/hpux b/src/template/hpux new file mode 100644 index 0000000000..bc3ac1ced8 --- /dev/null +++ b/src/template/hpux @@ -0,0 +1,14 @@ +AROPT=crs +DLSUFFIX=.sl + +if test "$GCC" = yes ; then + CFLAGS=-O2 + SHARED_LIB=-fPIC + DL_LIB=/usr/lib/libdld.sl + CCC=g++ +else + CFLAGS='-Wl,-E -Ae' + SHARED_LIB=+z + CPP='cc -E -Ae' + CCC=aCC +fi diff --git a/src/template/hpux_cc b/src/template/hpux_cc deleted file mode 100644 index f1f5eaa07a..0000000000 --- a/src/template/hpux_cc +++ /dev/null @@ -1,11 +0,0 @@ -AROPT:crs -CFLAGS:-Wl,-E -Ae -SHARED_LIB:+z -ALL: -SRCH_INC: -SRCH_LIB: -DLSUFFIX:.sl -CC:cc -CPP:cc -E -Ae -# Make aCC be first C++ compiler name tried... -CCC:aCC diff --git a/src/template/hpux_gcc b/src/template/hpux_gcc deleted file mode 100644 index 4e78d420e7..0000000000 --- a/src/template/hpux_gcc +++ /dev/null @@ -1,10 +0,0 @@ -AROPT:crs -CFLAGS:-O2 -SHARED_LIB:-fPIC -ALL: -SRCH_INC: -SRCH_LIB: -DL_LIB:/usr/lib/libdld.sl -DLSUFFIX:.sl -CC:gcc -CCC:g++ diff --git a/src/template/irix5 b/src/template/irix5 index 5f8e51d313..c1652186c4 100644 --- a/src/template/irix5 +++ b/src/template/irix5 @@ -1,7 +1,4 @@ -AROPT:crs -CFLAGS: -SHARED_LIB: -ALL: -SRCH_INC: -SRCH_LIB: -DLSUFFIX:.so +AROPT=crs +CFLAGS= +SHARED_LIB= +DLSUFFIX=.so diff --git a/src/template/linux b/src/template/linux new file mode 100644 index 0000000000..2c823be7e5 --- /dev/null +++ b/src/template/linux @@ -0,0 +1,9 @@ +AROPT=crs +CFLAGS=-O2 +SHARED_LIB=-fpic +DLSUFFIX=.so + +case $host_cpu in + mips*) CFLAGS="$CFLAGS -mips2";; + alpha*) CPU=alpha;; +esac diff --git a/src/template/linux_alpha b/src/template/linux_alpha deleted file mode 100644 index 93e9be371d..0000000000 --- a/src/template/linux_alpha +++ /dev/null @@ -1,9 +0,0 @@ -AROPT:crs -CFLAGS:-O2 -SHARED_LIB:-fpic -ALL: -SRCH_INC: -SRCH_LIB: -DLSUFFIX:.so -CPU:alpha - diff --git a/src/template/linux_arm b/src/template/linux_arm deleted file mode 100644 index 5abf05c96b..0000000000 --- a/src/template/linux_arm +++ /dev/null @@ -1,7 +0,0 @@ -AROPT:crs -CFLAGS:-O2 -SHARED_LIB:-fpic -ALL: -SRCH_INC: -SRCH_LIB: -DLSUFFIX:.so diff --git a/src/template/linux_i386 b/src/template/linux_i386 deleted file mode 100644 index 5abf05c96b..0000000000 --- a/src/template/linux_i386 +++ /dev/null @@ -1,7 +0,0 @@ -AROPT:crs -CFLAGS:-O2 -SHARED_LIB:-fpic -ALL: -SRCH_INC: -SRCH_LIB: -DLSUFFIX:.so diff --git a/src/template/linux_m68k b/src/template/linux_m68k deleted file mode 100644 index 5abf05c96b..0000000000 --- a/src/template/linux_m68k +++ /dev/null @@ -1,7 +0,0 @@ -AROPT:crs -CFLAGS:-O2 -SHARED_LIB:-fpic -ALL: -SRCH_INC: -SRCH_LIB: -DLSUFFIX:.so diff --git a/src/template/linux_mips b/src/template/linux_mips deleted file mode 100644 index 73e1d73a1f..0000000000 --- a/src/template/linux_mips +++ /dev/null @@ -1,7 +0,0 @@ -AROPT:crs -CFLAGS:-O2 -mips2 -SHARED_LIB:-fpic -ALL: -SRCH_INC: -SRCH_LIB: -DLSUFFIX:.so diff --git a/src/template/linux_ppc b/src/template/linux_ppc deleted file mode 100755 index 5abf05c96b..0000000000 --- a/src/template/linux_ppc +++ /dev/null @@ -1,7 +0,0 @@ -AROPT:crs -CFLAGS:-O2 -SHARED_LIB:-fpic -ALL: -SRCH_INC: -SRCH_LIB: -DLSUFFIX:.so diff --git a/src/template/linux_sparc b/src/template/linux_sparc deleted file mode 100644 index 5abf05c96b..0000000000 --- a/src/template/linux_sparc +++ /dev/null @@ -1,7 +0,0 @@ -AROPT:crs -CFLAGS:-O2 -SHARED_LIB:-fpic -ALL: -SRCH_INC: -SRCH_LIB: -DLSUFFIX:.so diff --git a/src/template/netbsd b/src/template/netbsd index ded2d63231..38fa1df795 100644 --- a/src/template/netbsd +++ b/src/template/netbsd @@ -1,6 +1,4 @@ -AROPT:cq -SHARED_LIB:-fpic -DPIC -CFLAGS:-O2 -pipe -SRCH_INC: -SRCH_LIB: -DLSUFFIX:.so +AROPT=cq +SHARED_LIB='-fpic -DPIC' +CFLAGS='-O2 -pipe' +DLSUFFIX=.so diff --git a/src/template/nextstep b/src/template/nextstep index c3269f2744..c8b14f4d8b 100644 --- a/src/template/nextstep +++ b/src/template/nextstep @@ -1,7 +1,4 @@ -AROPT:rc -CFLAGS: -SHARED_LIB: -ALL: -SRCH_INC: -SRCH_LIB: -DLSUFFIX:.o +AROPT=rc +CFLAGS= +SHARED_LIB= +DLSUFFIX=.o diff --git a/src/template/openbsd b/src/template/openbsd index ded2d63231..38fa1df795 100644 --- a/src/template/openbsd +++ b/src/template/openbsd @@ -1,6 +1,4 @@ -AROPT:cq -SHARED_LIB:-fpic -DPIC -CFLAGS:-O2 -pipe -SRCH_INC: -SRCH_LIB: -DLSUFFIX:.so +AROPT=cq +SHARED_LIB='-fpic -DPIC' +CFLAGS='-O2 -pipe' +DLSUFFIX=.so diff --git a/src/template/osf b/src/template/osf new file mode 100644 index 0000000000..aa1a84317b --- /dev/null +++ b/src/template/osf @@ -0,0 +1,21 @@ +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' + CCC=g++ +else + CFLAGS='-D__alpha__ -DNOFIXADE -std -O4 -Olimit 2000' + LDFLAGS='-rpath $(libdir)' + CCC=cxx + CXXFLAGS='-D__alpha__ -DNOFIXADE -O4 -Olimit 2000' +fi + +DLSUFFIX=.so +SHARED_LIB= diff --git a/src/template/qnx b/src/template/qnx deleted file mode 100644 index ad3ad163f6..0000000000 --- a/src/template/qnx +++ /dev/null @@ -1,9 +0,0 @@ -AROPT:cr -CFLAGS: -LIBS:-lunix -SHARED_LIB: -ALL: -SRCH_INC: -SRCH_LIB: -DLSUFFIX:.so -CXXFLAGS:-I/usr/local/lib/gcc-lib/i386-pc-qnx4/egcs-2.91.60/include/g++ diff --git a/src/template/qnx4 b/src/template/qnx4 new file mode 100644 index 0000000000..001f1715c9 --- /dev/null +++ b/src/template/qnx4 @@ -0,0 +1,6 @@ +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 b2c8751b2c..8de1c8c271 100644 --- a/src/template/sco +++ b/src/template/sco @@ -1,8 +1,5 @@ -AROPT:cq -CFLAGS: -SHARED_LIB:-K PIC -ALL: -SRCH_INC: -SRCH_LIB: -DLSUFFIX:.so -CC:cc -b elf +AROPT=cq +CFLAGS= +SHARED_LIB='-K PIC' +DLSUFFIX=.so +CC="$CC -b elf" diff --git a/src/template/solaris_i386 b/src/template/solaris_i386 new file mode 100644 index 0000000000..c9e70260c1 --- /dev/null +++ b/src/template/solaris_i386 @@ -0,0 +1,11 @@ +DLSUFFIX=.so + +if test "$GCC" = yes ; then + AROPT=crs + CFLAGS= + SHARED_LIB=-fPIC +else + AROPT=cq + CFLAGS= + SHARED_LIB=-KPIC +fi diff --git a/src/template/solaris_i386_cc b/src/template/solaris_i386_cc deleted file mode 100644 index a665158068..0000000000 --- a/src/template/solaris_i386_cc +++ /dev/null @@ -1,8 +0,0 @@ -AROPT:cq -CFLAGS: -SHARED_LIB:-KPIC -ALL: -SRCH_INC: -SRCH_LIB: -DLSUFFIX:.so -CC:cc diff --git a/src/template/solaris_i386_gcc b/src/template/solaris_i386_gcc deleted file mode 100644 index 43f3f06ffb..0000000000 --- a/src/template/solaris_i386_gcc +++ /dev/null @@ -1,7 +0,0 @@ -AROPT:crs -CFLAGS: -SHARED_LIB:-fPIC -ALL: -SRCH_INC: -SRCH_LIB: -DLSUFFIX:.so diff --git a/src/template/solaris_sparc b/src/template/solaris_sparc new file mode 100644 index 0000000000..1863d97c81 --- /dev/null +++ b/src/template/solaris_sparc @@ -0,0 +1,10 @@ +AROPT=crs +DLSUFFIX=.so + +if test "$GCC" = yes ; then + CFLAGS= + SHARED_LIB=-fPIC +else + CFLAGS='-Xa -v -D__sparc__ -D__sun__' + SHARED_LIB=-KPIC +fi diff --git a/src/template/solaris_sparc_cc b/src/template/solaris_sparc_cc deleted file mode 100644 index da7d77379b..0000000000 --- a/src/template/solaris_sparc_cc +++ /dev/null @@ -1,8 +0,0 @@ -AROPT:crs -CFLAGS:-Xa -v -D__sparc__ -D__sun__ -SHARED_LIB:-KPIC -ALL: -SRCH_INC: -SRCH_LIB: -DLSUFFIX:.so -CC:cc diff --git a/src/template/solaris_sparc_gcc b/src/template/solaris_sparc_gcc deleted file mode 100644 index 43f3f06ffb..0000000000 --- a/src/template/solaris_sparc_gcc +++ /dev/null @@ -1,7 +0,0 @@ -AROPT:crs -CFLAGS: -SHARED_LIB:-fPIC -ALL: -SRCH_INC: -SRCH_LIB: -DLSUFFIX:.so diff --git a/src/template/sunos4 b/src/template/sunos4 new file mode 100644 index 0000000000..6c26fabf29 --- /dev/null +++ b/src/template/sunos4 @@ -0,0 +1,10 @@ +AROPT=cr +DLSUFFIX=.so + +if test "$GCC" = yes ; then + CFLAGS= + SHARED_LIB=-fPIC +else + CFLAGS= + SHARED_LIB=-PIC +fi diff --git a/src/template/sunos4_cc b/src/template/sunos4_cc deleted file mode 100644 index dc2580bca8..0000000000 --- a/src/template/sunos4_cc +++ /dev/null @@ -1,8 +0,0 @@ -AROPT:cr -CFLAGS: -SHARED_LIB:-PIC -ALL: -SRCH_INC: -SRCH_LIB: -DLSUFFIX:.so -CC:cc diff --git a/src/template/sunos4_gcc b/src/template/sunos4_gcc deleted file mode 100644 index 73ae40585d..0000000000 --- a/src/template/sunos4_gcc +++ /dev/null @@ -1,7 +0,0 @@ -AROPT:cr -CFLAGS: -SHARED_LIB:-fPIC -ALL: -SRCH_INC: -SRCH_LIB: -DLSUFFIX:.so diff --git a/src/template/svr4 b/src/template/svr4 index 26d5c0ca39..c1652186c4 100644 --- a/src/template/svr4 +++ b/src/template/svr4 @@ -1,7 +1,4 @@ -AROPT:crs -CFLAGS: -SHARED_LIB: -ALL:+W0 -SRCH_INC: -SRCH_LIB: -DLSUFFIX:.so +AROPT=crs +CFLAGS= +SHARED_LIB= +DLSUFFIX=.so diff --git a/src/template/ultrix4 b/src/template/ultrix4 index 6b87bc3106..d708414ec4 100644 --- a/src/template/ultrix4 +++ b/src/template/ultrix4 @@ -1,7 +1,4 @@ -AROPT:crs -CFLAGS:-DNOFIXADE -SHARED_LIB:-G 0 -ALL: -SRCH_INC: -SRCH_LIB: -DLSUFFIX:.so +AROPT=crs +CFLAGS=-DNOFIXADE +SHARED_LIB='-G 0' +DLSUFFIX=.so diff --git a/src/template/univel b/src/template/univel index 680d3bd9b6..8bc70f1ae9 100644 --- a/src/template/univel +++ b/src/template/univel @@ -1,8 +1,5 @@ -AROPT:crs -CFLAGS:-v -O -K i486,host,inline,loop_unroll -Dsvr4 -SHARED_LIB:-K PIC -SRCH_INC: -SRCH_LIB: -DLSUFFIX:.so -CC:cc -LIBS:-lc89 +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 976b5b9541..bf9c4b5d74 100644 --- a/src/template/unixware +++ b/src/template/unixware @@ -1,7 +1,6 @@ -AROPT:crs -CFLAGS:-O -K i486,host,inline,loop_unroll,alloca -Dsvr4 -SHARED_LIB:-K PIC -SRCH_INC:/opt/include -SRCH_LIB:/opt/lib -DLSUFFIX:.so -CC:cc +AROPT=crs +CFLAGS='-O -K i486,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 new file mode 100644 index 0000000000..d5734c0a8a --- /dev/null +++ b/src/template/win @@ -0,0 +1,6 @@ +AROPT=crs +CFLAGS=-O2 +SRCH_INC=/usr/local/include +SRCH_LIB=/usr/local/lib +DLSUFFIX=.dll +LIBS=-lcygipc -- cgit v1.2.1