Removed release date, less work to do at the last minute...

I had a closer look at the MS and the POSIX doc. It appears that
there is confusion between the two related to how the arguments
are interpreted when the user buffer pointer is null. In the POSIX
doc it clearly states that the count only applies if the user pointer
isn't nill. In the MS doc it clearly states that the count is also the
size of the internally allocated buffer when the user pointer is nill.

It seems that a reasonable compromise will be to specify a buffer
size of BUFSIZ (defined by POSIX and fortunately also by windows).

config/CONFIG.Host.Linux

@@ -29,7 +29,7 @@ G++_SHRLIB_LDFLAGS_YES +=  -Wl,-soname,$@
 
 OP_SYS_CFLAGS += -D_BSD_SOURCE
 
-ARCH_DEP_CFLAGS = -D_X86_ -Dlinux -mcpu=pentium
+ARCH_DEP_CFLAGS = -D_X86_ -Dlinux
 ARCH_DEP_LDLIBS += -lpthread -lreadline -lcurses -lrt
 
 #Allows R3.13 built extensions to load R3.14 shared libs

config/CONFIG_BASE_VERSION

@@ -18,7 +18,7 @@
 
 EPICS_VERSION=3
 EPICS_REVISION=14
-EPICS_MODIFICATION=6
+EPICS_MODIFICATION=8
 EPICS_UPDATE_NAME=
 EPICS_UPDATE_LEVEL=0
 

config/CONFIG_COMMON

@@ -87,10 +87,10 @@ EPICS_BASE_BIN          = $(EPICS_BASE)/bin/$(T_A)
 
 GCC_ANSI = $(GCC) -ansi
 GCC_STRICT = $(GCC) -ansi -pedantic
-GCC_TRAD = $(GCC) -traditional
+GCC_TRAD = $(GCC)
 GCC_DEP_CFLAGS = -fPIC -D_REENTRANT
 
-GCC_WARN_YES = -Wall
+GCC_WARN_YES = -Wall -Wtraditional -Wmissing-prototypes -Wstrict-prototypes
 GCC_WARN_NO = -w
 GCC_OPT_YES = -O3
 GCC_OPT_NO = -g
@@ -102,13 +102,13 @@ GCC_SHRLIB_CFLAGS_YES =
 GCC_SHRLIB_LDFLAGS_YES =  -shared
 
 G++_NORMAL = $(G++) -ansi -pedantic
-G++_STRICT = $(G++) -ansi -pedantic -Wtraditional
-G++_TRAD = $(G++) -traditional
+G++_STRICT = $(G++) -ansi -pedantic
+G++_TRAD = $(G++)
 G++_TEMPL_INST_FLAG = -DEXPL_TEMPL
 G++_DEP_CFLAGS = -fPIC -D_REENTRANT
 G++_WARN_YES = -Wall \
-      -Wmissing-prototypes -Woverloaded-virtual \
-      -Wwrite-strings -Wconversion -Wstrict-prototypes\
+      -Woverloaded-virtual \
+      -Wwrite-strings -Wconversion\
       -Wpointer-arith -Winline
 G++_WARN_NO = -w
 G++_OPT_YES = -O3
@@ -241,8 +241,8 @@ CXXFLAGS = $(OPT_CXXFLAGS) $(DEBUG_CXXFLAGS) $(WARN_CXXFLAGS) $(TARGET_CXXFLAGS)
 LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS)\
  $(ARCH_DEP_LDFLAGS) $(STATIC_LDFLAGS) $(OP_SYS_LDFLAGS) $(RUNTIME_LDFLAGS)
 
-LDLIBS = $(TARGET_LDLIBS) $(USR_LDLIBS) $(ARCH_DEP_LDLIBS)\
- $(STATIC_LDLIBS) $(OP_SYS_LDLIBS) $(POSIX_LDLIBS)
+LDLIBS = $(TARGET_LDLIBS) $(USR_LDLIBS) $(STATIC_LDLIBS) $(ARCH_DEP_LDLIBS)\
+  $(OP_SYS_LDLIBS) $(POSIX_LDLIBS)
 
 CPPFLAGS += $(TARGET_CPPFLAGS) $(USR_CPPFLAGS) $(ARCH_DEP_CPPFLAGS) $(POSIX_CPPFLAGS)
 

config/CONFIG_COMPAT

@@ -15,6 +15,7 @@
 #Syntax:
 # ARCH_<host_arch> = <epics_host_arch>
 ARCH_solarisGnu = solaris-sparc-gnu
+ARCH_solarisNonshared = solaris-sparc-nonshared
 #ARCH_solaris = solaris-sparc-static
 #ARCH_solaris = solaris-sparc-debug
 ARCH_solaris = solaris-sparc
@@ -46,4 +47,3 @@ HOST_ARCH := $(EPICS_HOST_ARCH)
 # and change ARCH_solaris=solaris-<arch> to ARCH_solaris=solaris-<arch>-gnu
 # in base/config/CONFIG_COMPAT.
 
-

configure/CONFIG.CrossCommon

@@ -26,6 +26,9 @@ export GCC_EXEC_PREFIX = $(GNU_LIB)/gcc-lib/
 CROSS_INCLUDES = $(addprefix -I,$(GNU_TARGET_INCLUDE_DIR))
 CROSS_LDFLAGS = $(addprefix -L,$(GNU_TARGET_LIB_DIR))
 
+CMPLR_PREFIX_CROSS=$(addsuffix -,$(GNU_TARGET))
+CMPLR_PREFIX=$(CMPLR_PREFIX_$(BUILD_CLASSS))
+
 # All cross builds use the gnu compiler
 include $(CONFIG)/CONFIG.gnuCommon
 

configure/CONFIG.gnuCommon

@@ -15,8 +15,8 @@ GNU = YES
 GNU_BIN = $(GNU_DIR)/bin
 GNU_LIB = $(GNU_DIR)/lib
 
-CC = $(GNU_BIN)/$(CMPLR_PREFIX)cc$(CMPLR_SUFFIX)
-CCC = $(GNU_BIN)/$(CMPLR_PREFIX)cc$(CMPLR_SUFFIX)
+CC = $(GNU_BIN)/$(CMPLR_PREFIX)gcc$(CMPLR_SUFFIX)
+CCC = $(GNU_BIN)/$(CMPLR_PREFIX)g++$(CMPLR_SUFFIX)
 AR = $(GNU_BIN)/$(CMPLR_PREFIX)ar$(CMPLR_SUFFIX) -rc
 LD = $(GNU_BIN)/$(CMPLR_PREFIX)ld$(CMPLR_SUFFIX) -r
 CPP = $(CC) -x c -E
@@ -50,3 +50,5 @@ STATIC_LDFLAGS_NO =
 
 SHRLIB_CFLAGS = -fPIC
 
+GNU_LDLIBS_YES = -lgcc
+

configure/CONFIG_ADDONS

@@ -67,6 +67,7 @@
 #    OBJS_IOC      ioc system object files to build and install
 #    USR_INCLUDES  include directories
 #    BIN_INSTALLS  binaries to install
+#    LIB_INSTALLS  library binaries to install
 #    RCS           win32 resource files for building libraries and prods
 #    PROD_RCS      win32 resource files for building prods
 #    LIB_RCS       win32 resource files for building libraries
@@ -221,6 +222,14 @@ BIN_INSTALLS+=$(BIN_INSTALLS_DEFAULT)
 endif
 endif
 
+ifneq ($(strip $(LIB_INSTALLS_$(OS_CLASS))),)
+LIB_INSTALLS+=$(subst -nil-,,$(LIB_INSTALLS_$(OS_CLASS)))
+else
+ifdef LIB_INSTALLS_DEFAULT
+LIB_INSTALLS+=$(LIB_INSTALLS_DEFAULT)
+endif
+endif
+
 ifneq ($(strip $(PROD_OBJS_$(OS_CLASS))),)
 PROD_OBJS+=$(subst -nil-,,$(PROD_OBJS_$(OS_CLASS)))
 else

configure/CONFIG_BASE

@@ -19,6 +19,7 @@ EPICS_BASE_HOST_BIN = $(EPICS_BASE)/bin/$(EPICS_HOST_ARCH)
 EPICS_BASE_HOST_LIB = $(EPICS_BASE)/lib/$(EPICS_HOST_ARCH)
 ifdef T_A
 EPICS_BASE_LIB      = $(EPICS_BASE)/lib/$(T_A)
+EPICS_BASE_BIN      = $(EPICS_BASE)/bin/$(T_A)
 endif
 
 #---------------------------------------------------------------
@@ -31,7 +32,7 @@ EPICS_BASE_IOC_LIBS += dbIoc registryIoc dbStaticIoc ca Com
 #---------------------------------------------------------------
 # Epics base Host libraries 
 
-EPICS_BASE_HOST_LIBS += cas gdd iocsh asHost dbStaticHost
+EPICS_BASE_HOST_LIBS += cas gdd iocsh asHost dbStaticHost registryIoc
 EPICS_BASE_HOST_LIBS += ca Com
 
 #---------------------------------------------------------------
@@ -48,23 +49,30 @@ endif # EPICS_BASE
 BASE_CPPFLAGS = 
 
 # osithread default stack
-OSITHREAD_USE_DEFAULT_STACK = YES
+OSITHREAD_USE_DEFAULT_STACK = NO
 OSITHREAD_DEFAULT_STACK_FLAGS_YES = -DOSITHREAD_USE_DEFAULT_STACK
 OSITHREAD_DEFAULT_STACK_FLAGS_NO =
 BASE_CPPFLAGS += $(OSITHREAD_DEFAULT_STACK_FLAGS_$(OSITHREAD_USE_DEFAULT_STACK))
 
+#---------------------------------------------------------------
+# Where to find the installed build tools
+
+EPICS_BASE_TOOLS_BIN_HOST = $(EPICS_BASE_BIN)
+EPICS_BASE_TOOLS_BIN_CROSS = $(EPICS_BASE_HOST_BIN)
+EPICS_BASE_TOOLS_BIN = $(EPICS_BASE_TOOLS_BIN_$(BUILD_CLASS))
+
 #---------------------------------------------------------------
 # Epics base build tools and tool flags
 
-MAKEBPT                    = $(call PATH_FILTER, $(EPICS_BASE_HOST_BIN)/makeBpt$(HOSTEXE))
-DBEXPAND                   = $(call PATH_FILTER, $(EPICS_BASE_HOST_BIN)/dbExpand$(HOSTEXE))
-DBTORECORDTYPEH            = $(call PATH_FILTER, $(EPICS_BASE_HOST_BIN)/dbToRecordtypeH$(HOSTEXE))
-DBTOMENUH                  = $(call PATH_FILTER, $(EPICS_BASE_HOST_BIN)/dbToMenuH$(HOSTEXE))
-REGISTERRECORDDEVICEDRIVER = $(PERL) $(EPICS_BASE_HOST_BIN)/registerRecordDeviceDriver.pl
+MAKEBPT                    = $(call PATH_FILTER, $(EPICS_BASE_TOOLS_BIN)/makeBpt$(HOSTEXE))
+DBEXPAND                   = $(call PATH_FILTER, $(EPICS_BASE_TOOLS_BIN)/dbExpand$(HOSTEXE))
+DBTORECORDTYPEH            = $(call PATH_FILTER, $(EPICS_BASE_TOOLS_BIN)/dbToRecordtypeH$(HOSTEXE))
+DBTOMENUH                  = $(call PATH_FILTER, $(EPICS_BASE_TOOLS_BIN)/dbToMenuH$(HOSTEXE))
+REGISTERRECORDDEVICEDRIVER = $(PERL) $(EPICS_BASE_TOOLS_BIN)/registerRecordDeviceDriver.pl
 
 # private versions of lex/yacc from EPICS
-EYACC = $(call PATH_FILTER, $(EPICS_BASE_HOST_BIN)/antelope$(HOSTEXE))
-ELEX = $(call PATH_FILTER, $(EPICS_BASE_HOST_BIN)/e_flex$(HOSTEXE)) -S$(EPICS_BASE)/include/flex.skel.static
+EYACC = $(call PATH_FILTER, $(EPICS_BASE_TOOLS_BIN)/antelope$(HOSTEXE))
+ELEX = $(call PATH_FILTER, $(EPICS_BASE_TOOLS_BIN)/e_flex$(HOSTEXE)) -S$(EPICS_BASE)/include/flex.skel.static
 
 YACC  = $(EYACC)
 LEX   = $(ELEX)

configure/CONFIG_BASE_VERSION

@@ -18,7 +18,7 @@
 
 EPICS_VERSION=3
 EPICS_REVISION=14
-EPICS_MODIFICATION=6
+EPICS_MODIFICATION=8
 EPICS_UPDATE_NAME=
 EPICS_UPDATE_LEVEL=0
 

configure/CONFIG_COMMON

@@ -73,6 +73,9 @@ INSTALL_SHRLIB              = $(INSTALL_LOCATION_LIB)/$(T_A)
 INSTALL_TCLLIB              = $(INSTALL_LOCATION_LIB)/$(T_A)
 INSTALL_BIN                 = $(INSTALL_LOCATION_BIN)/$(T_A)
 
+#Directories for libraries
+SHRLIB_SEARCH_DIRS          = $(INSTALL_LIB)
+
 #-------------------------------------------------------
 # Ext, app, and module configure dir targets
 CONFIG_TARGETS += CONFIG_APP_INCLUDE RULES_INCLUDE
@@ -100,6 +103,8 @@ GNU=NO
 DEP=.depends
 OBJ = .
 RES = .
+CMPLR_SUFFIX=
+CMPLR_PREFIX=
 
 #-------------------------------------------------------
 # tools for installing libraries and products
@@ -228,11 +233,6 @@ WARN_CXXFLAGS = $(WARN_CXXFLAGS_$($(BUILD_CLASS)_WARN))
 OPT_CFLAGS = $(OPT_CFLAGS_$($(BUILD_CLASS)_OPT))
 OPT_CXXFLAGS = $(OPT_CXXFLAGS_$($(BUILD_CLASS)_OPT))
 
-# Posix flags
-POSIX=YES
-POSIX_CPPFLAGS=$(POSIX_CPPFLAGS_$(POSIX))
-POSIX_LDLIBS=$(POSIX_LDLIBS_$(POSIX))
-
 # Static build flags
 STATIC_CFLAGS = $(STATIC_CFLAGS_$(STATIC_BUILD))
 STATIC_CXXCFLAGS = $(STATIC_CXXFLAGS_$(STATIC_BUILD))
@@ -269,7 +269,7 @@ LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) \
  $(RUNTIME_LDFLAGS) $(CODE_LDFLAGS)
 
 LDLIBS = $(STATIC_LDLIBS)\
- $(POSIX_LDLIBS) $(ARCH_DEP_LDLIBS) $(DEBUG_LDLIBS) $(OP_SYS_LDLIBS)
+ $(POSIX_LDLIBS) $(ARCH_DEP_LDLIBS) $(DEBUG_LDLIBS) $(OP_SYS_LDLIBS) $(GNU_LDLIBS_$(GNU))
 
 CPPFLAGS += $(CONFORM_CPPFLAGS) $($(BUILD_CLASS)_CPPFLAGS) $(POSIX_CPPFLAGS)\
  $(BASE_CPPFLAGS) $(TARGET_CPPFLAGS) $(USR_CPPFLAGS) $(ARCH_DEP_CPPFLAGS)\
