diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE index 71c10f668..a1c726f97 100644 --- a/configure/CONFIG_SITE +++ b/configure/CONFIG_SITE @@ -16,8 +16,6 @@ # -[-] # # Currently Supporting: -# aix-ppc (IBM compiler used for host builds) -# aix-ppc-gnu (GNU compiler used for host builds) # cygwin-x86 (cygwin compiler used for host builds) # darwin-ppc (PowerPC based Apple running OSX) # darwin-ppcx86 (Universal binaries for both CPUs) @@ -28,7 +26,6 @@ # linux-ppc64 (GNU compiler used for host builds) # linux-x86 (GNU compiler used for host builds) # linux-x86_64 (GNU compiler used for host builds) -# linux-x86-borland (Borland C++ compiler used for host builds) # solaris-sparc (Sun compiler used for host builds) # solaris-sparc-gnu (GNU compiler used for host builds) # solaris-sparc64 (Sun compiler used for host builds) @@ -42,7 +39,7 @@ # win32-x86-mingw (MinGW compiler used for host builds) # windows-x64 (MS Visual C++ compiler used for host builds) -# Debugging builds +# Debugging builds: # linux-x86-debug (GNU compiler with -g option for host builds) # linux-x86_64-debug (GNU compiler with -g option for host builds) # solaris-sparc-debug (sun compiler no optimization,-g for debugging info) diff --git a/configure/os/CONFIG.Common.aix-ppc b/configure/os/CONFIG.Common.aix-ppc deleted file mode 100644 index 683eb8c15..000000000 --- a/configure/os/CONFIG.Common.aix-ppc +++ /dev/null @@ -1,24 +0,0 @@ -# CONFIG.Common.aix-ppc -# -# This file is maintained by the build community. -# -# Definitions for aix-ppc target builds -# Sites may override these definitions in CONFIG_SITE.Common.aix-ppc -#------------------------------------------------------- - -# Include definitions common to all Unix targets -include $(CONFIG)/os/CONFIG.Common.UnixCommon - -# -# Set OS-specific information -# -OS_CLASS = AIX -ARCH_CLASS = ppc - -CODE_CPPFLAGS = -D_REENTRANT - -POSIX_CPPFLAGS = -D_POSIX_C_SOURCE=199506L -D_POSIX_THREADS -D_XOPEN_SOURCE=500 -D_ALL_SOURCE -POSIX_LDLIBS = -lpthread - -#SHARED_LIBRARIES=NO - diff --git a/configure/os/CONFIG.Common.aix-ppc-gnu b/configure/os/CONFIG.Common.aix-ppc-gnu deleted file mode 100644 index 38488c9b3..000000000 --- a/configure/os/CONFIG.Common.aix-ppc-gnu +++ /dev/null @@ -1,11 +0,0 @@ -# CONFIG.Common.aix-ppc-gnu -# -# This file is maintained by the build community. -# -# Definitions for aix-ppc target builds -# Sites may override these definitions in CONFIG_SITE.Common.aix-ppc -#------------------------------------------------------- - -# Include definitions common to all aix-ppc target archs -include $(CONFIG)/os/CONFIG.Common.aix-ppc - diff --git a/configure/os/CONFIG.Common.linux-x86-borland b/configure/os/CONFIG.Common.linux-x86-borland deleted file mode 100644 index d4635eb86..000000000 --- a/configure/os/CONFIG.Common.linux-x86-borland +++ /dev/null @@ -1,25 +0,0 @@ -# CONFIG.Common.linux-x86-borland -# -# $Revision-Id$ -# This file is maintained by the build community. -# -# Definitions for linux-x86 target builds -# Sites may override these definitions in CONFIG_SITE.Common.linux-x86-borland -#------------------------------------------------------- - -# Include definitions common to all Unix targets -include $(CONFIG)/os/CONFIG.Common.UnixCommon - -OS_CLASS = Linux -ARCH_CLASS = x86 - -POSIX_LDLIBS = libpthread.so - -OP_SYS_CPPFLAGS += -D_BSD_SOURCE -D_SVID_SOURCE -OP_SYS_CPPFLAGS += -Dlinux -OP_SYS_LDLIBS = libc.so libm.so libdl.so librt.so - -ARCH_DEP_CPPFLAGS += -D_X86_ - -RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(SHARED_LIBRARIES)) - diff --git a/configure/os/CONFIG.aix-ppc-gnu.Common b/configure/os/CONFIG.aix-ppc-gnu.Common deleted file mode 100644 index 3364a14c0..000000000 --- a/configure/os/CONFIG.aix-ppc-gnu.Common +++ /dev/null @@ -1,12 +0,0 @@ -# CONFIG.aix-ppc-gnu.Common -# -# $Revision-Id$ -# This file is maintained by the build community. -# -# Definitions for aix-ppc gnu compiler host builds -# Sites may override these definitions in CONFIG_SITE.aix-ppc-gnu.Common -#------------------------------------------------------- - -#Include definitions common to aix-ppc hosts -include $(CONFIG)/os/CONFIG.aix-ppc.Common - diff --git a/configure/os/CONFIG.aix-ppc-gnu.aix-ppc-gnu b/configure/os/CONFIG.aix-ppc-gnu.aix-ppc-gnu deleted file mode 100644 index 989bda8ff..000000000 --- a/configure/os/CONFIG.aix-ppc-gnu.aix-ppc-gnu +++ /dev/null @@ -1,16 +0,0 @@ -# CONFIG.aix-ppc-gnu.aix-ppc-gnu -# -# -# Definitions for aix-ppc-gnu host - aix-ppc-gnu target builds -# Sites may override these definitions in CONFIG_SITE.aix-ppc-gnu.aix-ppc-gnu -#------------------------------------------------------- - -# Include common gnu compiler definitions -include $(CONFIG)/CONFIG.gnuCommon - -GNU_DIR = /usr/common/usg/gcc/3.2.1 - -AR = ar -ARFLAGS = rcv -RANLIB = ranlib -t - diff --git a/configure/os/CONFIG.aix-ppc.Common b/configure/os/CONFIG.aix-ppc.Common deleted file mode 100644 index d791599e1..000000000 --- a/configure/os/CONFIG.aix-ppc.Common +++ /dev/null @@ -1,10 +0,0 @@ -# CONFIG.aix-ppc.Common -# -# This file is maintained by the build community. -# -# Definitions for aix-ppc host builds -# Sites may override these definitions in CONFIG_SITE.aix-ppc.Common -#------------------------------------------------------- - -#Include definitions common to unix hosts -include $(CONFIG)/os/CONFIG.UnixCommon.Common diff --git a/configure/os/CONFIG.linux-x86-borland.Common b/configure/os/CONFIG.linux-x86-borland.Common deleted file mode 100644 index 82f30bcbf..000000000 --- a/configure/os/CONFIG.linux-x86-borland.Common +++ /dev/null @@ -1,13 +0,0 @@ -# CONFIG.linux-x86-borland.Common -# -# $Revision-Id$ -# This file is maintained by the build community. -# -# Definitions for linux-x86-borland host builds -# Sites may override these definitions in CONFIG_SITE.linux-x86-borland.Common -#------------------------------------------------------- - -#Include definitions common to unix hosts -include $(CONFIG)/os/CONFIG.UnixCommon.Common - -WIND_HOST_TYPE = x86-linux diff --git a/configure/os/CONFIG.linux-x86-borland.linux-x86-borland b/configure/os/CONFIG.linux-x86-borland.linux-x86-borland deleted file mode 100644 index c58be3c74..000000000 --- a/configure/os/CONFIG.linux-x86-borland.linux-x86-borland +++ /dev/null @@ -1,198 +0,0 @@ -# CONFIG.linux-x86-borland.linux-x86-borland -# -# $Revision-Id$ -# -# Definitions for linux-x86-borland host - linux-x86-borland target builds -# Sites may override these definitions in CONFIG_SITE.linux-x86-borland.linux-x86-borland -#------------------------------------------------------- - -# Include common gnu compiler definitions -include $(CONFIG)/CONFIG.gnuCommon -SHRLIB_CFLAGS = -SHRLIB_LDFLAGS = -LOADABLE_SHRLIB_LDFLAGS = -GPROF=NO -PROFILE=NO - -GNU_DIR = /usr - -KYLIX=1 - -BORLAND_INC_STLPORT = $(BORLAND)/include/stlport -BORLAND_INC = $(BORLAND)/include -BORLAND_LIB = $(BORLAND)/lib -BORLAND_BIN = $(BORLAND)/bin - -WINLINK = $(BORLAND_BIN)/ilink -q -# -# Configure Borland C compiler -# -q suppress compiler identification banner -# -a8 quad word alignment -#CCLINKOPT = -q -a8 -I/usr/include -CCLINKOPT = -q -a8 -CC = $(BORLAND_BIN)/bc++ $(CCLINKOPT) -LD = $(BORLAND_BIN)/bc++ -r -RANLIB = - -# -w display warnings on -# -g0 no limit to warning messages -# some warning message here are always disabled because they are -# trivial and numerous -# -w-8012 Comparing signed and unsigned values -# -w-8060 Possibly incorrect assignment -# -w-8071 Conversion may lose significant digits -WARN_CFLAGS_YES = -w -g0 -w-8012 -w-8060 -w-8071 -w-dup -# -w- display warnings off -WARN_CFLAGS_NO = -w- - -# -# -k- turn off standard stack frame -# -H- turn off precompiled headers -# -R- don't include browser info in .obj files -# -O1 optimization for size -# -v- turn off source debugging -# -vi control expansion of inline functions -OPT_CFLAGS_YES = -k- -H- -R- -O1 -v- -vi -# -OPT_CFLAGS_NO = - -# OS vendor c preprocessor -CPP = $(BORLAND_BIN)/bcpp - -# Configure OS vendor C++ compiler -# -CCC = $(BORLAND_BIN)/bc++ $(CCLINKOPT) - -# -w display warnings on -# -g0 no limit to warning messages -# -w-8012 Comparing signed and unsigned values -# -w-8060 Possibly incorrect assignment -# -w-8071 Conversion may lose significant digits -# -w-8008 Condition is always true or always false (compile time -# know template parameters causes this to spew garbage) -# -w-8027 Functions containing reserved words are not expanded inline -# (Some compilers are better than others with inline) -# -w-8066 Unreachable code (compile time know template parameters -# causes this to spew garbage) -# -w-8080 'identifier' declared but never used -# (instantiating unused static const external parameters is -# anachronistic compiler practice) -# -w-8004 'identifier' is assigned a value that is never used -# (compile time know template parameters -# causes this to spew garbage) -# -w-8026 Functions with exception specifications are not expanded inline -# -WARN_CXXFLAGS_YES = -w -g0 -w-8012 -w-8060 -w-8071 -w-8008 -w-8027 -w-8066 -w-8080 -w-8004 -w-8026 -# -w- display warnings off -WARN_CXXFLAGS_NO = -w- - -# -# -k- turn off standard stack frame -# -H- Turn off precompiled headers -# -R- Don't include browser info in .obj files -# -O1 optimization for size -# -v- turn off source debugging -# -vi control expansion of inline functions -OPT_CXXFLAGS_YES = -k- -H- -R- -O1 -v- -vi -# -OPT_CXXFLAGS_NO = - -# -c case sensitive linking -# -C clear state before linking -# -Gi generate import library -# -Gn no state files -# -Tpd targets a Windows .DLL file -# -x no map -# -w display warnings on -#LINK_OPT_FLAGS_YES = -c -C -Gi -Gn -Tpd -x -w -#LINK_OPT_FLAGS_NO = -c -C -Gi -Gn -Tpd -x -w- -#Linux_DLLFLAGS = $(LINK_OPT_FLAGS_$(HOST_OPT)) $(TARGET_LDFLAGS) $(LIB_LDFLAGS) -OPT_LDFLAGS = - -ARCH_DEP_CFLAGS= - -OS_CLASS=Linux - - -OBJ=.o - -# Problem: BorlandC does not recognize *.cc as C++ source, -# we have to compile xx.cc using the flag -P xx.cc, -COMPILER_CXXFLAGS = -P - -# Operating system flags -OP_SYS_CFLAGS = - -# -# Borland specific include files -# -OP_SYS_INCLUDES = -I/usr/include -# - -#------------------------------------------------------- -# Prod: DEPLIBS, LDFLAGS, and LDLIBS definitions - -PROD_DEPLIBS= $(foreach lib,$(PROD_LIBS) $(USR_LIBS), \ - $(firstword $(wildcard $(addsuffix /$(LIB_PREFIX)$(lib).so, \ - $($(lib)_DIR) $(SHRLIB_SEARCH_DIRS))) \ - $(wildcard $(addsuffix /$(LIB_PREFIX)$(lib).a, \ - $($(lib)_DIR) $(SHRLIB_SEARCH_DIRS))) \ - $(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_EXT), \ - $(firstword $($(lib)_DIR) $(INSTALL_LIB))))) - -SHRLIB_DEPLIBS= $(foreach lib,$(LIB_LIBS) $(USR_LIBS), \ - $(firstword $(wildcard $(addsuffix /$(LIB_PREFIX)$(lib).so, \ - $($(lib)_DIR) $(SHRLIB_SEARCH_DIRS))) \ - $(wildcard $(addsuffix /$(LIB_PREFIX)$(lib).a, \ - $($(lib)_DIR) $(SHRLIB_SEARCH_DIRS))) \ - $(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_EXT), \ - $(firstword $($(lib)_DIR) $(INSTALL_LIB))))) - -PROD_SYS_DEPLIBS= $(foreach lib,$(PROD_SYS_LIBS), \ - $(firstword $(wildcard \ - /lib/$(LIB_PREFIX)$(lib).so \ - /lib/$(LIB_PREFIX)$(lib).a \ - /usr/lib/$(LIB_PREFIX)$(lib).so \ - /usr/lib/$(LIB_PREFIX)$(lib).a) \ - $(lib))) - -PROD_LDLIBS = $(addprefix lib, $($*_LDLIBS)) \ - $(notdir $(PROD_DEPLIBS)) \ - $(notdir $(PROD_SYS_DEPLIBS)) \ - $(addprefix lib, $($*_SYS_LIBS) $(USR_SYS_LIBS)) - -SHRLIB_LDLIBS = $(addprefix lib, $($*_LDLIBS)) \ - $(notdir $(SHRLIB_DEPLIBS)) \ - $(addprefix lib, $($*_SYS_LIBS) $(LIB_SYS_LIBS) $(USR_SYS_LIBS)) $(LDLIBS) - -LDLIBS_STATIC_YES = LDLIBS -LDLIBS_SHARED_NO = LDLIBS -LDLIBS_SHARED_YES = LDLIBS -PROD_LDLIBS += $($(firstword $(LDLIBS_STATIC_$(STATIC_BUILD)) \ - $(LDLIBS_SHARED_$(SHARED_LIBRARIES)))) - -empty:= -space:= $(empty) $(empty) -PROD_DEPLIB_DIRS = $(dir $($*_DEPLIBS)) $(dir $(PROD_DEPLIBS)) -SHRLIB_DEPLIB_DIRS = $(dir $($*_DEPLIBS)) $(dir $(SHRLIB_DEPLIBS)) - -PRODDIR_LDFLAGS = -L$(subst $(space),:,$(sort $(PROD_DEPLIB_DIRS) $(BORLAND_LIB))) -SHRLIBDIR_LDFLAGS = -L$(subst $(space),:,$(sort $(SHRLIB_DEPLIB_DIRS) $(BORLAND_LIB))) - -# -c case sensitive linking -# -C clear state before linking -# -Gn no state files -# -Tpe targets a Windows .EXE file -# -x no map -# -w display warnings on -LDFLAGS += -c -C -Gn -x -w -LINKLIBS=rtl.a visualclx.a rtle.a libborcrtl.a libborstl.a libborunwind.a - -LINK.cpp = $(WINLINK) $(STATIC_LDFLAGS) $(PRODDIR_LDFLAGS) $(LDFLAGS) -Tpe -w-dup -LINK.cpp += $(PROD_LDFLAGS) borinit.o /usr/lib/crt1.o $(PROD_LD_OBJS) -LINK.cpp += , $@ ,,$(LINKLIBS) $(PROD_LDLIBS) - -LINK.shrlib = $(WINLINK) $(STATIC_LDFLAGS) $(SHRLIBDIR_LDFLAGS) $(LDFLAGS) -Tpd -Gi -LINK.shrlib+= $(TARGET_LIB_LDFLAGS) borinitso.o $(LIBRARY_LD_OBJS) -LINK.shrlib+= , $@ ,,$(LINKLIBS) $(SHRLIB_LDLIBS) - diff --git a/configure/os/CONFIG.win32-x86-borland.Common b/configure/os/CONFIG.win32-x86-borland.Common deleted file mode 100644 index ce3bbcc34..000000000 --- a/configure/os/CONFIG.win32-x86-borland.Common +++ /dev/null @@ -1,30 +0,0 @@ -# CONFIG.win32-x86-borland.Common -# -# $Revision-Id$ -# This file is maintained by the build community. -# -# Definitions for win32-x86-borland host archs -# Sites may override these definitions in CONFIG_SITE.win32-x86-borland.Common -#------------------------------------------------------- - -CP = $(PERL) -MExtUtils::Command -e cp -MV = $(PERL) -MExtUtils::Command -e mv -RM = $(PERL) -MExtUtils::Command -e rm_f -MKDIR = $(PERL) -MExtUtils::Command -e mkpath -RMDIR = $(PERL) -MExtUtils::Command -e rm_rf -NOP = $(PERL) -e '' - -WIND_HOST_TYPE = x86-win32 -OSITHREAD_USE_DEFAULT_STACK = NO - -HOSTEXE=.exe - -# Does not work if using cygwin make -# because HOME is always defined -ifndef HOME -HOME = $(HOMEDRIVE)$(HOMEPATH) -endif - -# Needed to find dlls for base installed build tools (antelope,eflex,...) -PATH := $(EPICS_BASE_BIN):$(PATH) - diff --git a/configure/os/CONFIG.win32-x86-borland.win32-x86-borland b/configure/os/CONFIG.win32-x86-borland.win32-x86-borland deleted file mode 100644 index eeff488fb..000000000 --- a/configure/os/CONFIG.win32-x86-borland.win32-x86-borland +++ /dev/null @@ -1,275 +0,0 @@ -# CONFIG.win32-x86-borland.win32-x86-borland -# -# $Revision-Id$ -# This file is maintained by the build community. -# -# Definitions for win32-x86-borland target arch when host arch is win32-x86-borland -# Sites may override these definitions in CONFIG_SITE.win32-x86-borland.win32-x86-borland -#------------------------------------------------------- - -CMPLR_CLASS = borland - -# Win32 valid build types and include directory suffixes - -VALID_BUILDS = Host Ioc - -#------------------------------------------------------- - -BORLAND_INC = $(BORLAND)\\include -BORLAND_LIB = $(BORLAND)\\lib -BORLAND_BIN = $(BORLAND)\\bin - -# -# "\ " forces gnu make to keep this as one token -# -WINLINK = $(BORLAND_BIN)/ilink32 -q - -# -l specifies default language -# -fo Renames the output .RES file -RCCMD = $(BORLAND_BIN)/brcc32 $(subst -I,-i,$(INCLUDES)) -l0x409 -fo$@ $< - -ARCMD = $(BORLAND_BIN)/tlib $@ $(foreach lib,$(LIBRARY_LD_OBJS),+$(lib)) - -#############BAFCMD = bscmake /nologo /o $@ - -# -# Configure Borland C compiler -# -q suppress compiler identification banner -# -tWM generate a 32-bit multi-threaded target -# -tWD generate a .DLL executable -# -a8 quad word alignment -# -D_WIN32 macro defined to be consistant with Microsoft Visual C++ -# -D_RTLDLL macro defined to use Borland C++ RTL library -CCLINKOPT = -q -tWM -tWD -a8 -D_WIN32 -D_RTLDLL -CC = $(BORLAND_BIN)/bcc32 $(CCLINKOPT) -LD = $(BORLAND_BIN)/bcc32 -r -RANLIB = - -# -w display warnings on -# -g0 no limit to warning messages -# some warning message here are always disabled because they are -# trivial and numerous -# -w-8012 Comparing signed and unsigned values -# -w-8060 Possibly incorrect assignment -# -w-8071 Conversion may lose significant digits -WARN_CFLAGS_YES = -w -g0 -w-8012 -w-8060 -w-8071 -# -w- display warnings off -WARN_CFLAGS_NO = -w- - -# -# -k- turn off standard stack frame -# -H- turn off precompiled headers -# -R- don't include browser info in .obj files -# -O1 optimization for size -# -v- turn off source debugging -# -vi control expansion of inline functions -OPT_CFLAGS_YES = -k- -H- -R- -O1 -v- -vi - -# -OPT_CFLAGS_NO = - -# OS vendor c preprocessor -CPP = $(BORLAND_BIN)/cpp32 -Sr -PREPROCESS.cpp = $(CPP) $(CPPFLAGS) $(subst /,\\,$(INCLUDES)) -o$@ $< - -# Configure OS vendor C++ compiler -CCC = $(BORLAND_BIN)/bcc32 $(CCLINKOPT) - -# -w display warnings on -# -g0 no limit to warning messages -# -w-8012 Comparing signed and unsigned values -# -w-8060 Possibly incorrect assignment -# -w-8071 Conversion may lose significant digits -# -w-8008 Condition is always true or always false (compile time -# know template parameters causes this to spew garbage) -# -w-8027 Functions containing reserved words are not expanded inline -# (Some compilers are better than others with inline) -# -w-8066 Unreachable code (compile time know template parameters -# causes this to spew garbage) -# -w-8080 'identifier' declared but never used -# (instantiating unused static const external parameters is -# anachronistic compiler practice) -# -w-8004 'identifier' is assigned a value that is never used -# (compile time know template parameters -# causes this to spew garbage) -# -w-8026 Functions with exception specifications are not expanded inline -# -WARN_CXXFLAGS_YES = -w -g0 -w-8012 -w-8060 -w-8071 -w-8008 -w-8027 -w-8066 -w-8080 -w-8004 -w-8026 -# -w- display warnings off -WARN_CXXFLAGS_NO = -w- - -# -# -k- turn off standard stack frame -# -H- Turn off precompiled headers -# -R- Don't include browser info in .obj files -# -O1 optimization for size -# -v- turn off source debugging -# -vi control expansion of inline functions -OPT_CXXFLAGS_YES = -k- -H- -R- -O1 -v- -vi - -# -OPT_CXXFLAGS_NO = - -# -# no special libs for static link -# -LDLIBS = ws2_32.lib advapi32.lib user32.lib kernel32.lib winmm.lib - -# -c case sensitive linking -# -C clear state before linking -# -Gi generate import library -# -Gn no state files -# -Tpd targets a Windows .DLL file -# -x no map -# -w display warnings on -LINK_OPT_FLAGS_YES = -c -C -Gi -Gn -Tpd -x -w -LINK_OPT_FLAGS_NO = -c -C -Gi -Gn -Tpd -x -w- -WIN32_DLLFLAGS = $(LINK_OPT_FLAGS_$(HOST_OPT)) $(TARGET_LDFLAGS) $(LIB_LDFLAGS) -OPT_LDFLAGS = - -SHRLIB_CFLAGS= -ARCH_DEP_CFLAGS= - -OS_CLASS=WIN32 -POSIX=NO - -# ifdef WIN32 looks better that ifeq ($(OS_CLASS),WIN32) ?? -WIN32=1 -BORLANDC=1 - -EXE=.exe -OBJ=.obj -RES=.res -BAF=.bsc -BOF=.sbr - -# Problem: BorlandC does not recognize *.cc as C++ source, -# we have to compile xx.cc using the flag -P xx.cc, -SOURCE_CXXFLAG = -P -D__cplusplus - -# Operating system flags -OP_SYS_CFLAGS = - -# -# Borland specific include files -# -OP_SYS_INCLUDES = -I$(BORLAND_INC) -# - -# -# specify dll .def file only if it exists -# -#DLL_DEF_FLAG = $(addprefix /def:,$(wildcard ../$(addsuffix .def,$(LIBRARY)))) -DLL_DEF_FLAG = $(subst /,\\,$(wildcard ../$(addsuffix .def,$*))) - -# -# A WIN32 dll has three parts: -# x.dll: the real dll (SHRLIBNAME) -# x.lib: what you link to progs that use the dll (DLL_LINK_LIBNAME) -# x.exp: what you need to build the dll (in no variable) -# -LINK.shrlib = $(WINLINK) $(WIN32_DLLFLAGS) -L$(BORLAND_LIB) -L$(BORLAND_LIB)\\Psdk c0d32.obj -LINK.shrlib+= $(LIBRARY_LD_OBJS) , $@ ,,$(LINKLIBS) $(subst /,\\,$(SHRLIB_LDLIBS)), -LINK.shrlib+= $(DLL_DEF_FLAG),$(LIBRARY_LD_RESS) - - -# adjust names of libraries to build -# -# But: if there are no objects LIBRARY_LD_OBJS to include -# in this library (may be for e.g. base/src/libCompat -# on some archs), don't define (and build) any library! -SHRLIB_SUFFIX_BASE = .dll -SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE) -SHRLIBNAME_YES = $(BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX)) -LOADABLE_SHRLIBNAME = $(LOADABLE_BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX)) -TESTSHRLIBNAME_YES = $(TESTBUILD_LIBRARY:%=%$(SHRLIB_SUFFIX)) - - -# When SHARED_LIBRARIES is YES we are building a DLL link library -# and when SHARED_LIBRARIES is NO we are building an object library -# -DLL_LINK_LIBNAME_YES = $(BUILD_LIBRARY:%=%.lib) -DLL_LINK_LIBNAME = $(DLL_LINK_LIBNAME_$(SHARED_LIBRARIES)) -TESTDLL_LINK_LIBNAME_YES = $(TESTBUILD_LIBRARY:%=%.lib) -TESTDLL_LINK_LIBNAME = $(TESTDLL_LINK_LIBNAME_$(SHARED_LIBRARIES)) -LIB_PREFIX= -LIB_SUFFIX=.lib -LIBNAME_NO = $(BUILD_LIBRARY:%=%.lib) -LIBNAME = $(LIBNAME_$(SHARED_LIBRARIES)) -TESTLIBNAME_NO = $(TESTBUILD_LIBRARY:%=%.lib) -TESTLIBNAME = $(TESTLIBNAME_$(SHARED_LIBRARIES)) - -# dll install location -INSTALL_SHRLIB = $(INSTALL_BIN) - -#-------------------------------------------------- -# Products dependancy definitions - -# SYS_PROD_LIBS deprecated -# Use PROD_SYS_LIBS - -PROD_DEPLIBS=$(foreach lib, $(PROD_LIBS) $(USR_LIBS), \ - $(firstword $(wildcard $(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_SUFFIX), \ - $($(lib)_DIR) $(SHRLIB_SEARCH_DIRS))) \ - $(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_SUFFIX), \ - $(firstword $($(lib)_DIR) $(INSTALL_LIB))))) - -PROD_LDLIBS += $($*_DEPLIBS) $(PROD_DEPLIBS) -PROD_LDLIBS += $(addsuffix .lib, \ - $($*_SYS_LIBS) $(PROD_SYS_LIBS) $(USR_SYS_LIBS) ) - -LDLIBS_STATIC_YES = LDLIBS -LDLIBS_SHARED_NO = LDLIBS -PROD_LDLIBS += $($(firstword $(LDLIBS_STATIC_$(STATIC_BUILD)) \ - $(LDLIBS_SHARED_$(SHARED_LIBRARIES)))) - -#-------------------------------------------------- -#Libraries dependancy definitions - -# _DLL_LIBS _SYS_DLL_LIBS deprecated. -# Use _LIBS and _SYS_LIBS. -# DLL_LIBS, and SYS_DLL_LIBS deprecated -# Use LIB_LIBS and LIB_SYS_LIBS -LIB_LIBS += $(DLL_LIBS) -LIB_SYS_LIBS += $(SYS_DLL_LIBS) - -# libs that we need to link the DLL with -# (it isnt necessary to rebuild the dll if these change) - -SHRLIB_DEPLIBS += $(foreach lib, $(LIB_LIBS) $(USR_LIBS), \ - $(firstword $(wildcard $(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_SUFFIX), \ - $($(lib)_DIR) $(SHRLIB_SEARCH_DIRS))) \ - $(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_SUFFIX), \ - $(firstword $($(lib)_DIR) $(INSTALL_LIB))))) - -SHRLIB_LDLIBS += $($*_DLL_DEPLIBS) $($*_DEPLIBS) $(SHRLIB_DEPLIBS) -SHRLIB_LDLIBS += $(addsuffix .lib, \ - $($*_SYS_DLL_LIBS) \ - $($*_SYS_LIBS) $(LIB_SYS_LIBS) $(USR_SYS_LIBS) ) - - -#-------------------------------------------------- - -#multithreaded import library -LIBSUF=mti -# -c case sensitive linking -# -C clear state before linking -# -Gn no state files -# -Tpe targets a Windows .EXE file -# -x no map -# -w display warnings on -LDFLAGS += -c -C -Gn -Tpe -x -w -L$(BORLAND_LIB) -L$(BORLAND_LIB)\\Psdk -LINKSTARTUP = c0x32.obj -LINKLIBS=import32.lib cw32$(LIBSUF).lib - -LINK.cpp = $(WINLINK) $(STATIC_LDFLAGS) $(LDFLAGS) $(PROD_LDFLAGS) $(LINKSTARTUP) $(subst /,\\,$(PROD_LD_OBJS)) -LINK.cpp += , $@ ,,$(LINKLIBS) $(subst /,\\,$(PROD_LDLIBS)) - -#-------------------------------------------------- - -# override of CONFIG_COMMON -HDEPENDS_INCLUDES = $(filter-out $(BORLAND_INC),$(subst -I,,$(INCLUDES))) - - -TDS = $(addsuffix .tds,$(basename $(PROD) $(TESTPROD) $(BUILD_LIBRARY) $(TESTBUILD_LIBRARY))) - diff --git a/configure/os/CONFIG_SITE.linux-x86-borland.Common b/configure/os/CONFIG_SITE.linux-x86-borland.Common deleted file mode 100644 index 1e801e6a5..000000000 --- a/configure/os/CONFIG_SITE.linux-x86-borland.Common +++ /dev/null @@ -1,12 +0,0 @@ -# CONFIG_SITE.linux-x86-borland.Common -# -# $Revision-Id$ -# This file is maintained by the build community. -# -# Site override definitions for linux-x86-borland host builds -#------------------------------------------------------- - -#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040 solaris-sparc -#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040 - -BORLAND = /share2/kylix3 diff --git a/configure/os/CONFIG_SITE.win32-x86-borland.Common b/configure/os/CONFIG_SITE.win32-x86-borland.Common deleted file mode 100644 index d2e09a242..000000000 --- a/configure/os/CONFIG_SITE.win32-x86-borland.Common +++ /dev/null @@ -1,11 +0,0 @@ -# CONFIG_SITE.win32-x86-borland.Common -# -# $Revision-Id$ -# -# Site specific definitions for win32-x86-borland host -# Only the local epics system manager should modify this file - -# jba overrides -#CROSS_COMPILER_TARGET_ARCHS=vxWorks-486 - -BORLAND = c:\\Borland\\Bcc55 diff --git a/documentation/README.html b/documentation/README.html index 52e1e8842..1c5fea6d2 100644 --- a/documentation/README.html +++ b/documentation/README.html @@ -232,7 +232,6 @@ EpicsHostArch.pl Perl script to set EPICS_HOST_ARCH env variable Site.profile bourne shell script to set path and env variables Site.cshrc c shell script to set path and env variables - borland.bat WIN32 bat file to set borland path and env variables cygwin.bat WIN32 bat file to set cygwin path and env variables win32.bat WIN32 bat file to set path and env variables win32-debug.bat WIN32 debug bat file to set debug path and env variables diff --git a/src/libCom/osi/compiler/borland/compilerSpecific.h b/src/libCom/osi/compiler/borland/compilerSpecific.h deleted file mode 100644 index 9251bfe29..000000000 --- a/src/libCom/osi/compiler/borland/compilerSpecific.h +++ /dev/null @@ -1,45 +0,0 @@ -/*************************************************************************\ -* Copyright (c) 2008 UChicago Argonne LLC, as Operator of Argonne -* National Laboratory. -* Copyright (c) 2002 The Regents of the University of California, as -* Operator of Los Alamos National Laboratory. -* EPICS BASE is distributed subject to a Software License Agreement found -* in file LICENSE that is included with this distribution. -\*************************************************************************/ - -/* - * Author: - * Jeffrey O. Hill - * johill@lanl.gov - */ - -#ifndef compilerSpecific_h -#define compilerSpecific_h - -#ifndef __BORLANDC__ -# error compiler/borland/compilerSpecific.h is only for use with the Borland compiler -#endif - -#ifdef __cplusplus - -/* - * in general we dont like ifdefs but they do allow us to check the - * compiler version and make the optimistic assumption that - * standards incompliance issues will be fixed by future compiler - * releases - */ - -/* - * CXX_PLACEMENT_DELETE - defined if compiler supports placement delete - * CXX_THROW_SPECIFICATION - defined if compiler supports throw specification - */ -#if __BORLANDC__ >= 0x600 -# define CXX_PLACEMENT_DELETE -#endif - -#define CXX_THROW_SPECIFICATION - -#endif /* __cplusplus */ - - -#endif /* ifndef compilerSpecific_h */ diff --git a/src/libCom/osi/os/WIN32/epicsTempFile.cpp b/src/libCom/osi/os/WIN32/epicsTempFile.cpp index 7ef99b4fa..dc90ec9b9 100644 --- a/src/libCom/osi/os/WIN32/epicsTempFile.cpp +++ b/src/libCom/osi/os/WIN32/epicsTempFile.cpp @@ -69,13 +69,6 @@ epicsShareFunc FILE * epicsShareAPI epicsTempFile () // _O_BINARY no translation // _O_SHORT_LIVED avoid flush to disk // - // (Borland does not supply _O_SHORT_LIVED and _O_TEMPORARY) -# ifndef _O_SHORT_LIVED -# define _O_SHORT_LIVED 0x1000 -# endif -# ifndef _O_TEMPORARY -# define _O_TEMPORARY 0x0040 -# endif const int openFlag = _O_CREAT | _O_EXCL | _O_RDWR | _O_SHORT_LIVED | _O_BINARY | _O_TEMPORARY; int fd = open ( pName, openFlag, _S_IWRITE ); diff --git a/src/libCom/osi/os/WIN32/osdTime.cpp b/src/libCom/osi/os/WIN32/osdTime.cpp index fc35c7789..33a63b873 100644 --- a/src/libCom/osi/os/WIN32/osdTime.cpp +++ b/src/libCom/osi/os/WIN32/osdTime.cpp @@ -48,24 +48,15 @@ static int osdTimeGetCurrent ( epicsTimeStamp *pDest ); -// GNU seems to require that 64 bit constants have LL on -// them. The borland compiler fails to compile constants -// with the LL suffix. MS compiler doesnt care. -#ifdef __GNUC__ -#define LL_CONSTANT(VAL) VAL ## LL -#else -#define LL_CONSTANT(VAL) VAL -#endif - // for mingw #if !defined ( MAXLONGLONG ) -#define MAXLONGLONG LL_CONSTANT(0x7fffffffffffffff) +#define MAXLONGLONG 0x7fffffffffffffffLL #endif #if !defined ( MINLONGLONG ) -#define MINLONGLONG LL_CONSTANT(~0x7fffffffffffffff) +#define MINLONGLONG (~0x7fffffffffffffffLL) #endif -static const LONGLONG epicsEpochInFileTime = LL_CONSTANT(0x01b41e2a18d64000); +static const LONGLONG epicsEpochInFileTime = 0x01b41e2a18d64000LL; class currentTime : public epicsTimerNotify { public: @@ -123,7 +114,7 @@ static int osdTimeGetCurrent ( epicsTimeStamp *pDest ) inline void UnixTimeToFileTime ( const time_t * pAnsiTime, LPFILETIME pft ) { - LONGLONG ll = Int32x32To64 ( *pAnsiTime, 10000000 ) + LL_CONSTANT(116444736000000000); + LONGLONG ll = Int32x32To64 ( *pAnsiTime, 10000000 ) + 116444736000000000LL; pft->dwLowDateTime = static_cast < DWORD > ( ll ); pft->dwHighDateTime = static_cast < DWORD > ( ll >>32 ); }