@@ -281,8 +281,14 @@ ARFLAGS =
 ARCMD = $(AR) $(ARFLAGS) $(USR_ARFLAGS) $@  $(LIBRARY_LD_OBJS)
 
 #--------------------------------------------------
-# ld default
-LDCMD = $(LD) -o $@ $^
+# 'Munch' link-edit
+MUNCH_CMD = $(LD) -o $@ $^
+
+#--------------------------------------------------
+# LEX default option (valid for EPICS base 3.13.0.beta12 and later)
+#
+# to allow characters that are not plain 7bit standard ASCII 
+LEXOPT +=  -8
 
 #--------------------------------------------------
 # Build compile line here

configure/CONFIG_ENV

@@ -36,6 +36,7 @@ EPICS_CA_REPEATER_PORT=5065
 EPICS_CA_SERVER_PORT=5064
 EPICS_CA_MAX_ARRAY_BYTES=16384
 EPICS_CA_BEACON_PERIOD=15.0
+EPICS_CA_MAX_SEARCH_PERIOD=300.0
 EPICS_CAS_BEACON_PERIOD=
 EPICS_CAS_BEACON_PORT=
 EPICS_CAS_AUTO_BEACON_ADDR_LIST=""

configure/CONFIG_SITE

@@ -23,25 +23,33 @@
 #       <operating system>-<architecture>[-<alternate compiler>]
 #
 #  Currently Supporting:
+#	aix-ppc                (HP compiler used for host builds)
+#	aix-ppc-gnu            (GNU compiler used for host builds)
+#	cygwin-x86             (cygwin compiler used for host builds)
+#	darwin-ppc
 #	hpux-parisc            (HP compiler used for host builds)
 #	hpux-parisc-gnu        (GNU compiler used for host builds)
-#	osf-alpha
+#	linux-ppc              (GNU compiler used for host builds)
+#	linux-ppc-bgl
+#	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)
+#	solaris-sparc64-gnu    (GNU compiler used for host builds)
 #	solaris-x86            (sun compiler used for host builds)
 #	solaris-x86-gnu        (GNU compiler used for host builds)
-#	sun4-x86               (sun compiler used for host builds)
-#	linux-x86              (GNU compiler used for host builds)
 #	win32-x86              (MS Visual C++ compiler used for host builds)
+#	win32-x86_mingw        (MinGW compiler used for host builds)
 #	win32-x86-borland      (Borland C++ compiler used for host builds)
-#	lynxos-x86
-#	darwin-ppc
-#	linux-mpc82xx
+#	win32-x86-cygwin       (cygwin GNU compiler used for host builds)
 
 #  Debugging builds 
-#	linux-x86-debug			(GNU compiler with -g option for host builds)
-#	solaris-sparc-debug		(sun compiler with -g option for host builds)
-#	win32-x86-debug			(MS Visual C++ compiler with debug option for host 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)
+#	win32-x86-debug        (MS Visual C++ compiler with debug option for host builds)
 
 
 #  EPICS_HOST_ARCH is a required environment variable
@@ -52,6 +60,12 @@
 #  The cross-compiler architectures to build EPICS for
 #
 #  Currently Supporting:
+#       linux-386     (linux-x86 host)
+#       linux-486     (linux-x86 host)
+#       linux-586     (linux-x86 host)
+#       linux-686     (linux-x86 host)
+#       linux-athlon  (linux-x86 host)
+#       linuxRT-mvme2100  (linux-x86 host)
 #       vxWorks-486
 #       vxWorks-68040
 #       vxWorks-68040lc
@@ -61,12 +75,20 @@
 #       vxWorks-ppc603_long
 #       vxWorks-ppc604
 #       vxWorks-ppc604_long
+#       vxWorks6-mv2100
+#       vxWorks6-mv5100
 #       RTEMS-gen68360
-#       RTEMS-mvme167
-#       RTEMS-pc386
 #       RTEMS-mcp750
+#       RTEMS-mvme167
+#       RTEMS-mvme2100
+#       RTEMS-mvme5500
+#       RTEMS-pc386
 #       RTEMS-psim
+#       RTEMS-uC5282
 #
+#  Debugging builds 
+#       vxWorks-68040-debug
+
 # Definitions of CROSS_COMPILER_TARGET_ARCHS in
 # configure/os/CONFIG_SITE.<host>.Common files will
 # override 
@@ -149,3 +171,6 @@ COMPAT_313=NO
 #  Installation directory
 #Note: INSTALL_LOCATION definition moved to configure/RELEASE file
 
+# Use POSIX thread priority scheduling (YES or NO)
+USE_POSIX_THREAD_PRIORITY_SCHEDULING = NO
+

configure/CONFIG_SITE_ENV

@@ -33,15 +33,15 @@
 #	where the start and end are mmddhh - that is month,day,hour
 #	eg EPICS_TIMEZONE=CUS::360:033102:102802
 #
-#	DST for 2004  US: Apr  4 - Oct 31
-#	              EU: Mar 28 - Oct 31
+#	DST for 2006  US: Apr  2 - Oct 29
+#	              EU: Mar 26 - Oct 29
 #	(see: http://www.worldtimezone.org/daylight.html)
 #
 # EPICS_TS_NTP_INET
 #	NTP or Unix time server ip address.  Uses boot host if not set.
 
-EPICS_TIMEZONE=CUS::360:040402:103102
-#EPICS_TIMEZONE=MET::-60:032802:103102
+EPICS_TIMEZONE=CUS::360:040202:102902
+#EPICS_TIMEZONE=MET::-60:032602:102902
 EPICS_TS_NTP_INET=
 
 # IOC Shell:

configure/RELEASE

@@ -7,17 +7,19 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-# RELEASE: Define location of external products
-#
+# RELEASE: Define location of external EPICS products
+
+# VX_DIR definition now in os/CONFIG_SITE.Common.vxWorksCommon
+# RTEMS_BASE (and RTEMS_VERSION) now in os/CONFIG_SITE.Common.RTEMS
+
 # NB: Settings in RELEASE files can be overridden in files named
 #   RELEASE.$(EPICS_HOST_ARCH)
+#   RELEASE.Common.$(OS_CLASS)Common
 #   RELEASE.Common.$(T_A)
 #   RELEASE.$(EPICS_HOST_ARCH).$(T_A)
 
-#  Tornado directory
-VX_DIR = /usr/local/vw/tornado202p1
-#VX_DIR = /usr/local/vw/tornado22-$(ARCH_CLASS)
-
 # If you don't want to install into $(TOP) dir then 
 # define INSTALL_LOCATION here
 #INSTALL_LOCATION=<fullpathname>
+#INSTALL_LOCATION=/home/phoebus/JBA/install
+

configure/RULES.Db

@@ -24,6 +24,7 @@ vpath bpt%.data $(USR_VPATH) $(GENERIC_SRC_DIRS) $(COMMON_DIR)
 INSTALL_DBDFLAGS += -I $(INSTALL_LOCATION)/dbd
 DBDFLAGS = $(USR_DBDFLAGS) -I . -I .. $(INSTALL_DBDFLAGS) $(RELEASE_DBDFLAGS)
 DBFLAGS = $($*_DBFLAGS) $(USR_DBFLAGS) -I. $(GENERIC_SRC_INCLUDES)
+DBFLAGS += -I$(COMMON_DIR)
 
 #####################################################  Targets
 
@@ -60,7 +61,7 @@ TEMPLATE2=$(patsubst %0,%,$(patsubst %1,%,$(patsubst %2,%,$(patsubst %3,%,$(pats
           $(patsubst %5,%,$(patsubst %6,%,$(patsubst %7,%,$(patsubst %8,%,$(patsubst %9,%, \
           $(TEMPLATE1)))))))))))
 TEMPLATE3=$(addsuffix .template,$(addprefix ../,$(TEMPLATE2)))
-TEMPLATE_FILENAME=$(firstword $(wildcard $(addprefix ../,$($*_TEMPLATE)) ../$*.template $(TEMPLATE3)) $(TEMPLATE3))
+TEMPLATE_FILENAME=$(firstword $(wildcard $(addprefix ../,$($*_TEMPLATE)) ../$*.template $(TEMPLATE3) ../template))
 
 # dbst based database optimization
 ifeq '$(DB_OPT)' 'YES'
@@ -80,6 +81,8 @@ DBDDEPENDS_FILES += $(addsuffix $(DEP),$(COMMON_DBDS) \
 DBDDEPENDS_FLAGS = $(filter .%,$(subst -I,,$(filter-out -S%,$(DBDFLAGS))))
 DBDDEPENDS_CMD = -$(MKMF) -m $@$(DEP) $(DBDDEPENDS_FLAGS) $@ $<
 
+MAKEDBDEPENDS = $(PERL) $(TOOLS)/makeDbDepends.pl
+
 ##################################################### 
 
 ifndef T_A
@@ -113,11 +116,11 @@ $(DBDDEPENDS_FILES):
 
 #####################################################  build dependancies, clean rule
 
-ifdef DBD_INSTALLS
+ifneq (,$(strip $(DBD_INSTALLS)))
 buildInstall : dbdInstalls
 endif
 
-ifdef DB_INSTALLS
+ifneq (,$(strip $(DB_INSTALLS)))
 buildInstall : dbInstalls
 endif
 
@@ -134,26 +137,6 @@ clean::
 	@$(RM) *_registerRecordDeviceDriver.cpp
 	@$(RM) $(TARGETS)
 
-##################################################### "Foreign" templates
-
-TEMPLATE_LINKS	= $(filter-out $(notdir $(USES_TEMPLATE)), $(USES_TEMPLATE))
-TEMPLATE_FILES	= $(filter     $(notdir $(USES_TEMPLATE)), $(USES_TEMPLATE))
-COMMON_TEMPLATES=$(addsuffix $(COMMON_DIR)/,$(notdir $(TEMPLATE_LINKS)))
-
-ifneq '$(TEMPLATE_LINKS)' ''
-build: $(notdir $(TEMPLATE_LINKS))
-endif
-build: $(TEMPLATE_FILES)
-
-$(COMMON_TEMPLATES): $(COMMON_DIR)/%.template: 
-ifndef WIN32
-	@$(RM) $(notdir $(TEMPLATE_LINKS))
-	ln -s $(TEMPLATE_LINKS) 
-else
-	@$(RM) $(notdir $(TEMPLATE_LINKS))
-	$(CP) $(TEMPLATE_LINKS) 
-endif
-
 ##################################################### CapFast filter
 
 $(COMMON_DIR)/%.edf: ../%.sch $(DEPSCHS) 
@@ -254,19 +237,26 @@ $(COMMON_DIR)/%.db$(RAW): $(COMMON_DIR)/%.edf
 	@$(REPLACEVAR) < $@.VAR > $@
 	@$(RM) $@.VAR
 
-# dbst based database optimization
+#$(COMMON_DIR)/%.db$(RAW): %.substitutions %.template
+#	@$(RM) $@$(DEP)
+#	@$(MAKEDBDEPENDS) $@ $^  >> $@$(DEP)
+#	@echo "Inflating database from $^"
+#	@$(RM) $@
+#	$(MSI) $(DBFLAGS) -S$< $(firstword $(patsubst %.substitutions,,$^)) > msi.tmp
+#	$(MV) msi.tmp $@
+
 $(COMMON_DIR)/%.db$(RAW): %.substitutions
 	@$(RM) $@$(DEP)
-	@$(DBDDEPENDS_CMD)
+	@$(MAKEDBDEPENDS) $@ $< $(TEMPLATE_FILENAME) >> $@$(DEP)
 	@echo "$@:$(TEMPLATE_FILENAME)" >> $@$(DEP)
-	@echo "Inflating database from $<"
+	@echo "Inflating database from $< $(TEMPLATE_FILENAME)"
 	@$(RM) $@
 	$(MSI) $(DBFLAGS) -S$< $(TEMPLATE_FILENAME) > msi.tmp
 	$(MV) msi.tmp $@
 
 $(COMMON_DIR)/%.db$(RAW): %.template
 	@$(RM) $@$(DEP)
-	@$(DBDDEPENDS_CMD)
+	@$(MAKEDBDEPENDS) $@ $^  >> $@$(DEP)
 	@echo "Inflating database from $<"
 	@$(RM) $@
 	$(MSI) $(DBFLAGS)  $< > msi.tmp

configure/RULES.ioc

@@ -13,8 +13,17 @@ include $(CONFIG)/RULES_DIRS
 build: buildInstall
 install: buildInstall
 
+ifneq ($(findstring $(ARCH),$(BUILD_ARCHS)),)
 buildInstall: $(TARGETS)
 
+clean:
+	$(RM) cdCommands envPaths
+
+else 
+buildInstall:
+clean:
+endif
+
 envPaths cdCommands: $(wildcard $(TOP)/configure/RELEASE*) \
 	$(TOP)/configure/CONFIG $(INSTALL_BIN)
 	@$(RM) $@
@@ -24,6 +33,6 @@ else
 	$(PERL) $(TOOLS)/convertRelease.pl -a $(ARCH) -t $(IOCS_APPL_TOP) $@
 endif
 
-realclean clean:
+realclean:
 	$(RM) cdCommands envPaths
 

configure/RULES_BUILD

@@ -101,6 +101,7 @@ LIBTARGETS += $(LIBNAME) $(INSTALL_LIBS) \
 
 #---------------------------------------------------------------
 ifneq ($(CONFIG),$(TOP)/configure)
+RULES_TOP:=$(INSTALL_LOCATION)
 -include $(TOP)/configure/RULES_BUILD
 endif
 -include $(TOP)/configure/O.$(T_A)/RULES_INCLUDE
@@ -134,11 +135,15 @@ ifdef BIN_INSTALLS
 buildInstall : binInstalls
 endif
 
+ifdef LIB_INSTALLS
+buildInstall : libInstalls
+endif
+
 clean::
 	@echo "Cleaning"
 	@$(RM) *.i *$(OBJ) *.a $(TESTPRODNAME) $(LIBNAME) $(SHRLIBNAME)\
 	$(INC) *$(RES) $(TARGETS) $(DLL_LINK_LIBNAME) $(TDS) \
-	*.out MakefileInclude  $(LOADABLE_SHRLIBNAME) \
+	*.out MakefileInclude  $(LOADABLE_SHRLIBNAME) *.manifest *.exp \
 	$(COMMON_INC) $(HDEPENDS_FILES) $(PRODTARGETS)
 ifdef BAF
 	@$(RM) $(PROD_BAF) $(LIB_BAF) *$(BOF)
@@ -172,7 +177,7 @@ $(OBJLIBNAME):%$(OBJ): $(OBJLIB_LD_OBJS)
 %$(OBJ): %.c
 	@$(HDEPENDS_CMD)
 	@$(RM) $@
-	$(COMPILE.c) $(call PATH_FILTER,$<)
+	$(COMPILE.c) $(call PATH_FILTER,$<) $(COMPILE_FILTER.c)
 
 %$(OBJ): %.cc
 	@$(HDEPENDS_CMD)
@@ -286,13 +291,13 @@ $(LOADABLE_SHRLIBNAME):$(LOADABLE_SHRLIB_PREFIX)%$(LOADABLE_SHRLIB_SUFFIX): $(LI
 	@$(RM) $@
 	$(PERL) $(TOOLS)/munch.pl <  $< > $@
 
-$(MUNCHNAME):%.munch : %_ctdt$(OBJ) %$(EXE)
+$(MUNCHNAME):%$(MUNCH_SUFFIX) : $(MUNCH_DEPENDS) %$(EXE)
 	@$(RM) $@
-	$(LDCMD)
+	$(MUNCH_CMD)
 
 $(OBJLIB_MUNCHNAME):%.munch : %_ctdt$(OBJ) %$(OBJ)
 	@$(RM) $@
-	$(LDCMD)
+	$(MUNCH_CMD)
 
 # Ext, app and module rules
 RULES_INCLUDE CONFIG_APP_INCLUDE: $(wildcard $(TOP)/configure/RELEASE*)
@@ -303,13 +308,25 @@ binInstalls:  $(BIN_INSTALLS)
 	@echo "Installing $(^F)"
 	@$(INSTALL) -d -m 555 $^ $(INSTALL_BIN)
 
+libInstalls:  $(LIB_INSTALLS)
+	@echo "Installing $(^F)"
+	@$(INSTALL) -d -m 555 $^ $(INSTALL_LIB)
+
 $(INSTALL_BIN)/%: ../os/$(OS_CLASS)/%
 	@echo "Installing os-specific script $@"
 	@$(INSTALL_PRODUCT) -d -m 555 $< $(INSTALL_BIN)
 
 $(INSTALL_BIN)/%: %
 	@echo "Installing binary $@"
+ifdef WIN32
+ifdef BORLAND
 	@$(INSTALL_PRODUCT) -d -m 555 $< $(INSTALL_BIN)
+else
+	@$(INSTALL_PRODUCT) -d -m 555 $<* $(INSTALL_BIN)
+endif
+else
+	@$(INSTALL_PRODUCT) -d -m 555 $< $(INSTALL_BIN)
+endif
 
 $(INSTALL_BIN)/%: ../%
 	@echo "Installing script $@"
@@ -329,11 +346,12 @@ $(INSTALL_LIB)/%.lib: %.lib
 $(INSTALL_SHRLIB)/lib%: lib%
 	@echo "Installing shared library $@"
 	@$(INSTALL_LIBRARY) -d -m 555 $< $(INSTALL_SHRLIB)
-ifdef SHRLIB_VERSION
+ifneq (,$(strip $(SHRLIB_VERSION)))
 	@$(RM) $(subst .$(SHRLIB_VERSION),,$@)
 	ln -s $< $(subst .$(SHRLIB_VERSION),,$@)
 endif # SHRLIB_VERSION
 
+
 ifneq ($(INSTALL_TCLLIB),$(INSTALL_BIN))
 $(INSTALL_TCLLIB)/%: %
 	@echo "Installing Tcl library $@"
@@ -344,9 +362,17 @@ $(INSTALL_TCLLIB)/%: ../%
 	@$(INSTALL) -d -m 555 $< $(INSTALL_TCLLIB)
 endif
 
+$(INSTALL_TCLLIB)/$(TCLINDEX): $(INSTALL_TCLLIBS)
+	@echo "Updating $@"
+	@echo eval auto_mkindex $(INSTALL_TCLLIB) "$(TCLLIBNAME)" | tclsh
+
 $(INSTALL_LOADABLE_SHRLIBS): $(INSTALL_SHRLIB)/%: %
 	@echo "Installing loadable shared library $@"
 	@$(INSTALL_LIBRARY) -d -m 555 $< $(INSTALL_SHRLIB)
+ifneq (,$(strip $(LOADABLE_SHRLIB_VERSION)))
+	@$(RM) $(subst .$(LOADABLE_SHRLIB_VERSION),,$@)
+	ln -s $< $(subst .$(LOADABLE_SHRLIB_VERSION),,$@)
+endif # LOADABLE_SHRLIB_VERSION
 
 $(INSTALL_CONFIG)/%: %
 	@echo "Installing config file $@"
@@ -395,7 +421,7 @@ $(INSTALL_TEMPLATES_SUBDIR)/%: %
 .PRECIOUS: %.i %.o %.c %.nm %.cpp %.cc
 .PRECIOUS: $(COMMON_INC)
 
-.PHONY: all inc build install clean rebuild buildInstall binInstalls
+.PHONY: all inc build install clean rebuild buildInstall binInstalls libInstalls
 
 endif # BASE_RULES_BUILD
 #	EOF RULES_BUILD

configure/RULES_JAVA

@@ -11,6 +11,8 @@
 #
 
 
+ifeq ($(BUILD_CLASS),HOST)
+
 #-------------------------------------------------------
 # java jdk1.1.5 definitions
 
@@ -20,13 +22,16 @@ JAVA_INCLUDES += -I$(JAVA_INC) -I$(JAVA_INC)/$(word 1, $(subst -, ,$(T_A))) -I$(
 
 JAVACCMD = $(subst \,/,$(JAVA_BIN)/javac$(EXE) $(CLASSPATH) $(SOURCEPATH) $(JAVACFLAGS))
 JAVAHCMD = $(subst \,/,$(JAVA_BIN)/javah$(EXE) -d $(COMMON_DIR) -force $(CLASSPATH) $(JAVAHFLAGS))
-JARCMD   = $(subst \,/,$(JAVA_BIN)/jar$(EXE) $(JAR_OPTIONS) $(COMMON_JAR) $(JARINPUT) $(JARPACKAGES))
+JARCMD   = $(subst \,/,$(JAVA_BIN)/jar$(EXE) $(JAR_OPTIONS) $@ $(JARINPUT) $(JARPACKAGES))
 
 #-------------------------------------------------------
 vpath %.java .. 
+vpath %.jar .. $(COMMON_DIR)
 
-CLASSPATH=-classpath $(INSTALL_JAVA)$(addprefix :,$(USR_CLASSPATH))
-SOURCEPATH=-sourcepath .:..:../..
+empty:=
+space:= $(empty) $(empty)
+CLASSPATH = -classpath $(subst $(space),:,$(strip $(USR_PRECLASSPATH) $(INSTALL_JAVA) $(USR_CLASSPATH)))
+SOURCEPATH = -sourcepath .:..:../..
 
 #-------------------------------------------------------
 # Java directory
@@ -58,12 +63,12 @@ DEPTESTJAVA += $(subst .class,.java,$(TESTCLASSES))
 #-------------------------------------------------------
 # Java jar file
 
-COMMON_JAR += $(addprefix $(COMMON_DIR)/,$(JAR))
-INSTALL_JAR =$(addprefix $(INSTALL_JAVA)/,$(JAR))
+INSTALL_JAR =$(addprefix $(INSTALL_JAVA)/,$(JAR) $(JAR_INPUT))
 JARMANIFEST += $(firstword $(MANIFEST) $(JAR_MANIFEST))
-JARINPUT += $(subst .java,.class,$(JAR_INPUT))
-JARDEPFILES += $(addprefix $(INSTALL_JAVA)/,$(subst .java,.class,$(JAVA))) $(JARINPUT)
+JARDEPFILES += $(addprefix $(INSTALL_JAVA)/,$(subst .java,.class,$(JAVA)) $(JAR_INPUT))
+JARINPUT += $(foreach inp,$(JAR_INPUT),-C $(INSTALL_JAVA) $(subst .java,.class,$(inp)))
 JARPACKAGES += $(foreach pkg,$(JAR_PACKAGES),-C $(INSTALL_JAVA) $(subst .,/,$(pkg)))
+PACKAGEDIRS += $(foreach pkg,$(JAR_PACKAGES),$(addprefix $(INSTALL_JAVA)/,$(subst .,/,$(pkg))))
 
 ifneq ($(JARMANIFEST),)
 JAR_OPTIONS = cvmf $(JARMANIFEST)
@@ -94,15 +99,15 @@ inc:  $(JAVA_DIRECTORY_TARGETS) $(INSTALL_CLASSES) $(COMMON_JAVAINC)
 
 build: inc
 
-build:  $(COMMON_TESTCLASSES) $(COMMON_JAR)
+build:  $(COMMON_TESTCLASSES)
 
 buildInstall : $(INSTALL_JAR) $(INSTALL_JAVADOC)
 
 #This clean works only from O.* dirs.
 clean:: 
-	@$(RMDIR) $(INSTALL_CLASSES)
+	@$(RMDIR) $(INSTALL_CLASSES) $(PACKAGEDIRS)
 	@$(RM) $(INSTALL_JAR) $(INSTALL_JAVADOC)
-	@$(RM) $(COMMON_TESTCLASSES) $(COMMON_JAR) $(COMMON_JAVAINC)
+	@$(RM) $(COMMON_TESTCLASSES) $(COMMON_JAVAINC)
 
 ifdef JAVA_DIRECTORY_TARGETS
 $(JAVA_DIRECTORY_TARGETS):
@@ -138,7 +143,16 @@ $(INSTALL_JAVA)/%.jar: $(COMMON_DIR)/%.jar
 	@echo "Installing java jar file $@"
 	@$(INSTALL) -d -m 644 $< $(@D)
 
+$(INSTALL_JAVA)/%.jar: %.jar
+	@echo "Installing java jar file $@"
+	@$(INSTALL) -d -m 644 $< $(@D)
+
+$(addprefix $(INSTALL_JAVA)/, $(JARINPUT)): $(INSTALL_JAVA)/%: ../%
+	@echo "Installing jar input file $@"
+	@$(INSTALL) -d -m 644 $< $(@D)
+
 .PHONY: all install buildInstall rebuild clean build inc
 
 .PRECIOUS: $(COMMON_JAVAINC)
 
+endif

configure/RULES_TOP

@@ -13,6 +13,10 @@
 
 include $(CONFIG)/RULES_DIRS
 
+UNINSTALL_DIRS += $(INSTALL_DBD) $(INSTALL_INCLUDE) $(INSTALL_DOC)\
+        $(INSTALL_HTML) $(INSTALL_JAVA) $(INSTALL_TEMPLATES) \
+        $(INSTALL_DB)
+
 uninstallArchTargets = $(foreach arch,$(BUILD_ARCHS), uninstall$(DIVIDER)$(arch))
 archPart = $(word 2, $(subst $(DIVIDER), ,$@))
 
@@ -36,17 +40,13 @@ cvsclean:
 
 realuninstall:
 	@$(RMDIR) $(INSTALL_LOCATION_BIN) $(INSTALL_LOCATION_LIB)
-	@$(RMDIR) $(INSTALL_DBD) $(INSTALL_INCLUDE) $(INSTALL_DOC)\
-		$(INSTALL_HTML) $(INSTALL_JAVA) $(INSTALL_TEMPLATES) \
-		$(INSTALL_DB)
+	@$(RMDIR) $(UNINSTALL_DIRS)
 
 uninstall: $(addprefix uninstall$(DIVIDER),$(BUILD_ARCHS))
 	@$(MAKE) -f Makefile  cleandirs
 
 uninstallDirs:
-	@$(RMDIR) $(INSTALL_DBD) $(INSTALL_INCLUDE) $(INSTALL_DOC)\
-		$(INSTALL_HTML) $(INSTALL_JAVA) $(INSTALL_TEMPLATES) \
-		$(INSTALL_DB)
+	@$(RMDIR) $(UNINSTALL_DIRS)
 
 help:
 	@echo "Usage: gnumake [options] [target] ..."

configure/os/CONFIG.Common.RTEMS

@@ -13,17 +13,19 @@
 #-------------------------------------------------------
 #
 
-#-------------------------------------------------------
-# Where to find RTEMS
-RTEMS_BASE=/opt/rtems
-
 #-------------------------------------------------------
 # RTEMS tools are similar to UNIX tools
 -include $(CONFIG)/os/CONFIG.Common.UnixCommon
 
+GNU_TARGET_INCLUDE_DIR =
+
+#--------------------------------------------------
+# Get RTEMS_BASE definition
+-include $(CONFIG)/os/CONFIG_SITE.Common.RTEMS
+
 #-------------------------------------------------------
 # Pick up the RTEMS tool/path definitions from the RTEMS BSP directory.
-include $(RTEMS_BASE)/$(RTEMS_TARGET_CPU)-rtems/$(subst RTEMS-,,$(T_A))/Makefile.inc
+include $(RTEMS_BASE)/$(RTEMS_TARGET_CPU)-rtems$(RTEMS_VERSION)/$(subst RTEMS-,,$(T_A))/Makefile.inc
 include $(RTEMS_CUSTOM)
 include $(CONFIG.CC)
 
@@ -46,7 +48,7 @@ VALID_BUILDS = Ioc
 # through the following contortions to get the EPICS flags back.
 CFLAGS = $(CONFORM_CFLAGS) $(CROSS_CFLAGS) $(OPT_CFLAGS) $(DEBUG_CFLAGS)\
  $(WARN_CFLAGS) $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS)\
- $(CODE_CFLAGS) $(STATIC_CFLAGS) $(OP_SYS_CFLAGS) $(LIBRARY_SRC_CFLAGS)
+ $(CODE_CFLAGS) $(STATIC_CFLAGS)  $(OP_SYS_CFLAGS) $(LIBRARY_SRC_CFLAGS)
 
 CXXFLAGS = $(CONFORM_CXXFLAGS) $(CROSS_CXXFLAGS) $(OPT_CXXFLAGS)\
  $(DEBUG_CXXFLAGS) $(WARN_CXXFLAGS) $(TARGET_CXXFLAGS) $(USR_CXXFLAGS)\
@@ -69,6 +71,10 @@ $(BASE_CPPFLAGS) $(TARGET_CPPFLAGS) $(USR_CPPFLAGS) $(ARCH_DEP_CPPFLAGS)\
 CROSS_CPPFLAGS =
 CROSS_LDFLAGS =
 SHRLIB_CFLAGS =
+OPT_CFLAGS_YES   = $(CFLAGS_OPTIMIZE_V)
+OPT_CXXFLAGS_YES = $(CFLAGS_OPTIMIZE_V)
+OPT_CFLAGS_NO    = $(CFLAGS_DEBUG_V)
+OPT_CXXFLAGS_NO  = $(CFLAGS_DEBUG_V)
 
 #--------------------------------------------------
 # operating system class (include/os/<os_class>)
@@ -76,7 +82,7 @@ OS_CLASS = RTEMS
 
 #--------------------------------------------------
 # Operating system flags
-OP_SYS_LDLIBS += -lrtemsCom -lrtemscpu -lCom -lm
+OP_SYS_LDLIBS += -lrtemsCom -lrtemscpu -lCom -lrtemsNfs -lm
 OP_SYS_LDFLAGS += $(CPU_CFLAGS) -u Init \
                  $(PROJECT_RELEASE)/lib/no-dpmem.rel \
                  $(PROJECT_RELEASE)/lib/no-mp.rel \

configure/os/CONFIG.Common.RTEMS-mvme2100

@@ -0,0 +1,27 @@
+#
+# $Id$
+# Author: W. Eric Norum
+#         Canadian Light Source
+#         eric@cls.usask.ca
+#
+# All RTEMS targets use the same Makefile fragment
+#
+RTEMS_TARGET_CPU = powerpc
+ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
+ARCH_DEP_CFLAGS += -DHAVE_PPCBUG
+
+MUNCH_SUFFIX = .boot
+MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
+define MUNCH_CMD
+	$(RTEMS_BASE)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< rtems
+	gzip -f9 rtems
+	$(RTEMS_BASE)/bin/$(LD_FOR_TARGET) -o $@ \
+		 $(PROJECT_RELEASE)/lib/bootloader.o \
+		--just-symbols=$< \
+		-b binary rtems.gz \
+		-T $(PROJECT_RELEASE)/lib/ppcboot.lds \
+		-Map $<.map
+	rm -f rtems.gz
+endef
+
+include $(CONFIG)/os/CONFIG.Common.RTEMS

configure/os/CONFIG.Common.RTEMS-mvme5500

@@ -0,0 +1,19 @@
+#
+# $Id$
+# Author: W. Eric Norum
+#         Advanced Photon Source
+#         norume@aps.anl.gov
+#
+# All RTEMS targets use the same Makefile fragment
+#
+RTEMS_TARGET_CPU = powerpc
+ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
+ARCH_DEP_CFLAGS += -DHAVE_MOTLOAD
+
+MUNCH_SUFFIX = .boot
+MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
+define MUNCH_CMD
+	$(RTEMS_BASE)/bin/$(OBJCOPY_FOR_TARGET) -O binary $< $@
+endef
+
+include $(CONFIG)/os/CONFIG.Common.RTEMS

configure/os/CONFIG.Common.RTEMS-pc386

@@ -7,6 +7,16 @@
 # All RTEMS targets use the same Makefile fragment
 #
 RTEMS_TARGET_CPU=i386
+
+MUNCH_SUFFIX = .boot
+MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
+define MUNCH_CMD
+	$(RTEMS_BASE)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< temp.bin
+	$(PROJECT_RELEASE)/build-tools/bin2boot $@ 0x00097E00 \
+		$(PROJECT_RELEASE)/lib/start16.bin 0x00097C00 0 temp.bin 0x00100000 0
+	rm -f temp.bin
+endef
+
 include $(CONFIG)/os/CONFIG.Common.RTEMS
 
 #

configure/os/CONFIG.Common.RTEMS-uC5282

@@ -0,0 +1,23 @@
+#
+# $Id$
+# Author: W. Eric Norum
+#         Canadian Light Source
+#         eric@cls.usask.ca
+#
+# All RTEMS targets use the same Makefile fragment
+#
+RTEMS_TARGET_CPU = m68k
+ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
+
+MUNCH_SUFFIX = .boot
+MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
+define MUNCH_CMD
+	$(RTEMS_BASE)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< $@
+endef
+
+include $(CONFIG)/os/CONFIG.Common.RTEMS
+
+#
+# Must put this one so it shows up after the -m528x
+#
+OP_SYS_LDFLAGS += -m5200

configure/os/CONFIG.Common.UnixCommon

@@ -17,12 +17,9 @@ VALID_BUILDS = Host Ioc
 GNU_DIR = /usr/local
 
 #-------------------------------------------------------
-FULLPATHTOP= $(shell perl $(TOOLS)/fullPathName.pl $(TOP))
-# Get fullpathname of modules relative to TOP
-SHRLIB_SEARCH_FULLPATHTOP = $(SHRLIB_SEARCH_DIRS:$(TOP)/%=$(FULLPATHTOP)/%)
-# Get fullpathname of other relative dirs
-SHRLIB_SEARCH_FULLPATHDIRS = $(SHRLIB_SEARCH_FULLPATHTOP:.%= \
-  $(shell perl $(TOOLS)/fullPathName.pl .%)
+# Get fullpathname of relative dirs
+SHRLIB_SEARCH_FULLPATHDIRS = $(foreach dir,$(SHRLIB_SEARCH_DIRS), \
+  $(shell perl $(TOOLS)/fullPathName.pl $(dir)))
 
 #-------------------------------------------------------
 # Unix prefix and suffix definitions
@@ -32,7 +29,7 @@ OBJ = .o
 LIB_PREFIX = lib
 LIB_SUFFIX = .a
 SHRLIB_SUFFIX = .so$(addprefix .,$(SHRLIB_VERSION))
-LOADABLE_SHRLIB_SUFFIX = .so
+LOADABLE_SHRLIB_SUFFIX = .so$(addprefix .,$(LOADABLE_SHRLIB_VERSION))
 LOADABLE_SHRLIB_PREFIX = lib
 
 #-------------------------------------------------------

configure/os/CONFIG.Common.aix-ppc

@@ -17,9 +17,8 @@ ARCH_CLASS = ppc
 
 CODE_CPPFLAGS = -D_REENTRANT
 
-POSIX_CPPFLAGS_YES = -D_POSIX_C_SOURCE=199506L -D_POSIX_THREADS -D_XOPEN_SOURCE=500 -D_ALL_SOURCE
-POSIX_CPPFLAGS_NO =
-POSIX_LDLIBS_YES = -lpthread
+POSIX_CPPFLAGS = -D_POSIX_C_SOURCE=199506L -D_POSIX_THREADS -D_XOPEN_SOURCE=500 -D_ALL_SOURCE
+POSIX_LDLIBS = -lpthread
 
 #SHARED_LIBRARIES=NO
 

configure/os/CONFIG.Common.cygwin-x86

@@ -17,18 +17,20 @@ EXE=.exe
 
 COMPILER_CPPFLAGS = -D_REENTRANT
 
-#POSIX_CPPFLAGS_YES = -D_POSIX_SOURCE=199506L -D_POSIX_THREADS -D_POSIX_TIMERS
+#POSIX_CPPFLAGS = -D_POSIX_SOURCE=199506L -D_POSIX_THREADS -D_POSIX_TIMERS
 # _POSIX_SOURCE eliminates select()
-POSIX_CPPFLAGS_YES = -D_POSIX_THREADS -D_POSIX_TIMERS
-#POSIX_LDLIBS_YES += -lpthread
-POSIX_LDLIBS_YES += -lpthread
+POSIX_CPPFLAGS = -D_POSIX_THREADS -D_POSIX_TIMERS
+POSIX_LDLIBS += -lpthread
 
 ARCH_DEP_CPPFLAGS += -D_X86_
 
 OP_SYS_CPPFLAGS += -DCYGWIN32 -U_WIN32
 
 # Set runtime path for shared libraries
-RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_DIRS:%=-Wl,-rpath,%)
+RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_FULLPATHDIRS:%=-Wl,-rpath,%)
 
-LDLIBS_READLINE = -lcygreadline5 -lcygcurses7
+#  Definitions used when COMMANDLINE_LIBRARY is READLINE
+INCLUDES_READLINE = -I$(GNU_DIR)/include
+LDFLAGS_READLINE += -L$(GNU_DIR)/lib
+LDLIBS_READLINE = -lreadline
 

configure/os/CONFIG.Common.darwin-ppc

@@ -28,31 +28,31 @@ OP_SYS_CFLAGS += -fno-common
 CPPSNCFLAGS += -no-cpp-precomp
 
 #
-# The following two definitions enable the use of DarwinPorts packages.
+# Darwin os definition
 #
-OP_SYS_CPPFLAGS += -I/opt/local/include
-OP_SYS_LDFLAGS += -L/opt/local/lib
+OP_SYS_CPPFLAGS += -Ddarwin
+
+#
+# The following two definitions enable the use of DarwinPorts packages.
+
+#
+OP_SYS_INCLUDES += -I/opt/local/include
+# dir/firstword/wildcard used to avoid warning -L: directory name (...) does not exist
+OP_SYS_LDFLAGS +=  $(addprefix -L,$(dir $(firstword $(wildcard /opt/local/lib/*))))
 
 #
 # The following two definitions enable the use of Fink packages.
 #
-OP_SYS_CPPFLAGS += -I/sw/include
-OP_SYS_LDFLAGS += -L/sw/lib
+OP_SYS_INCLUDES += -I/sw/include
+# dir/firstword/wildcard used to avoid warning -L: directory name (...) does not exist
+OP_SYS_LDFLAGS +=  $(addprefix -L,$(dir $(firstword $(wildcard /sw/lib/*))))
 
 #
 # Libraries for command-line editing.
 #
-LDLIBS_LIBTECLA = -ltecla_r -lncurses
 LDLIBS_READLINE = -lreadline
 
 #
 # Command-line input support
 #
-# Install the DarwinPorts or Fink libtecla1 package and place the following
-# line in CONFIG_SITE.darwin-ppc.Common to use libtecla command-line editing:
-#COMMANDLINE_LIBRARY=LIBTECLA
-# or install the DarwinPorts or Fink readline package and place the following
-# line in CONFIG_SITE.darwin-ppc.Common to use GNU readline
-# command-line editing:
-#COMMANDLINE_LIBRARY=READLINE
-
+COMMANDLINE_LIBRARY=READLINE

configure/os/CONFIG.Common.hpux-parisc

@@ -21,15 +21,11 @@ OP_SYS_CFLAGS = -D_HPUX_SOURCE
 OP_SYS_CXXFLAGS =
 
 SHRLIB_SUFFIX = .sl$(addprefix .,$(SHRLIB_VERSION))
-LOADABLE_SHRLIB_SUFFIX = .sl
+LOADABLE_SHRLIB_SUFFIX = .sl$(addprefix .,$(LOADABLE_SHRLIB_VERSION))
 
 # Set runtime path for shared libraries
 empty:=                                      # trick from the make docs...
 space:= $(empty) $(empty)
 RUNTIME_LDFLAGS = -Wl,+b$(subst $(space),:,$(sort $(SHRLIB_SEARCH_FULLPATHDIRS))),+s
 
-ifeq ($(BUILD_CLASS),CROSS)
-   GNU_TARGET=parisc-hp-unix
-   CMPLR_SUFFIX=
-   CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
-endif
+GNU_TARGET=parisc-hp-unix

configure/os/CONFIG.Common.linux-ppc

@@ -0,0 +1,18 @@
+# CONFIG.Common.linux-ppc
+#
+# This file is maintained by the build community.
+#
+# Definitions for linux-ppc target builds
+# Sites may override these definitions in CONFIG_SITE.Common.linux-ppc
+#-------------------------------------------------------
+
+# Include definitions common to all Unix targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+#
+# Set OS-specific information
+#
+ARCH_CLASS = ppc
+
+ARCH_DEP_CPPFLAGS += -D_ppc_
+

configure/os/CONFIG.Common.linux-x86

@@ -7,28 +7,13 @@
 # Sites may override these definitions in CONFIG_SITE.Common.linux-x86
 #-------------------------------------------------------
 
-# Include definitions common to all Unix targets
-include $(CONFIG)/os/CONFIG.Common.UnixCommon
+# Include definitions common to all linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
 
-OS_CLASS = Linux
 ARCH_CLASS = x86
 
-CODE_CPPFLAGS = -D_REENTRANT
-
-POSIX_CPPFLAGS_YES = -D_POSIX_C_SOURCE=199506L -D_POSIX_THREADS -D_XOPEN_SOURCE=500
-POSIX_CPPFLAGS_NO =
-POSIX_LDLIBS_YES = -lpthread
-
-# -D_BSD_SOURCE for gethostname() in unistd.h as needed by cacChannelIO.cpp.
-OP_SYS_CPPFLAGS += -D_BSD_SOURCE
-OP_SYS_CPPFLAGS += -Dlinux
-OP_SYS_LDLIBS += -lrt
-
 ARCH_DEP_CPPFLAGS += -D_X86_
 
-# Set runtime path for shared libraries
-RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_FULLPATHDIRS:%=-Wl,-rpath,%)
-
 ifeq ($(BUILD_CLASS),CROSS)
 ifeq ($(EPICS_HOST_ARCH),linux-x86)
    # Added for 386,486,... cross builds
@@ -48,5 +33,3 @@ else
 endif
 endif
 
-LDLIBS_READLINE = -lreadline -lcurses
-

configure/os/CONFIG.Common.linux-x86-borland

@@ -13,8 +13,7 @@ include $(CONFIG)/os/CONFIG.Common.UnixCommon
 OS_CLASS = Linux
 ARCH_CLASS = x86
 
-POSIX_CPPFLAGS_NO =
-POSIX_LDLIBS_YES = libpthread.so
+POSIX_LDLIBS = libpthread.so
 
 OP_SYS_CPPFLAGS += -D_BSD_SOURCE -D_SVID_SOURCE
 OP_SYS_CPPFLAGS += -Dlinux
@@ -24,9 +23,3 @@ ARCH_DEP_CPPFLAGS += -D_X86_
 
 RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(SHARED_LIBRARIES))
 
-ifeq ($(BUILD_CLASS),CROSS)
-   GNU_TARGET=i586-pc-linux-gnu
-   CMPLR_SUFFIX=
-   CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
-endif
-

configure/os/CONFIG.Common.linux-x86_64

@@ -0,0 +1,35 @@
+# CONFIG.Common.linux-x86_64
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for linux-x86_64 target builds
+# Sites may override these definitions in CONFIG_SITE.Common.linux-x86_64
+#-------------------------------------------------------
+
+# Include definitions common to all linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = x86_64
+
+ARCH_DEP_CPPFLAGS += -D_X86_64_
+
+ifeq ($(BUILD_CLASS),CROSS)
+ifeq ($(EPICS_HOST_ARCH),linux-x86_64)
+   # Added for 386,486,... cross builds
+   CMPLR_PREFIX=
+   CROSS_INCLUDES=
+   CROSS_LDFLAGS=
+   # Use -w not -Wall
+   #WARN_CFLAGS_YES = -w
+   #WARN_CXXFLAGS_YES = -w
+-include $(CONFIG)/os/CONFIG_SITE.Common.linux-x86_64
+-include $(CONFIG)/os/CONFIG.linux-x86_64.linux-x86_64
+-include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.linux-x86_64
+else
+   GNU_TARGET=i586-pc-linux-gnu
+   CMPLR_SUFFIX=
+   CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
+endif
+endif
+

configure/os/CONFIG.Common.linux-x86_64-debug

@@ -0,0 +1,12 @@
+# CONFIG.Common.linux-x86_64-debug
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for linux-x86_64 with debug compiler flags
+# Sites may override these definitions in CONFIG_SITE.Common.linux-x86_64-debug
+#-------------------------------------------------------
+
+# Include definitions common to all linux-x86_64  target archs
+include $(CONFIG)/os/CONFIG.Common.linux-x86_64
+

configure/os/CONFIG.Common.linuxCommon

@@ -0,0 +1,30 @@
+# CONFIG.Common.linuxCommon
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for linux target builds
+# Sites may override these definitions in CONFIG_SITE.Common.linuxCommon
+#-------------------------------------------------------
+
+# Include definitions common to all Unix targets
+include $(CONFIG)/os/CONFIG.Common.UnixCommon
+
+OS_CLASS = Linux
+
+CODE_CPPFLAGS = -D_REENTRANT
+
+POSIX_CPPFLAGS = -D_POSIX_C_SOURCE=199506L -D_POSIX_THREADS -D_XOPEN_SOURCE=500
+POSIX_LDLIBS = -lpthread
+
+# -D_BSD_SOURCE for gethostname() in unistd.h as needed by cacChannelIO.cpp.
+OP_SYS_CPPFLAGS += -D_BSD_SOURCE
+OP_SYS_CPPFLAGS += -Dlinux
+OP_SYS_LDLIBS += -lrt
+
+# Set runtime path for shared libraries
+RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_FULLPATHDIRS:%=-Wl,-rpath,%)
+
+#  Definitions used when COMMANDLINE_LIBRARY is READLINE
+LDLIBS_READLINE = -lreadline -lcurses
+

configure/os/CONFIG.Common.solaris-sparc

@@ -20,21 +20,18 @@ COMPILER_LDFLAGS += -mt
 
 SOLARIS_VERSION = $(subst 5.,,$(shell uname -r))
 
-POSIX_CPPFLAGS_YES += -D_POSIX_C_SOURCE=199506L $(POSIX_CPPFLAGS_YES_$(SOLARIS_VERSION))
-POSIX_CPPFLAGS_YES += -D_XOPEN_SOURCE=500
-POSIX_LDLIBS_YES += -lposix4 -lpthread $(POSIX_LDLIBS_YES_$(SOLARIS_VERSION))
+POSIX_CPPFLAGS += -D_POSIX_C_SOURCE=199506L $(POSIX_CPPFLAGS_YES_$(SOLARIS_VERSION))
+POSIX_CPPFLAGS += -D_XOPEN_SOURCE=500
+POSIX_LDLIBS += -lposix4 -lpthread $(POSIX_LDLIBS_YES_$(SOLARIS_VERSION))
 
 OP_SYS_CPPFLAGS += -DSOLARIS=$(SOLARIS_VERSION) $(COMPILER_CPPFLAGS)
 OP_SYS_LDFLAGS +=  $(COMPILER_LDFLAGS)
 
 # Set runtime path for shared libraries
 RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_FULLPATHDIRS:%=-R%)
+RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(COMMANDLINE_LIBRARY))
 
-ifeq ($(BUILD_CLASS),CROSS)
-   GNU_TARGET=sparc-sun-solaris2
-   CMPLR_SUFFIX=
-   CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
-endif
+GNU_TARGET=sparc-sun-solaris2
 
 OP_SYS_LDLIBS += -lsocket -lnsl
 OP_SYS_LDLIBS_8 += -lCrun -lc -lCstd
@@ -42,9 +39,8 @@ OP_SYS_LDLIBS_9 += -lCrun -lc -lCstd
 OP_SYS_LDLIBS += $(OP_SYS_LDLIBS_$(SOLARIS_VERSION))
 
 #  Definitions used when COMMANDLINE_LIBRARY is READLINE
-GNU_DIR = /opt/gnu
 INCLUDES_READLINE = -I$(GNU_DIR)/include
-LDFLAGS_READLINE += -R$(GNU_DIR)/lib
+RUNTIME_LDFLAGS_READLINE += -R$(GNU_DIR)/lib
 LDFLAGS_READLINE += -L$(GNU_DIR)/lib
 LDLIBS_READLINE = -lreadline -lcurses
 # Use archive if there is a problem with the readline shared library

configure/os/CONFIG.Common.solaris-sparc-gnu

@@ -16,5 +16,6 @@ COMPILER_CPPFLAGS =  -D_REENTRANT
 OP_SYS_LDLIBS_8 = -lc
 OP_SYS_LDLIBS_9 = -lc
 
-OP_SYS_LDFLAGS += -R$(GNU_LIB) -L$(GNU_LIB)
+RUNTIME_LDFLAGS += -R$(GNU_LIB)
+OP_SYS_LDFLAGS += -L$(GNU_LIB)
 

configure/os/CONFIG.Common.solaris-sparc64

@@ -0,0 +1,15 @@
+# CONFIG.Common.solaris-sparc64
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for solaris-sparc64 compiler target archs
+# Sites may override these definitions in CONFIG_SITE.Common.solaris-sparc64
+#-------------------------------------------------------
+
+# Include definitions common to all solaris-sparc target archs
+include $(CONFIG)/os/CONFIG.Common.solaris-sparc
+
+ARCH_DEP_CFLAGS += -xtarget=ultra -xarch=v9
+ARCH_DEP_CXXFLAGS += -xtarget=ultra -xarch=v9
+ARCH_DEP_LDFLAGS += -xtarget=ultra -xarch=v9

configure/os/CONFIG.Common.solaris-sparc64-gnu

@@ -0,0 +1,18 @@
+# CONFIG.Common.solaris-sparc64-gnu
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for solaris-sparc64 gnu compiler target archs
+# Sites may override these definitions in CONFIG_SITE.Common.solaris-sparc64-gnu
+#-------------------------------------------------------
+
+# Include definitions common to all solaris-sparc-gnu  target archs
+include $(CONFIG)/os/CONFIG.Common.solaris-sparc-gnu
+
+ARCH_DEP_CFLAGS += -mcpu=v9 -m64
+ARCH_DEP_CXXFLAGS += -mcpu=v9 -m64
+ARCH_DEP_LDFLAGS += -mcpu=v9 -m64
+
+
+

configure/os/CONFIG.Common.solaris-x86

@@ -20,9 +20,9 @@ COMPILER_LDFLAGS += -mt
 
 SOLARIS_VERSION = $(subst 5.,,$(shell uname -r))
 
-POSIX_CPPFLAGS_YES += -D_POSIX_C_SOURCE=199506L $(POSIX_CPPFLAGS_YES_$(SOLARIS_VERSION))
-POSIX_CPPFLAGS_YES += -D_XOPEN_SOURCE=500
-POSIX_LDLIBS_YES += -lposix4 -lpthread $(POSIX_LDLIBS_YES_$(SOLARIS_VERSION))
+POSIX_CPPFLAGS += -D_POSIX_C_SOURCE=199506L $(POSIX_CPPFLAGS_$(SOLARIS_VERSION))
+POSIX_CPPFLAGS += -D_XOPEN_SOURCE=500
+POSIX_LDLIBS += -lposix4 -lpthread $(POSIX_LDLIBS_$(SOLARIS_VERSION))
 
 OP_SYS_CPPFLAGS += -DSOLARIS=$(SOLARIS_VERSION) $(COMPILER_CPPFLAGS)
 OP_SYS_LDFLAGS +=  $(COMPILER_LDFLAGS)
@@ -30,12 +30,9 @@ ARCH_DEP_CPPFLAGS = -D_X86_
 
 # Set runtime path for shared libraries
 RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_FULLPATHDIRS:%=-R%)
+RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(COMMANDLINE_LIBRARY))
 
-ifeq ($(BUILD_CLASS),CROSS)
-   GNU_TARGET=x86-sun-solaris2
-   CMPLR_SUFFIX=
-   CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
-endif
+GNU_TARGET=x86-sun-solaris2
 
 OP_SYS_LDLIBS += -lsocket -lnsl
 OP_SYS_LDLIBS_8 += -lCrun -lc -lCstd
@@ -43,9 +40,8 @@ OP_SYS_LDLIBS_9 += -lCrun -lc -lCstd
 OP_SYS_LDLIBS += $(OP_SYS_LDLIBS_$(SOLARIS_VERSION))
 
 #  Definitions used when COMMANDLINE_LIBRARY is READLINE
-GNU_DIR = /opt/gnu
 INCLUDES_READLINE = -I$(GNU_DIR)/include
-LDFLAGS_READLINE += -R$(GNU_DIR)/lib
+RUNTIME_LDFLAGS_READLINE += -R$(GNU_DIR)/lib
 LDFLAGS_READLINE += -L$(GNU_DIR)/lib
 LDLIBS_READLINE = -lreadline -lcurses
 # Use archive if there is a problem with the readline shared library

configure/os/CONFIG.Common.solaris-x86-gnu

@@ -15,5 +15,6 @@ COMPILER_CPPFLAGS = -D_REENTRANT
 OP_SYS_LDLIBS_8 = -lc
 OP_SYS_LDLIBS_9 = -lc
 
-OP_SYS_LDFLAGS += -R$(GNU_LIB) -L$(GNU_LIB)
+RUNTIME_LDFLAGS += -R$(GNU_LIB)
+OP_SYS_LDFLAGS += -L$(GNU_LIB)
 

configure/os/CONFIG.Common.vxWorks-68040

@@ -19,4 +19,6 @@ ARCH_CLASS = 68k
 ARCH_DEP_CPPFLAGS = -DCPU=MC68040
 ARCH_DEP_CFLAGS = -m68040
 
+OPT_CFLAGS_YES = -O0
+
 GNU_TARGET = m68k-wrs-vxworks

configure/os/CONFIG.Common.vxWorks-68040lc

@@ -19,4 +19,6 @@ ARCH_CLASS = 68k
 ARCH_DEP_CPPFLAGS = -DCPU=MC68LC040
 ARCH_DEP_CFLAGS = -m68040 -msoft-float
 
+OPT_CFLAGS_YES = -O0
+
 GNU_TARGET = m68k-wrs-vxworks

configure/os/CONFIG.Common.vxWorks-68060

@@ -19,4 +19,6 @@ ARCH_CLASS = 68k
 ARCH_DEP_CPPFLAGS = -DCPU=MC68060
 ARCH_DEP_CFLAGS = -m68040
 
+OPT_CFLAGS_YES = -O0
+
 GNU_TARGET = m68k-wrs-vxworks

configure/os/CONFIG.Common.vxWorks6-mv2100

@@ -0,0 +1,28 @@
+# CONFIG.Common.vxWorks6-mv2100
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for WRS vxWorks version 6.0 mv2100 target
+# target archs with at least 32MB
+# Sites may override these definitions in CONFIG_SITE.Common.vxWorks6-mv2100
+#-------------------------------------------------------
+
+# Include definitions common to all vxWorks version 6.0 targets
+include $(CONFIG)/os/CONFIG.Common.vxWorks6Common
+
+# Vx GNU cross compiler suffix
+CMPLR_SUFFIX = ppc
+ 
+ARCH_CLASS = ppc
+
+# Architecture specific build flags
+
+ARCH_DEP_CPPFLAGS = -DCPU=PPC603  
+ARCH_DEP_CFLAGS = -mcpu=603 -mstrict-align -mlongcall
+
+#CONFORM_CFLAGS_NORMAL = -DCONFORM_NORMAL_no_ansi_no_pedantic
+#CONFORM_CFLAGS_STRICT = -DCONFORM_STRICT_no_ansi_no_pedantic
+#CONFORM_CXXFLAGS_NORMAL = -DCONFORM_NORMAL_no_ansi_no_pedantic
+#CONFORM_CXXFLAGS_STRICT = -DCONFORM_STRICT_no_ansi_no_pedantic
+#CODE_CXXFLAGS = -DOVERRIDE_fno_implicit_templates

configure/os/CONFIG.Common.vxWorks6-mv5100

@@ -0,0 +1,28 @@
+# CONFIG.Common.vxWorks6-mv5100
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for WRS vxWorks version 6.0 mv5100 target
+# target archs with at least 32MB
+# Sites may override these definitions in CONFIG_SITE.Common.vxWorks6-mv5100
+#-------------------------------------------------------
+
+# Include definitions common to all vxWorks version 6.0 target archs
+include $(CONFIG)/os/CONFIG.Common.vxWorks6Common
+
+# Vx GNU cross compiler suffix
+CMPLR_SUFFIX = ppc
+ 
+ARCH_CLASS = ppc
+
+# Architecture specific build flags
+
+ARCH_DEP_CPPFLAGS = -DCPU=PPC604  
+ARCH_DEP_CFLAGS = -mcpu=604 -mstrict-align -mlongcall
+
+#CONFORM_CFLAGS_NORMAL = -DCONFORM_NORMAL_no_ansi_no_pedantic
+#CONFORM_CFLAGS_STRICT = -DCONFORM_STRICT_no_ansi_no_pedantic
+#CONFORM_CXXFLAGS_NORMAL = -DCONFORM_NORMAL_no_ansi_no_pedantic
+#CONFORM_CXXFLAGS_STRICT = -DCONFORM_STRICT_no_ansi_no_pedantic
+#CODE_CXXFLAGS = -DOVERRIDE_fno_implicit_templates

configure/os/CONFIG.Common.vxWorks6Common

@@ -0,0 +1,155 @@
+# CONFIG.Common.vxWorks6Common
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for vxWorks version 6.0 target archs
+# Sites may override these definitions in CONFIG_SITE.Common.vxWorks6Common
+# or CONFIG_SITE.<host>.vxWorks6Common
+#-------------------------------------------------------
+
+# Vx valid build types
+VALID_BUILDS = Ioc
+
+#--------------------------------------------------
+# operating system class (include/os/<os_class>)
+OS_CLASS = vxWorks
+
+#-------------------------------------------------------
+# Prefix and suffix definitions
+EXE =
+OBJ = .o
+LIB_PREFIX =lib
+LIB_SUFFIX = .a
+MUNCH_SUFFIX = .munch
+
+#-------------------------------------------------------
+# Compiler definitions
+CMPLR_PREFIX=
+CC = $(GNU_BIN)/$(CMPLR_PREFIX)cc$(CMPLR_SUFFIX)
+CCC = $(GNU_BIN)/$(CMPLR_PREFIX)cc$(CMPLR_SUFFIX)
+
+#-------------------------------------------------------
+# Library definitions
+LIBNAME = $(BUILD_LIBRARY:%=$(LIB_PREFIX)%$(LIB_SUFFIX))
+
+#--------------------------------------------------
+# Prod: DEPLIBS, LDFLAGS, and LDLIBS definitions
+
+PROD_DEPLIBS=$(foreach lib,$(PROD_LIBS) $(USR_LIBS), \
+    $(firstword $(wildcard $(addsuffix /$(LIB_PREFIX)$(lib).*, \
+    $($(lib)_DIR) $(SHRLIB_SEARCH_DIRS))) \
+    $(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_SUFFIX), \
+    $(firstword $($(lib)_DIR) $(INSTALL_LIB)))))
+
+
+PROD_LDLIBS = $(addprefix -l,$($*_LDLIBS) $(PROD_LIBS) $(USR_LIBS)\
+ $($*_SYS_LIBS) $(PROD_SYS_LIBS) $(USR_SYS_LIBS))
+
+PROD_DEPLIB_DIRS = $(dir $($*_DEPLIBS)) $(dir $(PROD_DEPLIBS))
+PRODDIR_LDFLAGS += $(sort $(PROD_DEPLIB_DIRS:%=-L%))
+
+#-------------------------------------------------------
+# Prod definitions
+MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
+CTDT_SRCS = $(PRODNAME:%$(EXE)=%_ctdt.c)
+CTDT_OBJS = $(PRODNAME:%$(EXE)=%_ctdt$(OBJ))
+NMS = $(PRODNAME:%$(EXE)=%.nm)
+MUNCH_DEPENDS = %_ctdt$(OBJ)
+
+#-------------------------------------------------------
+# R3.13 compatability object library definitions
+# Does not allow $*_SRCS or $*_OBJS. Allows only OBJLIB_SRCS and OBJLIB_OBJS.
+OBJLIB += $(OBJLIB_$(OS_CLASS))
+OBJLIB_SUFFIX = Library.o
+OBJLIBNAME = $(addsuffix $(OBJLIB_SUFFIX),$(basename $(OBJLIB)))
+OBJLIB_LD_OBJS += $(addsuffix $(OBJ),$(basename $(OBJLIB_SRCS) $(OBJLIB_OBJS)))
+PRODTARGETS += $(OBJLIBNAME)
+INSTALL_PROD += $(OBJLIBNAME:%=$(INSTALL_BIN)/%)
+OBJLIB_MUNCHNAME += $(OBJLIBNAME:%$(OBJ)=%$(MUNCH_SUFFIX))
+INSTALL_MUNCHS += $(OBJLIB_MUNCHNAME:%=$(INSTALL_BIN)/%)
+PRODTARGETS += $(OBJLIB_MUNCHNAME)
+CTDT_SRCS += $(OBJLIBNAME:%$(OBJ)=%_ctdt.c)
+CTDT_OBJS += $(OBJLIBNAME:%$(OBJ)=%_ctdt$(OBJ))
+NMS += $(OBJLIBNAME:%$(OBJ)=%.nm)
+OBJLIB_LINK.cpp = $(LD) -o $@ $(OBJLIB_LD_OBJS)
+SRC_FILES += $(OBJLIB_SRCS)
+
+#---------------------------------------------------------------------
+# vxWorks directory definitions (new for vxWorks 6.0)
+# WindRiver Workbench directory definitions
+GNU_TARGET_INCLUDE_DIR = $(VX_DIR)/vxworks-6.0/target/h
+GNU_TARGET_INCLUDE_DIR += $(VX_DIR)/vxworks-6.0/target/h/wrn/coreip
+
+GNU_DIR = $(VX_DIR)/gnu/3.3.2-vxworks60/x86-linux2
+
+#--------------------------------------------------
+# C++ host processing
+NM = $(GNU_BIN)/$(CMPLR_PREFIX)nm$(CMPLR_SUFFIX)$(HOSTEXE)
+
+#--------------------------------------------------
+# The follow 2 exports prevent gnu cross-compiler
+# from finding wrong assembler (as).
+export WIND_BASE = $(VX_DIR)
+export WIND_HOST_TYPE
+
+#--------------------------------------------------
+# Tornado2.2 and WindRiver Workbench
+# The follow export allows vxWorks.h to include gnu header files
+export TOOL_FAMILY = GNU
+
+#--------------------------------------------------
+# Operating system flags
+OP_SYS_CPPFLAGS += -DvxWorks
+OP_SYS_CFLAGS += -fno-builtin
+#OP_SYS_CFLAGS += -fno-builtin -fdollars-in-identifiers
+OP_SYS_LDFLAGS +=
+
+# Fix for vxWorks headers using macros defined in
+# vxWorks.h but not including vxWorks.h 
+# New for WindRiver Workbench and vxWorks 6.0
+OP_SYS_INCLUDE_CPPFLAGS += -include $(VX_DIR)/vxworks-6.0/target/h/vxWorks.h
+
+#--------------------------------------------------
+# code flags
+CODE_CFLAGS =
+#
+# WRS still uses an old gnu compiler with a broken -frepo and 
+# otherwise no automatic template instantiation mechanism as
+# is the defacto standard approach today. If we remove this 
+# flag certain ppc targets will not build. 
+CODE_CXXFLAGS = -fno-implicit-templates
+
+#--------------------------------------------------
+# posix c preprocessor flags
+POSIX_CPPFLAGS = -D_POSIX_SOURCE
+
+#--------------------------------------------------
+# no shared libs for vxWorks
+SHRLIB_CFLAGS = 
+SHRLIB_LDFLAGS = 
+
+#--------------------------------------------------
+# osithead use default stack, YES or NO override
+OSITHREAD_USE_DEFAULT_STACK = NO
+
+#--------------------------------------------------
+# Link definitions
+LINK.cpp = $(LD) -o $@ $(STATIC_LDFLAGS) $(PRODDIR_LDFLAGS) $(LDFLAGS)
+LINK.cpp += $(PROD_LDFLAGS) $(PROD_LD_OBJS) $(PROD_LD_RESS) $(PROD_LDLIBS)
+
+#--------------------------------------------------
+# Definitions for compile of *_ctdt.c file
+CFLAGS_ctdt = $(filter-out -pedantic,$(CFLAGS)) -fdollars-in-identifiers
+COMPILE.ctdt = $(CC) -c $(CPPFLAGS) $(CFLAGS_ctdt) $(call PATH_FILTER,$(INCLUDES)) $(SOURCE_FLAG)
+
+#--------------------------------------------------
+# C preprocessor command
+VXCPPFLAGS = $(filter-out $(OP_SYS_INCLUDE_CPPFLAGS),$(CPPFLAGS))
+PREPROCESS.cpp = $(CPP) $(VXCPPFLAGS) $(INCLUDES) $< > $@
+
+#--------------------------------------------------
+# Allow site overrides
+-include $(CONFIG)/os/CONFIG_SITE.Common.vxWorks6Common
+-include $(CONFIG)/os/CONFIG_SITE.$(EPICS_HOST_ARCH).vxWorks6Common
+

configure/os/CONFIG.Common.vxWorksCommon

@@ -23,6 +23,12 @@ LIB_PREFIX =lib
 LIB_SUFFIX = .a
 MUNCH_SUFFIX = .munch
 
+#-------------------------------------------------------
+# Compiler definitions
+CMPLR_PREFIX=
+CC = $(GNU_BIN)/$(CMPLR_PREFIX)cc$(CMPLR_SUFFIX)
+CCC = $(GNU_BIN)/$(CMPLR_PREFIX)cc$(CMPLR_SUFFIX)
+
 #-------------------------------------------------------
 # Library definitions
 LIBNAME = $(BUILD_LIBRARY:%=$(LIB_PREFIX)%$(LIB_SUFFIX))
@@ -49,6 +55,7 @@ MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 CTDT_SRCS = $(PRODNAME:%$(EXE)=%_ctdt.c)
 CTDT_OBJS = $(PRODNAME:%$(EXE)=%_ctdt$(OBJ))
 NMS = $(PRODNAME:%$(EXE)=%.nm)
+MUNCH_DEPENDS = %_ctdt$(OBJ)
 
 #-------------------------------------------------------
 # R3.13 compatability object library definitions
@@ -112,8 +119,7 @@ CODE_CXXFLAGS = -fno-implicit-templates
 
 #--------------------------------------------------
 # posix c preprocessor flags
-POSIX_CPPFLAGS_YES = -D_POSIX_SOURCE
-POSIX_CPPFLAGS_NO =
+POSIX_CPPFLAGS = -D_POSIX_SOURCE
 
 #--------------------------------------------------
 # no shared libs for vxWorks
@@ -136,7 +142,7 @@ COMPILE.ctdt = $(CC) -c $(CPPFLAGS) $(CFLAGS_ctdt) $(call PATH_FILTER,$(INCLUDES
 
 #--------------------------------------------------
 # C preprocessor command
-VXCPPFLAGS = $(filterout $(OP_SYS_INCLUDE_CPPFLAGS),$(CPPFLAGS))
+VXCPPFLAGS = $(filter-out $(OP_SYS_INCLUDE_CPPFLAGS),$(CPPFLAGS))
 PREPROCESS.cpp = $(CPP) $(VXCPPFLAGS) $(INCLUDES) $< > $@
 
 #--------------------------------------------------

configure/os/CONFIG.Common.win32-x86-cygwin

@@ -0,0 +1,47 @@
+# CONFIG.Common.win32-x86-cygwin
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for cygwin-x86 target builds
+# Sites may override these definitions in CONFIG_SITE.Common.cygwin-x86
+#-------------------------------------------------------
+
+# Include definitions common to all Unix targets
+include $(CONFIG)/os/CONFIG.Common.UnixCommon
+
+OS_CLASS = WIN32
+ARCH_CLASS = x86
+
+EXE=.exe
+
+COMPILER_CPPFLAGS = -D_REENTRANT
+
+# Set runtime path for shared libraries
+RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_FULLPATHDIRS:%=-Wl,-rpath,%)
+
+#  Definitions used when COMMANDLINE_LIBRARY is READLINE
+INCLUDES_READLINE = -I$(GNU_DIR)/include
+LDFLAGS_READLINE += -L$(GNU_DIR)/lib
+LDLIBS_READLINE = -lreadline
+
+OP_SYS_CXXFLAGS += -D__cplusplus
+
+# With no-cygwin option:
+#	compiler defines _X86_ 1
+#	compiler defines __MSVCRT__ 1
+#	compiler defines __MINGW32__ 1
+#	compiler defines __WIN32 1
+#	compiler defines __WIN32__ 1
+#	compiler defines _WIN32 1
+#	compiler defines WIN32 1
+#	compiler defines WINNT 1
+#	compiler does not define  __unix __unix__ unix
+#	compiler does not define  __CYGWIN__ __CYGWIN32__
+
+# Overrides -DUNIX from CONFIG.Common.UnixCommon
+OP_SYS_CPPFLAGS = -mno-cygwin
+
+OP_SYS_LDFLAGS += -mno-cygwin
+OP_SYS_LDLIBS = -lws2_32 -ladvapi32 -luser32 -lkernel32 -lwinmm
+

configure/os/CONFIG.Common.win32-x86-mingw

@@ -0,0 +1,39 @@
+# CONFIG.Common.win32-x86-mingw
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for win32-x86-mingw target builds
+# Sites may override these definitions in CONFIG_SITE.Common.win32-x86-mingw
+#-------------------------------------------------------
+
+# Include definitions common to all Unix targets
+include $(CONFIG)/os/CONFIG.Common.UnixCommon
+
+OS_CLASS = WIN32
+ARCH_CLASS = x86
+
+EXE=.exe
+
+# Library used when COMMANDLINE_LIBRARY is READLINE
+LDLIBS_READLINE = -lreadline
+
+STATIC_BUILD=YES
+STATIC_LDLIBS_YES=-lws2_32 -ladvapi32 -luser32 -lkernel32 -lwinmm
+
+# Compiler defines _X86_ 1
+
+# Compiler defines __MSVCRT__ 1
+# Compiler defines __MINGW32__ 1
+# Compiler defines __WIN32 1
+# Compiler defines __WINNT 1
+# Compiler defines __WINNT__ 1
+# Compiler defines __WIN32__ 1
+# Compiler defines _WIN32 1
+# Compiler defines WIN32 1
+# Compiler defines WINNT 1
+# Compiler does not define  __unix __unix__ unix
+
+# Override for -DUNIX from CONFIG.Common.UnixCommon
+OP_SYS_CPPFLAGS =
+

configure/os/CONFIG.aix-ppc-gnu.aix-ppc-gnu

@@ -10,13 +10,10 @@ include $(CONFIG)/CONFIG.gnuCommon
 
 GNU_DIR = /usr/common/usg/gcc/3.2.1
 
-CC = $(GNU_BIN)/gcc
-CCC = $(GNU_BIN)/g++
-
 AR = ar
 ARFLAGS = rcv
 RANLIB = ranlib -t
 
-SHRLIB_LDFLAGS = -shared 
-LOADABLE_SHRLIB_LDFLAGS = -shared
+SHRLIB_LDFLAGS = -shared  -fPIC
+LOADABLE_SHRLIB_LDFLAGS = -shared -fPIC
 

configure/os/CONFIG.cygwin-x86.Common

@@ -15,3 +15,7 @@ OSITHREAD_USE_DEFAULT_STACK = NO
 
 HOSTEXE=.exe
 
+# Needed to find dlls for base installed build tools (antelope,eflex,...)
+PATH := $(EPICS_BASE_TOOLS_BIN):$(PATH)
+
+

configure/os/CONFIG.darwin-ppc.darwin-ppc

@@ -18,7 +18,7 @@ CCC = $(GNU_BIN)/c++
 # Darwin shared libraries
 #
 SHRLIB_LDFLAGS = -dynamiclib -flat_namespace -undefined suppress \
-       -install_name $(firstword $(SHRLIB_SEARCH_DIRS))/$@ \
+       -install_name $(firstword $(SHRLIB_SEARCH_FULLPATHDIRS))/$@ \
        -compatibility_version $(EPICS_VERSION).$(EPICS_REVISION) \
        -current_version $(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)
 SHRLIB_SUFFIX = .$(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION).dylib

configure/os/CONFIG.hpux-parisc-gnu.hpux-parisc-gnu

@@ -10,8 +10,6 @@
 # Include common gnu compiler definitions
 include $(CONFIG)/CONFIG.gnuCommon
 
-CC = $(GNU_BIN)/gcc
-CCC = $(GNU_BIN)/g++
 AR = ar -rc
 RANLIB=
 LD = ld -r
@@ -23,7 +21,7 @@ STATIC_LDLIBS_YES = -Wl,-a,default
 STATIC_LDLIBS_NO =
 
 # Switch explicitly from default DCE threads to posix threads
-POSIX_CPPFLAGS_YES += -D_REENTRANT -D_PTHREADS -D_POSIX_C_SOURCE=199506L
+POSIX_CPPFLAGS += -D_REENTRANT -D_PTHREADS -D_POSIX_C_SOURCE=199506L
 USR_SYS_LIBS += pthread
 
 # C++ templates need PIC definition also in link phase

configure/os/CONFIG.hpux-parisc.hpux-parisc

@@ -15,9 +15,9 @@ AR = ar -rc
 LD = ld -r
 
 # Configure OS vendor C compiler
-CONFORM_CFLAGS_ANSI = -Aa
-CONFORM_CFLAGS_STRICT = -Aa
-CONFORM_CFLAGS_TRAD = -Ac
+CONFORM_CFLAGS_ANSI = -Aa -mt
+CONFORM_CFLAGS_STRICT = -Aa -mt
+CONFORM_CFLAGS_TRAD = -Ac -mt
 
 # Portability across different PA-RISC architecture versions
 CODE_CFLAGS = +DAportable +z

configure/os/CONFIG.linux-ppc.Common

@@ -0,0 +1,12 @@
+# CONFIG.linux-ppc.Common
+#
+# This file is maintained by the build community.
+#
+# Definitions for linux-ppc host builds
+# Sites may override these definitions in CONFIG_SITE.linux-ppc.Common
+#-------------------------------------------------------
+
+#Include definitions common to unix hosts
+include $(CONFIG)/os/CONFIG.UnixCommon.Common
+
+WIND_HOST_TYPE = ppc-linux

configure/os/CONFIG.linux-ppc.linux-ppc

@@ -0,0 +1,20 @@
+#  CONFIG.linux-ppc.linux-ppc
+#
+#
+# Definitions for linux-ppc host - linux-ppc target builds
+# Sites may override these definitions in CONFIG_SITE.linux-ppc.linux-ppc
+#-------------------------------------------------------
+
+# Include common gnu compiler definitions
+include $(CONFIG)/CONFIG.gnuCommon
+
+GNU_DIR = /usr
+
+CC = $(GNU_BIN)/gcc
+CCC = $(GNU_BIN)/g++
+
+SHRLIB_LDFLAGS = -shared -fPIC
+LOADABLE_SHRLIB_LDFLAGS = -shared -fPIC
+
+GNU_LDLIBS_YES = -lgcc
+

configure/os/CONFIG.linux-x86.linux-x86

@@ -11,14 +11,11 @@ include $(CONFIG)/CONFIG.gnuCommon
 
 GNU_DIR = /usr
 
-CC = $(GNU_BIN)/gcc
-CCC = $(GNU_BIN)/g++
-
 STATIC_LDFLAGS_YES= -Wl,-Bstatic
 STATIC_LDFLAGS_NO=
 STATIC_LDLIBS_YES= -Wl,-Bdynamic
 STATIC_LDLIBS_NO=
 
-SHRLIB_LDFLAGS +=  -shared -z defs
-LOADABLE_SHRLIB_LDFLAGS = -shared
+SHRLIB_LDFLAGS +=  -shared -fPIC
+LOADABLE_SHRLIB_LDFLAGS = -shared -fPIC
 

configure/os/CONFIG.linux-x86_64-debug.Common

@@ -0,0 +1,15 @@
+# CONFIG.linux-x86_64-debug.Common
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for linux-x86_64 debug with debug compiler flags
+# Sites may override these definitions in CONFIG_SITE.linux-x86_64-debug.Common
+#-------------------------------------------------------
+
+#Include definitions common to linux-x86_64 hosts
+include $(CONFIG)/os/CONFIG.linux-x86_64.Common
+
+# Make all crosscompiler builds debug builds
+#CROSS_OPT=NO
+

configure/os/CONFIG.linux-x86_64-debug.linux-x86_64-debug

@@ -0,0 +1,14 @@
+# CONFIG.linux-x86_64-debug.linux-x86_64-debug
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for linux-x86_64 host - linux-x86_64 target build with debug compiler flags
+# Sites may override these definitions in CONFIG_SITE.linux-x86_64-debug.linux-x86_64-debug
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.linux-x86_64.linux-x86_64
+
+# Removes -O optimization and adds -g compile option
+HOST_OPT=NO
+

configure/os/CONFIG.linux-x86_64.Common

@@ -0,0 +1,13 @@
+# CONFIG.linux-x86_64.Common
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for linux-x86_64 host builds
+# Sites may override these definitions in CONFIG_SITE.linux-x86_64.Common
+#-------------------------------------------------------
+
+#Include definitions common to unix hosts
+include $(CONFIG)/os/CONFIG.UnixCommon.Common
+
+WIND_HOST_TYPE = x86-linux

configure/os/CONFIG.linux-x86_64.linux-x86_64

@@ -0,0 +1,21 @@
+#  CONFIG.linux-x86_64.linux-x86_64
+#
+# $Id$
+#
+# Definitions for linux-x86_64 host - linux-x86_64 target builds
+# Sites may override these definitions in CONFIG_SITE.linux-x86_64.linux-x86_64
+#-------------------------------------------------------
+
+# Include common gnu compiler definitions
+include $(CONFIG)/CONFIG.gnuCommon
+
+GNU_DIR = /usr
+
+STATIC_LDFLAGS_YES= -Wl,-Bstatic
+STATIC_LDFLAGS_NO=
+STATIC_LDLIBS_YES= -Wl,-Bdynamic
+STATIC_LDLIBS_NO=
+
+SHRLIB_LDFLAGS +=  -shared -fPIC
+LOADABLE_SHRLIB_LDFLAGS = -shared -fPIC
+

configure/os/CONFIG.linux-x86_64.linux-x86_64-debug

@@ -0,0 +1,13 @@
+# CONFIG.linux-x86-debug.linux-x86-debug
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for linux-x86 host - linux-x86-debug target build with debug compiler flags
+# Sites may override these definitions in CONFIG_SITE.linux-x86.linux-x86-debug
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.linux-x86-debug.linux-x86-debug
+
+BUILD_CLASS = HOST
+

configure/os/CONFIG.solaris-sparc-gnu.solaris-sparc-gnu

@@ -10,10 +10,6 @@
 # Include common gnu compiler definitions
 include $(CONFIG)/CONFIG.gnuCommon
 
-GNU_DIR = /opt/gnu
-
-CC = $(GNU_BIN)/gcc
-CCC = $(GNU_BIN)/g++
 AR = ar -rc
 RANLIB=
 LD = ld -r
@@ -23,8 +19,8 @@ STATIC_LDFLAGS_NO=
 STATIC_LDLIBS_YES= -Wl,-Bdynamic
 STATIC_LDLIBS_NO=
 
-SHRLIB_LDFLAGS += -G -h $@  -z ignore -z defs
-LOADABLE_SHRLIB_LDFLAGS += -G -h $@
+SHRLIB_LDFLAGS +=  -shared -fPIC
+LOADABLE_SHRLIB_LDFLAGS = -shared -fPIC
 
 OP_SYS_LDFLAGS += -z ignore -z combreloc -z lazyload
 

configure/os/CONFIG.solaris-sparc.solaris-sparc

@@ -7,54 +7,4 @@
 # Sites may override these definitions in CONFIG_SITE.solaris-sparc.solaris-sparc
 #-------------------------------------------------------
 
-SPARCWORKS = /opt/SUNWspro
-
-CC = $(SPARCWORKS)/bin/cc
-CCC = $(SPARCWORKS)/bin/CC
-# required by sun's C++ compiler
-AR = $(CCC) -xar -o
-LD = ld -r
-CPP = gcc -x c -E
-RANLIB =
-
-#Prepare the object code for profiling with prof. (YES or NO)
-PROFILE=NO
-#Prepare the object code for profiling with gprof. (YES or NO)
-GPROF=NO
-
-# Configure OS vendor C compiler
-CONFORM_CFLAGS_ANSI = -Xa -v
-CONFORM_CFLAGS_STRICT = -Xc -v
-CONFORM_CFLAGS_TRAD = -Xs
-PROF_CFLAGS_YES = -p
-GPROF_CFLAGS_YES = -xpg
-CODE_CFLAGS = $(PROF_CFLAGS_$(PROFILE)) $(GPROF_CFLAGS_$(GPROF))
-WARN_CFLAGS_YES =
-WARN_CFLAGS_NO = -w
-OPT_CFLAGS_YES = -xO4
-OPT_CFLAGS_NO = -g
-
-# Configure OS vendor C++ compiler
-CONFORM_CXXFLAGS_NORMAL =
-CONFORM_CXXFLAGS_STRICT =
-PROF_CXXFLAGS_YES = -p
-GPROF_CXXFLAGS_YES = -xpg
-CODE_CXXFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF))
-WARN_CXXFLAGS_YES = +w
-WARN_CXXFLAGS_NO =
-OPT_CXXFLAGS_YES = -O
-OPT_CXXFLAGS_NO = -g
-
-CODE_LDFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF))
-
-STATIC_LDFLAGS_YES= -Bstatic
-STATIC_LDFLAGS_NO=
-STATIC_LDLIBS_YES= -Bdynamic
-STATIC_LDLIBS_NO=
-
-SHRLIB_CFLAGS = -KPIC
-SHRLIB_LDFLAGS += -z defs -G -h $@ -z text
-LOADABLE_SHRLIB_LDFLAGS += -G -h $@ -z text
-
-OP_SYS_LDFLAGS += -z ignore -z combreloc -z lazyload
-
+include $(CONFIG)/os/CONFIG.solarisCommon.solarisCommon

configure/os/CONFIG.solaris-sparc.solaris-sparc64

@@ -0,0 +1,11 @@
+# CONFIG.solaris-sparc.solaris-sparc64
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for solaris-sparc host - solaris-sparc64 target build with Sun compiler
+# Sites may override these definitions in CONFIG_SITE.solaris-sparc.solaris-sparc64
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.solaris-sparc64.solaris-sparc64
+

configure/os/CONFIG.solaris-sparc64-gnu.Common

@@ -0,0 +1,12 @@
+# CONFIG.solaris-sparc64-gnu.Common
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for solaris-sparc64 gnu compiler host builds
+# Sites may override these definitions in CONFIG_SITE.solaris-sparc64-gnu.Common
+#-------------------------------------------------------
+
+#Include definitions common to solaris-sparc-gnu hosts
+include $(CONFIG)/os/CONFIG.solaris-sparc-gnu.Common
+

configure/os/CONFIG.solaris-sparc64-gnu.solaris-sparc64-gnu

@@ -0,0 +1,12 @@
+# CONFIG.solaris-sparc64-gnu.solaris-sparc64-gnu
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for solaris-sparc64 gnu compiler host - solaris-sparc64 gnu compiler target builds
+# Sites may override these definitions in CONFIG_SITE.solaris-sparc64-gnu.solaris-sparc64-gnu
+#-------------------------------------------------------
+
+# Include common solaris-sparc-gnu definitions
+include $(CONFIG)/os/CONFIG.solaris-sparc-gnu.solaris-sparc-gnu
+

configure/os/CONFIG.solaris-sparc64.Common

@@ -0,0 +1,12 @@
+# CONFIG.solaris-sparc64.Common
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for solaris-sparc Sun compiler host builds
+# Sites may override these definitions in CONFIG_SITE.solaris-sparc64.Common
+#-------------------------------------------------------
+
+#Include definitions common to solaris-sparc hosts
+include $(CONFIG)/os/CONFIG.solaris-sparc.Common
+

configure/os/CONFIG.solaris-sparc64.solaris-sparc64

@@ -0,0 +1,11 @@
+# CONFIG.solaris-sparc64.solaris-sparc64
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for solaris-sparc Sun compiler host - solaris-sparc Sun compiler target builds
+# Sites may override these definitions in CONFIG_SITE.solaris-sparc64.solaris-sparc64
+#-------------------------------------------------------
+
+# Include common gnu compiler definitions
+include $(CONFIG)/os/CONFIG.solaris-sparc.solaris-sparc

configure/os/CONFIG.solaris-x86-gnu.solaris-x86-gnu

@@ -10,16 +10,11 @@
 # Include common gnu compiler definitions
 include $(CONFIG)/CONFIG.gnuCommon
 
-GNU_DIR = /opt/gnu
-
-CC = $(GNU_BIN)/gcc
-CCC = $(GNU_BIN)/g++
 AR = ar -rc
 RANLIB=
 LD = ld -r
 
-SHRLIB_LDFLAGS = -z defs -G -h $@
-LOADABLE_SHRLIB_LDFLAGS += -G -h $@
+SHRLIB_LDFLAGS += -shared -fPIC -h $@  -z defs
+LOADABLE_SHRLIB_LDFLAGS += -shared -fPIC -h $@
 
 OP_SYS_LDFLAGS += -z ignore -z combreloc -z lazyload
-

configure/os/CONFIG.solaris-x86.solaris-x86

@@ -7,52 +7,4 @@
 # Sites may override these definitions in CONFIG_SITE.solaris-x86.solaris-x86
 #-------------------------------------------------------
 
-# Include definitions common to all Unix target archs
-include $(CONFIG)/os/CONFIG.Common.UnixCommon
-
-SPARCWORKS = /opt/SUNWspro
-
-CC = $(SPARCWORKS)/bin/cc
-CCC = $(SPARCWORKS)/bin/CC
-CPP = $(CC) -E
-RANLIB =
-# required by sun's C++ compiler
-AR = $(CCC) -xar -o
-LD = ld -r
-
-#Prepare the object code for profiling with prof. (YES or NO)
-PROFILE=NO
-
-# Configure OS vendor C compiler
-CONFORM_CFLAGS_ANSI = -Xa -v
-CONFORM_CFLAGS_STRICT = -Xc -v
-CONFORM_CFLAGS_TRAD = -Xs
-PROF_CFLAGS_YES = -p
-GPROF_CFLAGS_YES = -xpg
-CODE_CFLAGS = $(PROF_CFLAGS_$(PROFILE)) $(GPROF_CFLAGS_$(GPROF))
-WARN_CFLAGS_YES =
-WARN_CFLAGS_NO = -w
-OPT_CFLAGS_YES = -xO4
-OPT_CFLAGS_NO = -g
-
-# Configure OS vendor C++ compiler
-CONFORM_CXXFLAGS_NORMAL = 
-CONFORM_CXXFLAGS_STRICT = 
-PROF_CXXFLAGS_YES = -p
-GPROF_CXXFLAGS_YES = -xpg
-CODE_CXXFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF))
-WARN_CXXFLAGS_YES = +w
-WARN_CXXFLAGS_NO =
-OPT_CXXFLAGS_YES = -O
-OPT_CXXFLAGS_NO = -g
-
-STATIC_LDFLAGS_YES= -Bstatic
-STATIC_LDFLAGS_NO=
-STATIC_LDLIBS_YES= -Bdynamic
-STATIC_LDLIBS_NO=
-
-SHRLIB_LDFLAGS = -z defs -KPIC -G -h $@
-LOADABLE_SHRLIB_LDFLAGS = -KPIC -G -h $@
-
-OP_SYS_LDFLAGS += -z ignore -z combreloc -z lazyload
-
+include $(CONFIG)/os/CONFIG.solarisCommon.solarisCommon

configure/os/CONFIG.solarisCommon.solarisCommon

@@ -0,0 +1,65 @@
+# CONFIG.solaris-sparc.solaris-sparc
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for solaris-sparc host - solaris-sparc target build
+# Sites may override these definitions in CONFIG_SITE.solaris-sparc.solaris-sparc
+#-------------------------------------------------------
+
+SPARCWORKS = /opt/SUNWspro
+
+CC = $(SPARCWORKS)/bin/cc
+CCC = $(SPARCWORKS)/bin/CC
+CPP = $(CC) -E -Qn
+RANLIB =
+# required by sun's C++ compiler
+AR = $(CCC) -xar -o
+LD = ld -r
+
+#Prepare the object code for profiling with prof. (YES or NO)
+PROFILE=NO
+#Prepare the object code for profiling with gprof. (YES or NO)
+GPROF=NO
+
+# Configure OS vendor C compiler
+CONFORM_CFLAGS_ANSI = -Xa -v
+CONFORM_CFLAGS_STRICT = -Xc -v
+CONFORM_CFLAGS_TRAD = -Xs
+PROF_CFLAGS_YES = -p
+GPROF_CFLAGS_YES = -xpg
+CODE_CFLAGS = $(PROF_CFLAGS_$(PROFILE)) $(GPROF_CFLAGS_$(GPROF))
+WARN_CFLAGS_YES =
+WARN_CFLAGS_NO = -w
+OPT_CFLAGS_YES = -xO4
+OPT_CFLAGS_NO = -g
+
+# Configure OS vendor C++ compiler
+CONFORM_CXXFLAGS_NORMAL =
+CONFORM_CXXFLAGS_STRICT =
+PROF_CXXFLAGS_YES = -p
+GPROF_CXXFLAGS_YES = -xpg
+CODE_CXXFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF))
+WARN_CXXFLAGS_YES = +w
+WARN_CXXFLAGS_NO =
+OPT_CXXFLAGS_YES = -O
+OPT_CXXFLAGS_NO = -g
+
+CODE_LDFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF))
+
+STATIC_LDFLAGS_YES= -Bstatic
+STATIC_LDFLAGS_NO=
+STATIC_LDLIBS_YES= -Bdynamic
+STATIC_LDLIBS_NO=
+
+SHRLIB_CFLAGS = -KPIC
+SHRLIB_LDFLAGS = -z defs -G -h $@ -z text
+LOADABLE_SHRLIB_LDFLAGS = -G -h $@ -z text
+
+OP_SYS_LDFLAGS += -z ignore -z combreloc -z lazyload
+
+# Filter for getting rid of "invalid white space character in directive" compiler warnings
+# when including headers created during win32 build.
+#COMPILE_FILTER.c = 2>&1 | $(EPICS_BASE)/configure/tools/filterWarnings.pl
+#COMPILE_FILTER.cpp = $(COMPILE_FILTER.c)
+

configure/os/CONFIG.win32-x86-borland.Common

@@ -25,3 +25,6 @@ ifndef HOME
 HOME = $(HOMEDRIVE)$(HOMEPATH)
 endif
 
+# Needed to find dlls for base installed build tools (antelope,eflex,...)
+PATH := $(EPICS_BASE_TOOLS_BIN):$(PATH)
+

configure/os/CONFIG.win32-x86-cygwin.Common

@@ -0,0 +1,19 @@
+# CONFIG.win32-x86-cygwin.Common
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for win32-x86-cygwin host archs
+# Sites may override these definitions in CONFIG_SITE.win32-x86-cygwin.Common
+#-------------------------------------------------------
+
+#Include definitions common to unix hosts
+include $(CONFIG)/os/CONFIG.UnixCommon.Common
+
+HOSTEXE=.exe
+
+WIND_HOST_TYPE = x86-win32
+
+# osithead use default stack, YES or NO override
+OSITHREAD_USE_DEFAULT_STACK = NO
+

configure/os/CONFIG.win32-x86-cygwin.win32-x86-cygwin

@@ -0,0 +1,34 @@
+#  CONFIG.win32-x86-cygwin.win32-x86-cygwin
+#
+# $Id$
+#
+# Definitions for win32-x86-cygwin host - win32-x86-cygwin target builds
+# Sites may override these definitions in CONFIG_SITE.win32-x86-cygwin.win32-x86-cygwin
+#-------------------------------------------------------
+
+# Include common gnu compiler definitions
+include $(CONFIG)/CONFIG.gnuCommon
+
+## Shared libraries for cygwin not implemented yet
+SHARED_LIBRARIES=NO
+
+# cygwin's gcc, g++, ar, ld, and ranlib must be in user's path
+CC = gcc
+CCC = g++
+AR = ar -rc
+LD = ld -r
+RANLIB = ranlib
+
+# Dont use -fPIC: with -fPIC we get 
+# "warning: -fPIC ignored for target (all code is position independent) "
+SHRLIB_CFLAGS =
+
+# Dont use -ansi: -ansi eliminates strdup and _tempnam
+CONFORM_CFLAGS_ANSI =
+CONFORM_CFLAGS_STRICT = -pedantic
+CONFORM_CXXFLAGS_ANSI =
+CONFORM_CXXFLAGS_STRICT = -pedantic
+
+# Override linking with gcc library
+GNU_LDLIBS_YES =
+

configure/os/CONFIG.win32-x86-mingw.Common

@@ -0,0 +1,32 @@
+# CONFIG.win32-x86-mingw.Common
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for win32-x86-cygwin host archs
+# Sites may override these definitions in CONFIG_SITE.win32-x86-cygwin.Common
+#-------------------------------------------------------
+
+#Include definitions common to unix hosts
+include $(CONFIG)/os/CONFIG.UnixCommon.Common
+
+CP = $(PERL) $(CONFIG)/tools/cp.pl
+MV = $(PERL) $(CONFIG)/tools/mv.pl
+RM = $(PERL) $(CONFIG)/tools/rm.pl -f
+MKDIR = $(PERL) $(CONFIG)/tools/mkdir.pl
+RMDIR = $(PERL) $(CONFIG)/tools/rm.pl -rf
+ECHO = echo
+
+HOSTEXE=.exe
+
+WIND_HOST_TYPE = x86-win32
+
+# osithead use default stack, YES or NO override
+OSITHREAD_USE_DEFAULT_STACK = NO
+
+# DLL build not supported yet
+# Needed to find dlls for base installed build tools (antelope,eflex,...)
+#PATH := $(EPICS_BASE_TOOLS_BIN):$(PATH)
+
+
+

configure/os/CONFIG.win32-x86-mingw.win32-x86-mingw

@@ -0,0 +1,33 @@
+#  CONFIG.win32-x86-mingw.win32-x86-mingw
+#
+# $Id$
+#
+# Definitions for win32-x86-mingw host - win32-x86-mingw target builds
+# Sites may override these definitions in CONFIG_SITE.win32-x86-mingw.win32-x86-mingw
+#-------------------------------------------------------
+
+# Include common gnu compiler definitions
+include $(CONFIG)/CONFIG.gnuCommon
+
+# Shared libraries not implemented
+SHARED_LIBRARIES=NO
+
+# gcc, g++, ar, ld, and ranlib must be in user's path
+CC = gcc
+CCC = g++
+AR = ar -rc
+LD = ld -r
+RANLIB = ranlib
+
+# Avoid "position-independent code is always generated" message
+SHRLIB_CFLAGS =
+
+# Dont use -ansi option:  eliminates strdup and _tempnam
+CONFORM_CFLAGS_ANSI =
+CONFORM_CFLAGS_STRICT = -pedantic
+CONFORM_CXXFLAGS_ANSI =
+CONFORM_CXXFLAGS_STRICT = -pedantic
+
+# Override linking with gcc library
+GNU_LDLIBS_YES =
+

configure/os/CONFIG.win32-x86.Common

@@ -25,3 +25,6 @@ ifndef HOME
 HOME = $(HOMEDRIVE)$(HOMEPATH)
 endif
 
+# Needed to find dlls for base installed build tools (antelope,eflex,...)
+PATH := $(EPICS_BASE_TOOLS_BIN):$(PATH)
+

configure/os/CONFIG.win32-x86.win32-x86

@@ -215,7 +215,7 @@ DLL_DEF_FLAG = $(addprefix /def:,$(wildcard ../$(addsuffix .def,$*)))
 #
 LINK.shrlib = $(WINLINK) /nologo $(WIN32_DLLFLAGS) /implib:$*.lib /out:$*.dll $(DLL_DEF_FLAG)
 LINK.shrlib += $(LIBRARY_LD_OBJS) $(LIBRARY_LD_RESS) $(SHRLIB_LDLIBS)
-LDCMD =  $(CCC) /Fo $@ $^
+MUNCH_CMD =  $(CCC) /Fo $@ $^
 
 
 #	adjust names of libraries to build

configure/os/CONFIG_SITE.Common.RTEMS

@@ -0,0 +1,19 @@
+#
+# Site-specific information for all RTEMS targets
+#
+#-------------------------------------------------------
+
+# Where to find RTEMS
+#
+RTEMS_BASE=/usr/local/rtems/rtems-4.7
+RTEMS_VERSION=4.7
+
+# If you're using neither BOOTP/DHCP nor FLASH to pick up your IOC
+# network configuration you must specify your Internet Domain Name here
+#
+OP_SYS_CFLAGS += -DRTEMS_NETWORK_CONFIG_DNS_DOMAINNAME=aps.anl.gov
+
+#
+# Specify your desired command-line-input library
+#
+EPICSCOMMANDLINE_LIBRARY = EPICS

configure/os/CONFIG_SITE.Common.cygwin-x86

@@ -0,0 +1,12 @@
+# CONFIG_SITE.Common.cygwin-x86
+#
+# $Id$
+#
+# Site Specific definitions for cygwin-x86 target
+# Only the local epics system manager should modify this file
+
+# If readline is installed uncomment the following line
+# to add command-line editing and history support
+#COMMANDLINE_LIBRARY = READLINE
+
+

configure/os/CONFIG_SITE.Common.darwin-ppc

@@ -9,5 +9,6 @@
 #
 # Other local options
 #
-#OP_SYS_CFLAGS += -g
-#COMMANDLINE_LIBRARY = READLINE
+OPT_CFLAGS_YES += -g
+OPT_CXXFLAGS_YES += -g
+COMMANDLINE_LIBRARY = READLINE

configure/os/CONFIG_SITE.Common.hpux-parisc

@@ -10,9 +10,9 @@
 #    $(INSTALL_LOCATION)/lib/$(EPICS_HOST_ARCH) (or wherever you install
 #    the EPICS shared libraries on your system) when invoking base
 #    executables.
-# b) Add the path to SHRLIB_SEARCH_DIRS below, which will burn
+# b) Add the path to SHRLIB_SEARCH_FULLPATHDIRS below, which will burn
 #    the runtime search path into the executables.
 #SHARED_LIBRARIES=YES
 
 # This is the absolute path to the generic INSTALL_LOCATION, for SHARED_LIBRARY searches.
-SHRLIB_SEARCH_DIRS += /opt/epics/R$(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)/support/base/$(EPICS_VERSION)-$(EPICS_REVISION)-$(EPICS_MODIFICATION)-$(EPICS_UPDATE_NAME)$(EPICS_UPDATE_LEVEL)/lib/$(EPICS_HOST_ARCH)
+SHRLIB_SEARCH_FULLPATHDIRS += /opt/epics/R$(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)/base/$(EPICS_VERSION)-$(EPICS_REVISION)-$(EPICS_MODIFICATION)-$(EPICS_UPDATE_NAME)$(EPICS_UPDATE_LEVEL)/lib/$(EPICS_HOST_ARCH)

configure/os/CONFIG_SITE.Common.linux-x86

@@ -12,7 +12,7 @@
 # a) LD_LIBRARY_PATH must include the full absolute pathname to
 #    $(INSTALL_LOCATION)/lib/$(EPICS_HOST_ARCH) when invoking base
 #    executables.
-# b) Add the runtime path to SHRLIB_SEARCH_DIRS, which will add
+# b) Add the runtime path to SHRLIB_SEARCH_FULLPATHDIRS, which will add
 #    the named directory to the list contained in the executables.
 # c) Add the runtime path to /etc/ld.so.conf and run ldconfig
 #    to inform the system of the shared library location.
@@ -20,3 +20,4 @@
 # If readline is not installed comment the following line
 # to omit command-line editing and history support
 COMMANDLINE_LIBRARY = READLINE
+OP_SYS_CFLAGS += -g

configure/os/CONFIG_SITE.Common.linux-x86_64

@@ -0,0 +1,23 @@
+# CONFIG_SITE.Common.linux-x86_64
+#
+# $Id$
+#
+# Site Specific definitions for linux-x86_64 target
+# Only the local epics system manager should modify this file
+
+# NOTE for SHARED_LIBRARIES: In most cases if this is set to YES the
+# shared libraries will be found automatically.  However if the .so
+# files are installed at a different path to their compile-time path
+# then in order to be found at runtime do one of these:
+# a) LD_LIBRARY_PATH must include the full absolute pathname to
+#    $(INSTALL_LOCATION)/lib/$(EPICS_HOST_ARCH) when invoking base
+#    executables.
+# b) Add the runtime path to SHRLIB_SEARCH_DIRS, which will add
+#    the named directory to the list contained in the executables.
+# c) Add the runtime path to /etc/ld.so.conf and run ldconfig
+#    to inform the system of the shared library location.
+
+# If readline is not installed comment the following line
+# to omit command-line editing and history support
+COMMANDLINE_LIBRARY = READLINE
+OP_SYS_CFLAGS += -g

configure/os/CONFIG_SITE.Common.solaris-sparc

@@ -10,3 +10,5 @@
 #
 #COMMANDLINE_LIBRARY = READLINE
 
+# APS site override
+GNU_DIR = /opt/gnu

configure/os/CONFIG_SITE.Common.solaris-sparc64

@@ -0,0 +1,11 @@
+# CONFIG_SITE.Common.solaris-sparc64
+#
+# $Id$
+#
+# Site Specific definitions for solaris-sparc64 target
+# Only the local epics system manager should modify this file
+
+# Include definitions common to all solaris-sparc64 target archs
+include $(CONFIG)/os/CONFIG_SITE.Common.solaris-sparc
+
+COMMANDLINE_LIBRARY = EPICS

configure/os/CONFIG_SITE.Common.solaris-sparc64-gnu

@@ -0,0 +1,11 @@
+# CONFIG_SITE.Common.solaris-sparc64-gnu
+#
+# $Id$
+#
+# Site Specific definitions for solaris-sparc64-gnu target
+# Only the local epics system manager should modify this file
+
+# Include definitions common to all solaris-sparc-gnu target archs
+include $(CONFIG)/os/CONFIG_SITE.Common.solaris-sparc-gnu
+
+COMMANDLINE_LIBRARY = EPICS

configure/os/CONFIG_SITE.Common.vxWorksCommon

@@ -0,0 +1,10 @@
+# CONFIG_SITE.Common.vxWorksCommon
+#
+# Site specific definitions for vxWorks target builds
+# Only the local epics system manager should modify this file
+
+
+#  Tornado directory
+VX_DIR = /usr/local/vw/tornado202p1
+#VX_DIR = /usr/local/vw/tornado22-$(ARCH_CLASS)
+

configure/os/CONFIG_SITE.Common.win32-x86-cygwin

@@ -0,0 +1,12 @@
+# CONFIG_SITE.Common.win32-x86-cygwin
+#
+# $Id$
+#
+# Site Specific definitions for cygwin-x86 target
+# Only the local epics system manager should modify this file
+
+# Needed to find dlls for gcc, g++, as, cpp, ...
+# if cygwin/bin not already in path
+CYGWIN_BIN=C:/cygwin/bin
+export PATH := $(CYGWIN_BIN):$(PATH)
+

configure/os/CONFIG_SITE.cygwin-x86.cygwin-x86

@@ -6,5 +6,6 @@
 # Site override definitions for cygwin-x86 host - cygwin-x86 target builds
 #-------------------------------------------------------
  
-##GNU_DIR=C:/cygwin
+#  GNU_DIR used when COMMANDLINE_LIBRARY is READLINE
+GNU_DIR=C:/cygwin
 

configure/os/CONFIG_SITE.darwin-ppc.Common

@@ -6,6 +6,4 @@
 # Site override definitions for darwin-ppc host builds
 #-------------------------------------------------------
 
-# JBA test override values
-#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040 solaris-sparc
-#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040
+# CROSS_COMPILER_TARGET_ARCHS = RTEMS-uC5282

configure/os/CONFIG_SITE.linux-x86.Common

@@ -9,3 +9,4 @@
 # JBA test override values
 #CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040 solaris-sparc
 #CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040
+#CROSS_COMPILER_TARGET_ARCHS = RTEMS-mvme2100 RTEMS-pc386 # RTEMS-mvme5500 RTEMS-mvme167

configure/os/CONFIG_SITE.linux-x86.UnixCommon

@@ -4,6 +4,3 @@
 # Site Specific Configuration Information
 # Only the local epics system manager should modify this file
  
-CC = $(GNU_BIN)/$(CMPLR_PREFIX)gcc$(CMPLR_SUFFIX)
-CCC = $(GNU_BIN)/$(CMPLR_PREFIX)g++$(CMPLR_SUFFIX)
-

configure/os/CONFIG_SITE.linux-x86.vxWorks6-mv2100

@@ -0,0 +1,12 @@
+# CONFIG_SITE.linux-x86.vxWorks6-mv2100
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Site override definitions for linux-x86 host - vxWorks6-mv2100 target builds
+#-------------------------------------------------------
+# WindRiver has changed the directory structure of vxWorks
+# This is for VxWorks 6.0
+
+VX_DIR = /ade/vxWorks/6.0
+

configure/os/CONFIG_SITE.linux-x86.vxWorks6-mv5100

@@ -0,0 +1,12 @@
+# CONFIG_SITE.linux-x86.vxWorks6-mv5100
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Site override definitions for linux-x86 host - vxWorks6-mv5100 target builds
+#-------------------------------------------------------
+# WindRiver has changed the directory structure of vxWorks
+# This is for VxWorks 6.0
+
+VX_DIR = /ade/vxWorks/6.0
+

configure/os/CONFIG_SITE.linux-x86_64-debug.linux-x86_64-debug

@@ -0,0 +1,15 @@
+# CONFIG_SITE.linux-x86_64-debug.linux-x86_64-debug
+#
+# $Id$
+#
+# Site specific override definitions for solaris-sparc host builds
+# Only the local epics system manager should modify this file
+
+
+
+#Prepares the object code to collect data for profiling with prof. 
+#PROFILE=YES
+
+#Compiles for profiling with the gprof profiler.
+#GPROF=YES
+

configure/os/CONFIG_SITE.linux-x86_64.Common

@@ -0,0 +1,12 @@
+# CONFIG_SITE.linux-x86_64.Common
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Site override definitions for linux-x86_64 host builds
+#-------------------------------------------------------
+
+#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040 solaris-sparc
+#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040
+#CROSS_COMPILER_TARGET_ARCHS = RTEMS-mvme2100
+

configure/os/CONFIG_SITE.linux-x86_64.UnixCommon

@@ -0,0 +1,10 @@
+# CONFIG_SITE.linux-x86_64.UnixCommon
+$
+# $Id$
+#
+# Site Specific configure override definitions
+# Only the local epics system manager should modify this file
+ 
+CC = $(GNU_BIN)/$(CMPLR_PREFIX)gcc$(CMPLR_SUFFIX)
+CCC = $(GNU_BIN)/$(CMPLR_PREFIX)g++$(CMPLR_SUFFIX)
+