Set SNAPSHOT for R3.14.12.5

Also makes ROFF fields unsigned, needed for ROFF=0x80000000

.bzrignore

@@ -6,3 +6,4 @@
 ./include
 ./templates
 **/O.*
+./QtC-*

LICENSE

@@ -1,11 +1,14 @@
-Copyright (c) 1991-2007 UChicago Argonne LLC and The Regents of the
-University of California. All rights reserved.
+Copyright (c) 1991-2011 UChicago Argonne LLC.
+Copyright (c) 1991-2006 The Regents of the University of California.
+Copyright (c) 2006-2011. Los Alamos National Security, LLC. Some of this
+material was produced under U.S. Government contract DE-AC52-06NA25396
+for Los Alamos National Laboratory (LANL), which is operated by Los Alamos
+National Security, LLC for the U.S. Department of Energy.
 
 EPICS BASE is distributed subject to the following license conditions:
 
  SOFTWARE LICENSE AGREEMENT
  Software: EPICS BASE
- Versions: 3.13.7 and higher
 
  1. The "Software", below, refers to EPICS BASE (in either source code, or
     binary form and accompanying documentation). Each licensee is

configure/CONFIG

@@ -1,34 +1,30 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2013 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 Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in the file LICENSE that is included with this distribution.
 #*************************************************************************
 #
 #  $Revision-Id$
-#
-#  The developer may edit this file.
-# assume T_A is the host arch if not specified
 
 #
 #  Common build definitions
 #
 
 ifneq ($(wildcard $(TOP)/configure/CONFIG_BASE_VERSION),)
-EPICS_BASE = $(INSTALL_LOCATION)
-CONFIG = $(TOP)/configure
-BASE_TOP=YES
+  EPICS_BASE = $(INSTALL_LOCATION)
+  CONFIG = $(TOP)/configure
+  BASE_TOP=YES
 else
-CONFIG ?= $(EPICS_BASE)/configure
+  CONFIG ?= $(EPICS_BASE)/configure
 endif
 
 # Provide a default if the user hasn't set EPICS_HOST_ARCH
 ifeq ($(origin EPICS_HOST_ARCH), undefined)
-# NB: Must use a simply expanded variable here for performance:
-EPICS_HOST_ARCH := $(shell $(CONFIG)/../startup/EpicsHostArch.pl)
+  # NB: We use a simply expanded variable here for performance:
+  EPICS_HOST_ARCH := $(shell $(CONFIG)/../startup/EpicsHostArch.pl)
 endif
 #
 
@@ -38,8 +34,8 @@ endif
 -include $(CONFIG)/RELEASE.$(EPICS_HOST_ARCH)
 -include $(CONFIG)/RELEASE.$(EPICS_HOST_ARCH).Common
 ifdef T_A
--include $(CONFIG)/RELEASE.Common.$(T_A)
--include $(CONFIG)/RELEASE.$(EPICS_HOST_ARCH).$(T_A)
+  -include $(CONFIG)/RELEASE.Common.$(T_A)
+  -include $(CONFIG)/RELEASE.$(EPICS_HOST_ARCH).$(T_A)
 endif
 
 include $(CONFIG)/CONFIG_COMMON
@@ -62,52 +58,56 @@ include $(CONFIG)/CONFIG_BASE_VERSION
 include $(CONFIG)/os/CONFIG.$(EPICS_HOST_ARCH).Common
 -include $(CONFIG)/os/CONFIG_SITE.$(EPICS_HOST_ARCH).Common
 
+RELEASE_TOPS := $(shell $(CONVERTRELEASE) -T $(TOP) releaseTops)
+
+
 ifdef T_A
 
-#  Cross compile specific definitions
-#
-ifneq ($(EPICS_HOST_ARCH),$(T_A))
-include $(CONFIG)/CONFIG.CrossCommon
-endif
+  #  Cross compile specific definitions
+  #
+  ifneq ($(EPICS_HOST_ARCH),$(T_A))
+    include $(CONFIG)/CONFIG.CrossCommon
+  endif
 
-#  Target architecture specific definitions
-#
--include $(CONFIG)/os/CONFIG.Common.$(T_A)
+  #  Target architecture specific definitions
+  #
+  -include $(CONFIG)/os/CONFIG.Common.$(T_A)
 
-#  Host-Target architecture specific definitions
-#
--include $(CONFIG)/os/CONFIG.$(EPICS_HOST_ARCH).$(T_A)
+  #  Host-Target architecture specific definitions
+  #
+  -include $(CONFIG)/os/CONFIG.$(EPICS_HOST_ARCH).$(T_A)
 
-#  RELEASE file specific definitions
-#
-ifneq ($(CONFIG),$(TOP)/configure)
--include $(CONFIG)/CONFIG_APP_INCLUDE
-endif
+  #  RELEASE file specific definitions
+  #
+  ifneq ($(CONFIG),$(TOP)/configure)
+    -include $(CONFIG)/CONFIG_APP_INCLUDE
+  endif
 
-#  Site specific target and host-target definitions
-#
--include $(CONFIG)/os/CONFIG_SITE.Common.$(T_A)
--include $(CONFIG)/os/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
+  #  Site specific target and host-target definitions
+  #
+  -include $(CONFIG)/os/CONFIG_SITE.Common.$(T_A)
+  -include $(CONFIG)/os/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
+
+endif # ifdef T_A
 
-endif
 
 # Include <top>/cfg/CONFIG* definitions from tops defined in RELEASE* files
 #
 ifneq ($(CONFIG),$(TOP)/configure)
-RELEASE_TOPS := $(shell $(CONVERTRELEASE) -T $(TOP) releaseTops)
-RELEASE_CFG_CONFIGS = $(foreach top, $(RELEASE_TOPS), $(wildcard $($(top))/cfg/CONFIG*))
-ifneq ($(RELEASE_CFG_CONFIGS),)
-include $(RELEASE_CFG_CONFIGS)
-endif
+  RELEASE_TOPS_REVERSE := $(shell \
+      $(PERL) -e '$$,=" ";print reverse @ARGV' $(RELEASE_TOPS))
+  RELEASE_CFG_CONFIGS = $(foreach top, $(RELEASE_TOPS_REVERSE), \
+      $(wildcard $($(top))/cfg/CONFIG*))
+  ifneq ($(RELEASE_CFG_CONFIGS),)
+    include $(RELEASE_CFG_CONFIGS)
+  endif
 endif
 
 # Include $(INSTALL_CFG)/CONFIG* definitions
 #
-ifndef T_A
 TOP_CFG_CONFIGS = $(wildcard $(INSTALL_CFG)/CONFIG*)
 ifneq ($(TOP_CFG_CONFIGS),)
-include $(TOP_CFG_CONFIGS)
-endif
+  include $(TOP_CFG_CONFIGS)
 endif
 
 #  User specific definitions
@@ -115,26 +115,7 @@ endif
 -include $(HOME)/configure/CONFIG_USER
 -include $(HOME)/configure/CONFIG_USER.$(EPICS_HOST_ARCH)
 ifdef T_A
--include $(HOME)/configure/CONFIG_USER.Common.$(T_A)
--include $(HOME)/configure/CONFIG_USER.$(EPICS_HOST_ARCH).$(T_A)
+  -include $(HOME)/configure/CONFIG_USER.Common.$(T_A)
+  -include $(HOME)/configure/CONFIG_USER.$(EPICS_HOST_ARCH).$(T_A)
 endif
 
-#  All options
-#   may be overridden here.
-#
-# EXAMPLES
-# --------
-#  Build client objects statically ?  must be either YES or NO
-#STATIC_BUILD=NO
-#  Host build optimization,   must be either YES or NO
-#HOST_OPT=YES
-#  Cross build optimization,  must be either YES or NO
-#CROSS_OPT=YES
-#  Generate Verbose Compiler Warnings for host build,  must be either YES or NO
-#HOST_WARN=YES
-#  Generate Verbose Compiler Warnings for cross compile builds,  must be either YES or NO
-#CROSS_WARN=YES
-#etc.
-
-#CROSS_COMPILER_TARGET_ARCHS=vxWorks-68040
-

configure/CONFIG_ADDONS

@@ -1,5 +1,5 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2011 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.
@@ -26,7 +26,6 @@
 #    USR_CFLAGS    C flags
 #    USR_CXXFLAGS  C++ flags
 #    USR_CPPFLAGS  c preprocesser flags
-#    INC           include-files to install
 #    SRCS          source files for building libraries and prods
 #    USR_SRCS      source files for building libraries and prods
 #    PROD_SRCS     source files for building prods
@@ -34,6 +33,7 @@
 #    LIBSRCS       source files for building libraries (deprecated)
 #    PROD_OBJS     object files for building prods
 #    LIB_OBJS      object files for building libraries
+#    USR_OBJS      object files for building libraries and prods
 #    USR_LIBS      libs needed by PROD and TESTPROD and LIBRARY
 #    PROD_LIBS     libs needed by PROD and TESTPROD
 #    LIB_LIBS      libs needed by shared LIBRARY
@@ -375,17 +375,6 @@ USR_LIBS += $(USR_LIBS_DEFAULT)
 endif
 endif
 
-#
-#	concat specific include files
-#
-ifneq ($(strip $(INC_$(OS_CLASS))),)
-INC += $(subst -nil-,,$(INC_$(OS_CLASS)))
-else
-ifdef INC_DEFAULT
-INC+=$(INC_DEFAULT)
-endif
-endif
-
 #
 #	concat specific library contents (if defined) to SYS_PROD_LIBS
 #

configure/CONFIG_APP_INCLUDE

@@ -1,24 +1,34 @@
-export TOP
-export IOCAPPS
+#*************************************************************************
+# Copyright (c) 2013 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 the file LICENSE that is included with this distribution.
+#*************************************************************************
+#
+#  $Revision-Id$
+#
 
-RELEASE_TOPS := $(shell $(CONVERTRELEASE) -T $(TOP) releaseTops)
+export TOP
 
 ifneq ($(RELEASE_TOPS),)
 
 define  RELEASE_FLAGS_template
   export $(1)
-  $(1)_HOST_BIN = $$(strip $$($(1)))/bin/$$(EPICS_HOST_ARCH)
-  $(1)_HOST_LIB = $$(strip $$($(1)))/lib/$$(EPICS_HOST_ARCH)
-  $(1)_BIN = $$(wildcard $$(strip $$($(1)))/bin/$$(T_A))
-  $(1)_LIB = $$(wildcard $$(strip $$($(1)))/lib/$$(T_A))
+  $(1)_HOST_BIN = $$(strip $$($(1)))/bin/$(EPICS_HOST_ARCH)
+  $(1)_HOST_LIB = $$(strip $$($(1)))/lib/$(EPICS_HOST_ARCH)
+  $(1)_BIN = $$(wildcard $$(strip $$($(1)))/bin/$(T_A))
+  $(1)_LIB = $$(wildcard $$(strip $$($(1)))/lib/$(T_A))
   SHRLIB_SEARCH_DIRS += $$($(1)_LIB)
-  RELEASE_INCLUDES += $$(addprefix -I,$$(wildcard $$(strip $$($(1)))/include/os/$$(OS_CLASS)))
+  RELEASE_INCLUDES += $$(addprefix -I,$$(wildcard $$(strip $$($(1)))/include/os/$(OS_CLASS)))
   RELEASE_INCLUDES += $$(addprefix -I,$$(wildcard $$(strip $$($(1)))/include))
-  RELEASE_DBDFLAGS += $$(addprefix -I,$$(wildcard $$(strip $$($(1)))/dbd))
-  RELEASE_DBFLAGS += $$(addprefix -I,$$(wildcard $$(strip $$($(1)))/db))
-  RELEASE_PERL_MODULE_DIRS += $$(wildcard $$($(1)_LIB)/perl)
+  RELEASE_DBD_DIRS += $$(wildcard $$(strip $$($(1)))/dbd)
+  RELEASE_DB_DIRS += $$(wildcard $$(strip $$($(1)))/db)
+  RELEASE_PERL_MODULE_DIRS += $$(wildcard $$(strip $$($(1)))/lib/perl)
 endef
-$(foreach top, $(RELEASE_TOPS), $(eval $(call RELEASE_FLAGS_template,$(top)) ))
+$(foreach top, $(RELEASE_TOPS), \
+    $(eval $(call RELEASE_FLAGS_template,$(top))))
 
 endif
 

configure/CONFIG_BASE

@@ -54,6 +54,7 @@ BASE_CPPFLAGS += $(OSITHREAD_DEFAULT_STACK_FLAGS_$(OSITHREAD_USE_DEFAULT_STACK))
 # Where to find the installed build tools
 
 TOOLS = $(EPICS_BASE_HOST_BIN)
+FIND_TOOL = $(firstword $(wildcard $(TOOLS)/$(1) $(TOP)/src/tools/$(1)))
 
 #---------------------------------------------------------------
 # Epics base build tools and tool flags
@@ -63,7 +64,8 @@ DBEXPAND                   = $(call PATH_FILTER, $(TOOLS)/dbExpand$(HOSTEXE))
 DBTORECORDTYPEH            = $(call PATH_FILTER, $(TOOLS)/dbToRecordtypeH$(HOSTEXE))
 DBTOMENUH                  = $(call PATH_FILTER, $(TOOLS)/dbToMenuH$(HOSTEXE))
 REGISTERRECORDDEVICEDRIVER = $(PERL) $(TOOLS)/registerRecordDeviceDriver.pl
-CONVERTRELEASE=$(PERL) $(TOOLS)/convertRelease.pl
+CONVERTRELEASE             = $(PERL) $(call FIND_TOOL,convertRelease.pl)
+FULLPATHNAME               = $(PERL) $(TOOLS)/fullPathName.pl
 
 #-------------------------------------------------------
 # tools for installing libraries and products

configure/CONFIG_BASE_VERSION

@@ -1,5 +1,5 @@
 #*************************************************************************
-# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
+# Copyright (c) 2012 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.
@@ -19,18 +19,18 @@
 
 BASE_3_14=YES
 
-# EPICS_VERSION must be a number >0 and <256 
+# EPICS_VERSION must be a number >0 and <256
 EPICS_VERSION = 3
 
-# EPICS_REVISION must be a number >=0 and <256 
+# EPICS_REVISION must be a number >=0 and <256
 EPICS_REVISION = 14
 
-# EPICS_MODIFICATION must be a number >=0 and <256 
+# EPICS_MODIFICATION must be a number >=0 and <256
 EPICS_MODIFICATION = 12
 
 # EPICS_PATCH_LEVEL must be a number  (win32 resource file requirement)
 # Not included if zero
-EPICS_PATCH_LEVEL = 0
+EPICS_PATCH_LEVEL = 5
 
 # This will end in -DEV between official releases
 #EPICS_DEV_SNAPSHOT=-DEV
@@ -38,11 +38,11 @@ EPICS_PATCH_LEVEL = 0
 #EPICS_DEV_SNAPSHOT=-pre1-DEV
 #EPICS_DEV_SNAPSHOT=-pre2
 #EPICS_DEV_SNAPSHOT=-pre2-DEV
-EPICS_DEV_SNAPSHOT=-rc1
+#EPICS_DEV_SNAPSHOT=-rc1
 #EPICS_DEV_SNAPSHOT=-rc1-DEV
 #EPICS_DEV_SNAPSHOT=-rc2
 #EPICS_DEV_SNAPSHOT=-rc2-DEV
-#EPICS_DEV_SNAPSHOT=
+EPICS_DEV_SNAPSHOT=
 
 # No changes should be needed below here
 

configure/CONFIG_COMMON

@@ -1,10 +1,9 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2011 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 Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
+# EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 #
@@ -48,7 +47,7 @@ DB_OPT = NO
 #-------------------------------------------------------
 # Check configure/RELEASE file for consistency
 CHECK_RELEASE_YES = checkRelease
-CHECK_RELEASE_NO =
+CHECK_RELEASE_NO = noCheckRelease
 CHECK_RELEASE_WARN = warnRelease
 
 #-------------------------------------------------------
@@ -77,12 +76,16 @@ INSTALL_DB                  = $(INSTALL_LOCATION)/db
 INSTALL_CONFIG              = $(INSTALL_LOCATION)/configure
 INSTALL_JAVA                = $(INSTALL_LOCATION)/javalib
 
-#Directory for OS independant build created files
+# Directory for OS independant build created files
 COMMON_DIR = ../O.Common
 
+# IOC's absolute path to $(TOP), may be overridden inside the application
+IOCS_APPL_TOP               = $(shell $(FULLPATHNAME) $(INSTALL_LOCATION))
+
 #-------------------------------------------------------
 # Make echo output - suppress echoing if make's '-s' flag is set
-ECHO := $(if $(findstring s,$(MAKEFLAGS)),\#,@echo)
+NOP = :
+ECHO = @$(if $(findstring s,$(patsubst T_A=%,,$(MAKEFLAGS))),$(NOP),echo)
 
 #-------------------------------------------------------
 ifdef T_A
@@ -206,6 +209,16 @@ USR_CPPFLAGS =
 USR_DBDFLAGS =
 USR_ARFLAGS =
 
+# Variables to be set only on the command-line:
+# CMD_INCLUDES =
+# CMD_CFLAGS =
+# CMD_CXXFLAGS =
+# CMD_LDFLAGS =
+# CMD_CPPFLAGS =
+# CMD_DBFLAGS =
+# CMD_DBDFLAGS =
+# CMD_ARFLAGS =
+
 # Debug specific options
 DEBUG_CPPFLAGS =
 DEBUG_CFLAGS =
@@ -264,32 +277,35 @@ RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(COMMANDLINE_LIBRARY))
 # Flags
 
 INCLUDES = -I. $(SRC_INCLUDES) $(INSTALL_INCLUDES) $(RELEASE_INCLUDES)\
- $(TARGET_INCLUDES) $(USR_INCLUDES) $(OP_SYS_INCLUDES) $($(BUILD_CLASS)_INCLUDES)
+ $(TARGET_INCLUDES) $(USR_INCLUDES) $(CMD_INCLUDES) $(OP_SYS_INCLUDES)\
+ $($(BUILD_CLASS)_INCLUDES)
 
-CFLAGS = $($(BUILD_CLASS)_CFLAGS) $(POSIX_CFLAGS) $(OPT_CFLAGS) $(DEBUG_CFLAGS)\
- $(PIPE_CFLAGS) $(WARN_CFLAGS) $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS)\
- $(CODE_CFLAGS) $(STATIC_CFLAGS) $(OP_SYS_CFLAGS) $(LIBRARY_SRC_CFLAGS) $(HDEPENDS_CFLAGS)
+CFLAGS = $($(BUILD_CLASS)_CFLAGS) $(POSIX_CFLAGS) $(OPT_CFLAGS)\
+ $(DEBUG_CFLAGS) $(PIPE_CFLAGS) $(WARN_CFLAGS) $(TARGET_CFLAGS)\
+ $(USR_CFLAGS) $(CMD_CFLAGS) $(ARCH_DEP_CFLAGS) $(CODE_CFLAGS)\
+ $(STATIC_CFLAGS) $(OP_SYS_CFLAGS) $(LIBRARY_SRC_CFLAGS) $(HDEPENDS_CFLAGS)
 
-CXXFLAGS = $($(BUILD_CLASS)_CXXFLAGS) $(POSIX_CXXFLAGS) $(OPT_CXXFLAGS) $(DEBUG_CXXFLAGS)\
- $(PIPE_CFLAGS) $(WARN_CXXFLAGS) $(TARGET_CXXFLAGS) $(USR_CXXFLAGS) $(ARCH_DEP_CXXFLAGS)\
- $(CODE_CXXFLAGS) $(STATIC_CXXCFLAGS) $(OP_SYS_CXXFLAGS) $(LIBRARY_SRC_CFLAGS) $(HDEPENDS_CFLAGS)
+CXXFLAGS = $($(BUILD_CLASS)_CXXFLAGS) $(POSIX_CXXFLAGS) $(OPT_CXXFLAGS)\
+ $(DEBUG_CXXFLAGS) $(PIPE_CFLAGS) $(WARN_CXXFLAGS) $(TARGET_CXXFLAGS)\
+ $(USR_CXXFLAGS) $(CMD_CXXFLAGS) $(ARCH_DEP_CXXFLAGS) $(CODE_CXXFLAGS)\
+ $(STATIC_CXXCFLAGS) $(OP_SYS_CXXFLAGS) $(LIBRARY_SRC_CFLAGS) $(HDEPENDS_CFLAGS)
 
-LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(POSIX_LDFLAGS) \
- $(ARCH_DEP_LDFLAGS) $(DEBUG_LDFLAGS) $(OP_SYS_LDFLAGS) $($(BUILD_CLASS)_LDFLAGS)\
- $(RUNTIME_LDFLAGS) $(CODE_LDFLAGS)
+LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(CMD_LDFLAGS)\
+ $(POSIX_LDFLAGS) $(ARCH_DEP_LDFLAGS) $(DEBUG_LDFLAGS) $(OP_SYS_LDFLAGS)\
+ $($(BUILD_CLASS)_LDFLAGS) $(RUNTIME_LDFLAGS) $(CODE_LDFLAGS)
 
-LDLIBS = \
- $(POSIX_LDLIBS) $(ARCH_DEP_LDLIBS) $(DEBUG_LDLIBS) $(OP_SYS_LDLIBS) $(GNU_LDLIBS_$(GNU))
+LDLIBS = $(POSIX_LDLIBS) $(ARCH_DEP_LDLIBS) $(DEBUG_LDLIBS) $(OP_SYS_LDLIBS)\
+ $(GNU_LDLIBS_$(GNU))
 
-CPPFLAGS += $($(BUILD_CLASS)_CPPFLAGS) $(POSIX_CPPFLAGS)\
- $(OPT_CPPFLAGS) $(DEBUG_CPPFLAGS) $(WARN_CPPFLAGS)\
- $(BASE_CPPFLAGS) $(TARGET_CPPFLAGS) $(USR_CPPFLAGS) $(ARCH_DEP_CPPFLAGS)\
- $(OP_SYS_CPPFLAGS) $(OP_SYS_INCLUDE_CPPFLAGS) $(CODE_CPPFLAGS)
+CPPFLAGS = $($(BUILD_CLASS)_CPPFLAGS) $(POSIX_CPPFLAGS) $(OPT_CPPFLAGS)\
+ $(DEBUG_CPPFLAGS) $(WARN_CPPFLAGS) $(BASE_CPPFLAGS) $(TARGET_CPPFLAGS)\
+ $(USR_CPPFLAGS) $(CMD_CPPFLAGS) $(ARCH_DEP_CPPFLAGS) $(OP_SYS_CPPFLAGS)\
+ $(OP_SYS_INCLUDE_CPPFLAGS) $(CODE_CPPFLAGS)
 
 #--------------------------------------------------
 # ar definition default
 ARFLAGS =
-ARCMD = $(AR) $(ARFLAGS) $(USR_ARFLAGS) $@  $(LIBRARY_LD_OBJS)
+ARCMD = $(AR) $(ARFLAGS) $(USR_ARFLAGS) $(CMD_ARFLAGS) $@  $(LIBRARY_LD_OBJS)
 
 #--------------------------------------------------
 # 'Munch' link-edit
@@ -320,8 +336,7 @@ PREPROCESS.cpp = $(CPP) $(CPPFLAGS) $(INCLUDES) $< > $@
 HDEPENDS = YES
 HDEPENDS_METHOD = CMD
 
-HDEPENDS_INCLUDES = $(subst -I,,$(INCLUDES))
-HDEPENDSFLAGS = -m $*$(DEP) $(HDEPENDS_INCLUDES) $@ $<
+HDEPENDSFLAGS = -m $*$(DEP) $(INCLUDES) $@ $<
 HDEPENDSCMD = -$(MKMF) $(HDEPENDS_FLAGS) $(HDEPENDSFLAGS)
 
 HDEPENDS_CMD_NO = $(ECHO) ""
@@ -335,7 +350,7 @@ HDEPENDS_CFLAGS = $(HDEPENDS_CFLAGS_$(HDEPENDS))
 #--------------------------------------------------
 # depends definition
 
-TARGET_SRCS = $(foreach name, $(TESTPROD) $(PROD) $(LIBRARY), $($(name)_SRCS))
+TARGET_SRCS = $(foreach name, $(TESTPROD) $(PROD) $(LIBRARY) $(LOADABLE_LIBRARY), $($(name)_SRCS))
 SRC_FILES = $(LIB_SRCS) $(LIBSRCS) $(SRCS) $(USR_SRCS) $(PROD_SRCS) $(TARGET_SRCS)
 HDEPENDS_FILES_YES = $(addsuffix $(DEP),$(notdir $(basename $(SRC_FILES))))
 HDEPENDS_FILES = $(if $(filter NO,$(HDEPENDS)),,$(HDEPENDS_FILES_YES))
@@ -371,6 +386,7 @@ INSTALL_LIB_INSTALLS = $(addprefix $(INSTALL_LIB)/,$(notdir $(LIB_INSTALLS)))
 # Installed file permissions
 BIN_PERMISSIONS = 555
 LIB_PERMISSIONS = 444
+SHRLIB_PERMISSIONS = 555
 INSTALL_PERMISSIONS = 444
 
 #---------------------------------------------------------------

configure/CONFIG_FILE_TYPE

@@ -1,10 +1,10 @@
 #*************************************************************************
-# Copyright (c) 2006 UChicago Argonne LLC, as Operator of Argonne
+# Copyright (c) 2013 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 the file LICENSE that is included with this distribution. 
+# in the file LICENSE that is included with this distribution.
 #*************************************************************************
 # $Revision-Id$
 #
@@ -12,7 +12,7 @@
 #
 
 # --------------------------------------------------------------
-# Module developers can now define a new type of file, e.g. ABC, 
+# Module developers can now define a new type of file, e.g. ABC,
 # so that files of type ABC will be installed into a directory
 # defined by INSTALL_ABC. This is done by creating a new CONFIG<name>
 # file, e.g. CONFIG_ABC, with the following lines:
@@ -24,8 +24,14 @@
 # $(INSTALL_LOCATION). The file type ABC should be target
 # architecture independent (alh files, medm files, edm files).
 #
-# Optional rules necessary for files of type ABC should be put in
-# a RULES_ABC file.
+# Files of type ABC are then installed into the INSTALL_ABC
+# directory by adding a line like the following to a Makefile.
+#
+#       ABC += <filename1> <filename2> <filename3>
+#
+# Rules necessary to create files of type ABC should be put in
+# a RULES_ABC file. Variables used by those rules should appear
+# in a CONFIG_ABC file.
 #
 # The module developer installs new CONFIG* or RULES* files
 # into the directory $(INSTALL_LOCATION)/cfg by including the 
@@ -33,16 +39,11 @@
 #
 #       CFG += CONFIG_ABC RULES_ABC
 # 
-# Files of type ABC are installed into INSTALL_ABC directory
-# by adding a line like the following to a Makefile.
-#
-#       ABC += <filename1> <filename2> <filename3>
-#
-# Files in $(INSTALL_LOCATION)/cfg directory are now included by
-# the base config files so the definitions and rules are available
-# for use by later src directory Makefiles in the same module or
-# by other modules with a RELEASE line pointing to the TOP of 
-# the module with RULES_ABC.
+# CONFIG and RULES files in the $(INSTALL_LOCATION)/cfg directory
+# are included by the Base config files so their definitions and
+# rules are available for use by later src directory Makefiles in
+# the same module, or by other modules with a RELEASE line that
+# points to the TOP of the module providing these files.
 
 FILE_TYPE += ADL
 INSTALL_ADL = $(INSTALL_LOCATION)/adl
@@ -59,6 +60,6 @@ INSTALL_EDL = $(INSTALL_LOCATION)/edl
 FILE_TYPE += PERL_MODULES
 INSTALL_PERL_MODULES = $(INSTALL_LOCATION_LIB)/perl
 
-INSTALLS_CFG= $(CFG:%= $(INSTALL_CFG)/%)
+INSTALLS_CFG = $(CFG:%= $(INSTALL_CFG)/%)
 DIRECTORY_TARGETS += $(foreach type, $(FILE_TYPE),$(INSTALL_$(type)))
 

configure/CONFIG_SITE

@@ -19,11 +19,13 @@
 #	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)
+#	cygwin-x86_64          (cygwin compiler used for host builds)
 #	darwin-ppc             (PowerPC based Apple running OSX)
 #	darwin-ppcx86          (Universal binaries for both CPUs)
 #	darwin-x86             (Intel based Apple running OSX)
 #	freebsd-x86            (GNU compiler used for host builds)
 #	freebsd-x86_64         (GNU compiler used for host builds)
+#	linux-arm              (GNU compiler used for host builds)
 #	linux-ppc              (GNU compiler used for host builds)
 #	linux-ppc64            (GNU compiler used for host builds)
 #	linux-x86              (GNU compiler used for host builds)
@@ -40,9 +42,13 @@
 #	win32-x86              (MS Visual C++ compiler used for host builds)
 #	win32-x86-cygwin       (WIN32 API with cygwin GNU compiler used for host builds)
 #	win32-x86-mingw        (MinGW compiler used for host builds)
+#	win32-x86-static       (MS Visual C++ compiler used for host builds)
 #	windows-x64            (MS Visual C++ compiler used for host builds)
+#	windows-x64-mingw      (MinGW compiler used for host builds)
+#	windows-x64-static     (MS Visual C++ compiler used for host builds)
 
-#  Debugging builds 
+#  Debugging builds:
+#	linux-arm-debug        (GNU compiler used 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)
@@ -59,31 +65,35 @@
 #
 #  Currently Supporting:
 
-#       ios-arm
-#       ios-386
+#       ios-arm                 (darwin-x86 host)
+#       ios-386                 (darwin-x86 host)
 #       linux-386               (linux-x86 host)
 #       linux-486               (linux-x86 host)
 #       linux-586               (linux-x86 host)
 #       linux-686               (linux-x86 host)
-#       linux-arm               (linux-x86 host)
+#       linux-arm               (linux-x86 or -x86_64 host)
 #       linux-arm_eb            (linux-x86 host)
 #       linux-arm_el            (linux-x86 host)
 #       linux-athlon            (linux-x86 host)
 #       linux-cris              (Axis GNU crosscompiler on linux-x86 host)
 #       linux-cris_v10          (Axis GNU crosscompiler on linux-x86 host)
 #       linux-cris_v32          (Axis GNU crosscompiler on linux-x86 host)
+#       linux-microblaze
 #       linux-xscale_be
 #       vxWorks-486
 #       vxWorks-68040
 #       vxWorks-68040lc
 #       vxWorks-68060
 #       vxWorks-pentium
+#       vxWorks-ppc32           (32-bit PowerPC CPUs with full FPU)
+#       vxWorks-ppc32sf         (32-bit PowerPC CPUs without FPU)
 #       vxWorks-ppc603
 #       vxWorks-ppc603_long
 #       vxWorks-ppc604
 #       vxWorks-ppc604_long
 #       vxWorks-ppc604_altivec
 #       vxWorks-mpc8540
+#       vxWorks-mpc8548
 #       RTEMS-at91rm9200ek
 #       RTEMS-beatnik
 #       RTEMS-gen68360
@@ -96,6 +106,7 @@
 #       RTEMS-pc386
 #       RTEMS-psim
 #       RTEMS-uC5282
+#       win32-x86-mingw         (linux-x86 or -x86_64 host)
 #
 
 # Definitions of CROSS_COMPILER_TARGET_ARCHS in
@@ -103,7 +114,7 @@
 # override 
 #
 CROSS_COMPILER_TARGET_ARCHS=
-#CROSS_COMPILER_TARGET_ARCHS=vxWorks-68040
+#CROSS_COMPILER_TARGET_ARCHS=vxWorks-ppc32
 
 #  If only a subset of the host architectures perform
 #  the build for the CROSS_COMPILER_TARGET_ARCHS
@@ -116,9 +127,9 @@ CROSS_COMPILER_HOST_ARCHS=
 #     NOTE: os/CONFIG.$(EPICS_HOST_ARCH).$(EPICS_HOST_ARCH) files and
 #     os/CONFIG_SITE.$(EPICS_HOST_ARCH).$(EPICS_HOST_ARCH) files may override
 #
-#     NOTE WIN32: YES results in a DLL.  Valid settings are
-#                   SHARED_LIBRARIES=YES and STATIC_BUILD=NO
-#                   SHARED_LIBRARIES=NO  and STATIC_BUILD=YES
+#     NOTE Windows: YES results in a DLL.  Valid settings are
+#        SHARED_LIBRARIES=YES  and  STATIC_BUILD=NO
+#        SHARED_LIBRARIES=NO   and  STATIC_BUILD=YES
 #
 SHARED_LIBRARIES=YES
 
@@ -170,7 +181,7 @@ COMPAT_313=NO
 #INSTALL_LOCATION=<fullpathname>
 
 # Use POSIX thread priority scheduling (YES or NO)
-USE_POSIX_THREAD_PRIORITY_SCHEDULING = NO
+USE_POSIX_THREAD_PRIORITY_SCHEDULING = YES
 
 #  Site version number, if set will append '-' and this string to the
 #  EPICS version number string that is reported by many tools
@@ -180,7 +191,9 @@ EPICS_SITE_VERSION =
 # between the various stages of compilation.
 GCC_PIPE = NO
 
-#  Include RPATH when linking executables and libraries.
-#       must be either YES or NO
-LINKER_USE_RPATH=YES
+# Set RPATH when linking executables and libraries.
+#  Must be either YES or NO.  If you set this to NO you must also provide a
+#  way for Base executables to find their shared libraries when they are
+#  run at build-time, e.g. set the LD_LIBRARY_PATH environment variable.
+LINKER_USE_RPATH = YES
 

configure/RULES.Db

@@ -1,10 +1,9 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2011 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 Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
+# EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 #RULES.Db
@@ -22,11 +21,11 @@ vpath %.acs $(USR_VPATH) $(GENERIC_SRC_DIRS) $(COMMON_DIR)
 
 ##################################################### dbdflags
 
-# dbExpand
-INSTALL_DBDFLAGS += -I $(INSTALL_LOCATION)/dbd
-INSTALL_DBFLAGS += -I $(INSTALL_LOCATION)/db
-DBDFLAGS = $(USR_DBDFLAGS) -I . -I .. $(INSTALL_DBDFLAGS) $(RELEASE_DBDFLAGS)
-DBFLAGS = $($*_DBFLAGS) $(USR_DBFLAGS) -I. -I.. $(INSTALL_DBFLAGS) $(RELEASE_DBFLAGS)
+DBD_SEARCH_DIRS = . .. $(COMMON_DIR) $(SRC_DIRS) $(INSTALL_DBD) $(RELEASE_DBD_DIRS)
+DB_SEARCH_DIRS = . .. $(COMMON_DIR) $(SRC_DIRS) $(INSTALL_DB) $(RELEASE_DB_DIRS)
+
+DBDFLAGS = $(USR_DBDFLAGS) $(CMD_DBDFLAGS) $(addprefix -I,$(DBD_SEARCH_DIRS))
+DBFLAGS = $($*_DBFLAGS) $(USR_DBFLAGS) $(CMD_DBFLAGS) $(addprefix -I,$(DB_SEARCH_DIRS))
 
 #####################################################
 # To allow os specific dbd files AND have the -j option work properly,
@@ -48,7 +47,7 @@ DBFLAGS = $($*_DBFLAGS) $(USR_DBFLAGS) -I. -I.. $(INSTALL_DBFLAGS) $(RELEASE_DBF
 # Following line added for backward compatibilty
 DBD += $(DBDNAME)
 
-DBDINC_NAME = $(patsubst %.h,%,$(patsubst %.db,%,$(DBDINC)))
+DBDINC_NAME = $(patsubst %.h,%,$(patsubst %.dbd,%,$(DBDINC)))
 DBD += $(addsuffix .dbd,$(DBDINC_NAME))
 INC += $(addsuffix .h,$(DBDINC_NAME))
 
@@ -101,7 +100,7 @@ ACF_CPPFLAGS = $(ACF_CPPFLAGS_$(GNU))
 
 ACF_INCLUDES = -I. $(TARGET_INCLUDES) $(USR_INCLUDES)\
                 $(SRC_INCLUDES) -I$(INSTALL_DB)
-ACFDEPENDS_CMD = -$(MKMF) -m $(notdir $@)$(DEP) $(subst -I,,$(ACF_INCLUDES)) $@ $<
+ACFDEPENDS_CMD = -$(MKMF) -m $(notdir $@)$(DEP) $(ACF_INCLUDES) $@ $<
 ACF_CMD = $(CPP) $(ACF_CPPFLAGS) $(ACF_INCLUDES) $< > $@
 
 #####################################################  dependancies
@@ -109,19 +108,20 @@ ACF_CMD = $(CPP) $(ACF_CPPFLAGS) $(ACF_INCLUDES) $< > $@
 HINC += $(addsuffix .h,$(DBDINC_NAME))
 COMMON_DBDINC += $(addprefix $(COMMON_DIR)/,$(HINC))
 
-DBDDEPENDS_FILES += $(addsuffix $(DEP),$(HINC) $(DBS) \
+DBDDEPENDS_FILES += $(addsuffix $(DEP),$(HINC) \
+                    $(patsubst $(COMMON_DIR)/%,%,$(COMMON_DBS)) \
                     $(patsubst $(COMMON_DIR)/%,%,$(COMMON_DBDS)))
 
-DBDDEPENDS_FLAGS = $(subst -I,,$(filter-out -S%,$(DBDFLAGS)))
+DBDDEPENDS_FLAGS = $(filter-out -S%,$(DBDFLAGS))
 DBDDEPENDS_CMD = -$(MKMF) -m $(notdir $@)$(DEP) $(DBDDEPENDS_FLAGS) $@ $<
 
-MAKEDBDEPENDS = $(PERL) $(TOOLS)/makeDbDepends.pl
-
 ##################################################### 
 
 ifndef T_A
 
-ECHO := $(if $(findstring s,$(MAKEFLAGS)),\#,@echo)
+DEP = .d
+TEMPLATE3+=$(addsuffix .template, $(TEMPLATE2))
+
 COMMON_DIR = .
 INSTALL_DBDS =
 INSTALL_DBS =
@@ -134,7 +134,7 @@ ACTIONS += build
 ACTIONS += install
 ACTIONS += buildInstall
 ACTIONS += browse
-ACTIONS += runtests
+ACTIONS += runtests tapfiles
 
 actionArchTargets = $(foreach x, $(ACTIONS),\ $(foreach arch,$(BUILD_ARCHS), $(x)$(DIVIDER)$(arch)))
 
@@ -199,7 +199,7 @@ $(COMMON_DIR)/%.substitutions:
 endif
 
 $(INSTALL_DB)/%.substitutions: %.substitutions
-	$(ECHO) "Installing db file $@"
+	$(ECHO) "Installing substitution file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 .PRECIOUS: $(COMMON_DIR)/%.substitutions
@@ -213,7 +213,7 @@ $(COMMON_DIR)/%.template: $(COMMON_DIR)/%.edf
 	@$(RM) $@.VAR
 
 $(INSTALL_DB)/%.template: %.template
-	$(ECHO) "Installing db file $@"
+	$(ECHO) "Installing template file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 .PRECIOUS: $(COMMON_DIR)/%.template
@@ -223,58 +223,65 @@ $(INSTALL_DB)/%.template: %.template
 $(COMMON_DIR)/%Record.h: $(COMMON_DIR)/%Record.dbd
 	@$(RM) $(notdir $@)$(DEP)
 	@$(DBDDEPENDS_CMD)
-	$(ECHO) "$<:../Makefile" >> $(notdir $@)$(DEP)
-	@$(RM) $@
-	$(DBTORECORDTYPEH) $(DBDFLAGS)  $< $@
+	echo "$< : ../Makefile" >> $(notdir $@)$(DEP)
+	@$(RM) $(notdir $@)
+	$(DBTORECORDTYPEH) $(DBDFLAGS) $< $(notdir $@)
+	@$(MV) $(notdir $@) $@
 
 $(COMMON_DIR)/%Record.h: %Record.dbd
 	@$(RM) $(notdir $@)$(DEP)
 	@$(DBDDEPENDS_CMD)
-	$(ECHO) "$<:../Makefile" >> $(notdir $@)$(DEP)
-	@$(RM) $@
-	$(DBTORECORDTYPEH) $(DBDFLAGS)  $< $@
+	echo "$@ : ../Makefile" >> $(notdir $@)$(DEP)
+	@$(RM) $(notdir $@)
+	$(DBTORECORDTYPEH) $(DBDFLAGS) $< $(notdir $@)
+	@$(MV) $(notdir $@) $@
 
 $(COMMON_DIR)/menu%.h: $(COMMON_DIR)/menu%.dbd
 	@$(RM) $(notdir $@)$(DEP)
 	@$(DBDDEPENDS_CMD)
-	$(ECHO) "$<:../Makefile" >> $(notdir $@)$(DEP)
-	@$(RM) $@
-	$(DBTOMENUH) $(DBDFLAGS) $< $@
+	echo "$< : ../Makefile" >> $(notdir $@)$(DEP)
+	@$(RM) $(notdir $@)
+	$(DBTOMENUH) $(DBDFLAGS) $< $(notdir $@)
+	@$(MV) $(notdir $@) $@
 
 $(COMMON_DIR)/menu%.h: menu%.dbd
 	@$(RM) $(notdir $@)$(DEP)
 	@$(DBDDEPENDS_CMD)
-	$(ECHO) "$<:../Makefile" >> $(notdir $@)$(DEP)
-	@$(RM) $@
-	$(DBTOMENUH) $(DBDFLAGS) $< $@
+	echo "$@ : ../Makefile" >> $(notdir $@)$(DEP)
+	@$(RM) $(notdir $@)
+	$(DBTOMENUH) $(DBDFLAGS) $< $(notdir $@)
+	@$(MV) $(notdir $@) $@
 
 .PRECIOUS: $(COMMON_DIR)/%.h
 
 ##################################################### DBD files
 
 $(COMMON_DIR)/bpt%.dbd: bpt%.data 
-	@$(RM) $@
-	$(MAKEBPT) $< $@
+	$(MAKEBPT) $< $(notdir $@)
+	@$(MV) $(notdir $@) $@
 
 $(COMMON_DIR)/%.dbd: $(COMMON_DIR)/%Include.dbd 
 	@$(RM) $(notdir $@)$(DEP)
 	@$(DBDDEPENDS_CMD)
-	$(ECHO) "$<:../Makefile" >> $(notdir $@)$(DEP)
+	echo "$< : ../Makefile" >> $(notdir $@)$(DEP)
 	$(ECHO) "Expanding dbd"
-	@$(RM) $@
-	@$(DBEXPAND) $(DBDFLAGS) -o $@ $<
+	@$(RM) $(notdir $@)
+	@$(DBEXPAND) $(DBDFLAGS) -o $(notdir $@) $<
+	@$(MV) $(notdir $@) $@
 
 $(COMMON_DIR)/%.dbd: %Include.dbd 
 	@$(RM) $(notdir $@)$(DEP)
 	@$(DBDDEPENDS_CMD)
-	$(ECHO) "$<:../Makefile" >> $(notdir $@)$(DEP)
+	echo "$@ : ../Makefile" >> $(notdir $@)$(DEP)
 	$(ECHO) "Expanding dbd"
-	@$(RM) $@
-	$(DBEXPAND) $(DBDFLAGS) -o $@ $<
+	@$(RM) $(notdir $@)
+	$(DBEXPAND) $(DBDFLAGS) -o $(notdir $@) $<
+	@$(MV) $(notdir $@) $@
 
 $(COMMON_DIR)/%Include.dbd:
-	@$(RM) $@
-	$(PERL) $(TOOLS)/makeIncludeDbd.pl $($*_DBD) $@
+	@$(RM) $(notdir $@)
+	$(PERL) $(TOOLS)/makeIncludeDbd.pl $($*_DBD) $(notdir $@)
+	@$(MV) $(notdir $@) $@
 
 $(INSTALL_DBD)/%: $(COMMON_DIR)/%
 	$(ECHO) "Installing created dbd file $@"
@@ -302,8 +309,9 @@ $(COMMON_DIR)/%.db$(RAW): $(COMMON_DIR)/%.edf
 
 $(COMMON_DIR)/%.db$(RAW): %.substitutions
 	@$(RM) $(notdir $@)$(DEP)
-	$(MAKEDBDEPENDS) $@ $< $(TEMPLATE_FILENAME) >> $(notdir $@)$(DEP)
-	$(ECHO) "$@:$(TEMPLATE_FILENAME)" >> $(notdir $@)$(DEP)
+	@$(MKMF) -m$(notdir $@)$(DEP) $(DBFLAGS) $@ $< $(TEMPLATE_FILENAME)
+	echo "$@ : $(TEMPLATE_FILENAME)" >> $(notdir $@)$(DEP)
+	echo "$(notdir $@)$(DEP): $(TEMPLATE_FILENAME)" >> $(notdir $@)$(DEP)
 	$(ECHO) "Inflating database from $< $(TEMPLATE_FILENAME)"
 	@$(RM) $@ $*.tmp
 	$(MSI) $(DBFLAGS) -S$< $(TEMPLATE_FILENAME) > $*.tmp
@@ -311,7 +319,7 @@ $(COMMON_DIR)/%.db$(RAW): %.substitutions
 
 $(COMMON_DIR)/%.db$(RAW): %.template
 	@$(RM) $(notdir $@)$(DEP)
-	@$(MAKEDBDEPENDS) $@ $^  >> $(notdir $@)$(DEP)
+	@$(MKMF) -m$(notdir $@)$(DEP) $(DBFLAGS) $@ $< $(TEMPLATE_FILENAME)
 	$(ECHO) "Inflating database from $<"
 	@$(RM) $@ $*.tmp
 	$(MSI) $(DBFLAGS) $< > $*.tmp
@@ -343,7 +351,7 @@ $(COMMON_DIR)/%.db: $(COMMON_DIR)/%.db$(RAW)
 else
 
 $(INSTALL_DB)/%: %
-	$(ECHO) "Installing db file $@"
+	$(ECHO) "Installing $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 endif
 
@@ -363,17 +371,14 @@ $(foreach file, $(DB_INSTALLS), $(eval $(call DB_INSTALLS_template, $(file))))
 
 ##################################################### register record,device,driver support
 
-IOC_INST_TOP := $(firstword $(IOCS_APPL_TOP) \
-        $(shell $(PERL) $(TOOLS)/fullPathName.pl $(INSTALL_LOCATION) ) )
-
 %_registerRecordDeviceDriver.cpp: $(COMMON_DIR)/%.dbd 
 	@$(RM) $@ $*.tmp
-	$(REGISTERRECORDDEVICEDRIVER) $< $(basename $@) $(IOC_INST_TOP) > $*.tmp
+	$(REGISTERRECORDDEVICEDRIVER) $< $(basename $@) $(IOCS_APPL_TOP) > $*.tmp
 	$(MV) $*.tmp $@
 
 %_registerRecordDeviceDriver.cpp: %.dbd 
 	@$(RM) $@ $*.tmp
-	$(REGISTERRECORDDEVICEDRIVER) $< $(basename $@) $(IOC_INST_TOP) > $*.tmp
+	$(REGISTERRECORDDEVICEDRIVER) $< $(basename $@) $(IOCS_APPL_TOP) > $*.tmp
 	$(MV) $*.tmp $@
 
 .PRECIOUS: %_registerRecordDeviceDriver.cpp

configure/RULES.ioc

@@ -1,13 +1,13 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2013 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 Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution.
 #*************************************************************************
 #RULES.ioc
+
 include $(CONFIG)/RULES_DIRS
 
 build$(DIVIDER)$(ARCH) build: buildInstall
@@ -15,24 +15,20 @@ install$(DIVIDER)$(ARCH) install: buildInstall
 $(ARCH): buildInstall
 
 ifeq ($(filter $(ARCH),$(BUILD_ARCHS)),$(ARCH))
-buildInstall$(DIVIDER)$(ARCH) buildInstall: $(TARGETS)
+    buildInstall$(DIVIDER)$(ARCH) buildInstall: $(TARGETS)
 
-clean$(DIVIDER)$(ARCH) clean:
-	$(RM) cdCommands envPaths dllPath.bat
-
-else 
-buildInstall$(DIVIDER)$(ARCH) buildInstall:
-clean$(DIVIDER)$(ARCH) clean:
-endif
-
-cdCommands envPaths dllPath.bat: $(wildcard $(TOP)/configure/RELEASE*) \
-	$(TOP)/configure/CONFIG $(INSTALL_BIN)
-ifeq ($(IOCS_APPL_TOP),)
-	$(PERL) $(TOOLS)/convertRelease.pl -a $(ARCH) $@
+    clean$(DIVIDER)$(ARCH) clean:
+	$(RM) cdCommands envPaths dllPath.bat relPaths.sh
 else
-	$(PERL) $(TOOLS)/convertRelease.pl -a $(ARCH) -t $(IOCS_APPL_TOP) $@
+    buildInstall$(DIVIDER)$(ARCH) buildInstall:
+    clean$(DIVIDER)$(ARCH) clean:
 endif
 
+cdCommands envPaths dllPath.bat relPaths.sh: \
+    $(wildcard $(TOP)/configure/RELEASE*) \
+    $(wildcard $(TOP)/configure/CONFIG_SITE*) $(INSTALL_BIN)
+	$(CONVERTRELEASE) -a $(ARCH) -t $(IOCS_APPL_TOP) $@
+
 realclean:
-	$(RM) cdCommands envPaths dllPath.bat
+	$(RM) cdCommands envPaths dllPath.bat relPaths.sh
 

configure/RULES_ARCHS

@@ -17,41 +17,40 @@ ACTIONS += build
 ACTIONS += install
 ACTIONS += buildInstall
 ACTIONS += browse
-ACTIONS += runtests
+ACTIONS += runtests tapfiles
 #ACTIONS += rebuild
 
-actionPart = $(word 1, $(subst $(DIVIDER), ,$@))
-archPart = $(word 2, $(subst $(DIVIDER), ,$@))
+actionArchTargets = $(foreach action, $(ACTIONS), \
+    $(foreach arch, $(BUILD_ARCHS), \
+        $(action)$(DIVIDER)$(arch)))
 
-actionArchTargets = $(foreach x, $(ACTIONS),\
-		$(foreach arch,$(BUILD_ARCHS), $(x)$(DIVIDER)$(arch)))
-
-cleanArchTargets = $(foreach arch,$(BUILD_ARCHS), clean$(DIVIDER)$(arch))
+cleanArchTargets = $(foreach arch, $(BUILD_ARCHS), \
+    clean$(DIVIDER)$(arch))
 
 buildDirs = $(addprefix O.,$(BUILD_ARCHS))
 
-#*************************************************************************
-# Create epics_host_arch dependancies for GNU make -j option
-# Only works with GNU make 3.81 or later (uses eval function)
+# Include <top>/cfg/DIR_RULES* files from tops defined in RELEASE* files
+# Do this here so they can add ACTIONS
+#
+RELEASE_CFG_DIR_RULES = $(foreach top, $(RELEASE_TOPS), \
+    $(wildcard $($(top))/cfg/DIR_RULES*))
+ifneq ($(RELEASE_CFG_DIR_RULES),)
+  include $(RELEASE_CFG_DIR_RULES)
+endif
+
+# Create EPICS_HOST_ARCH dependancies for GNU make -j option.
 # Needed in dirs where EPICS_HOST_ARCH build creates a tool used in 
 # cross arch builds
 
 CROSS_ARCHS += $(CROSS1) $(CROSS2)
 
-# j is NOT found in MAKEFLAGS when using make 3.81
-# Hope to uncomment this for GNU make 3.82
-#ifeq ($(findstring j,$(MAKEFLAGS)),j)
-
 define DEP_template
 $(2): $$(EPICS_HOST_ARCH)
 $(1)$$(DIVIDER)$(2): $(1)$$(DIVIDER)$$(EPICS_HOST_ARCH) O.$(2)
 endef
-
-$(foreach action, $(ACTIONS), $(foreach arch,\
-      $(CROSS_ARCHS),$(eval $(call DEP_template,$(action),$(arch)))))
-
-#endif
-#*************************************************************************
+$(foreach action, $(ACTIONS), \
+    $(foreach arch, $(CROSS_ARCHS), \
+        $(eval $(call DEP_template,$(action),$(arch)))))
 
 # Allows rebuild to work with parallel builds option, -j.
 ifeq (rebuild,$(filter rebuild,$(MAKECMDGOALS)))
@@ -59,8 +58,11 @@ $(buildDirs) O.Common : clean
 rebuild: install
 endif
 
+archPart = $(word 2, $(subst $(DIVIDER), ,$@))
+actionPart = $(word 1, $(subst $(DIVIDER), ,$@))
 $(actionArchTargets) : $(buildDirs) O.Common
-	$(MAKE) -C O.$(archPart) -f ../Makefile TOP=$(TOP)/.. T_A=$(archPart) $(actionPart)
+	$(MAKE) -C O.$(archPart) -f ../Makefile TOP=$(TOP)/.. \
+	    T_A=$(archPart) $(actionPart)
 
 $(BUILD_ARCHS) : % : O.% O.Common
 	$(MAKE) -C O.$@ -f ../Makefile TOP=$(TOP)/.. T_A=$@
@@ -73,8 +75,7 @@ $(buildDirs):
 O.Common:
 	$(MKDIR) O.Common
 
-#
-# special clean rule
+# Clean rules
 #
 clean ::
 	$(RMDIR) $(addprefix O.,$(BUILD_ARCHS)) O.Common
@@ -92,3 +93,7 @@ realclean ::
 .PHONY : $(cleanArchTargets)
 .PHONY : $(BUILD_ARCHS) rebuild
 .PHONY : $(ACTIONS) clean realclean archclean all
+
+#  User specific rules
+#
+-include $(HOME)/configure/RULES_USER

configure/RULES_BUILD

@@ -22,6 +22,7 @@ vpath %.cpp $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.C $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.rc $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.h $(USR_VPATH) $(ALL_SRC_DIRS)
+vpath %.H $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.skel.static $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.y $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.l $(USR_VPATH) $(ALL_SRC_DIRS)
@@ -95,6 +96,8 @@ ifneq (,$(strip $(TESTS)))
 TARGETS += testspec
 endif
 
+TAPFILES += $(TESTSCRIPTS:.t=.tap)
+
 #---------------------------------------------------------------
 #   Libraries 
 #
@@ -141,7 +144,8 @@ clean::
 	@$(RM) *.i *$(OBJ) *.a $(TESTPRODNAME) $(LIBNAME) $(SHRLIBNAME) \
 	$(INC) $(TARGETS) $(DLL_LINK_LIBNAME) $(TDS) \
 	*.out MakefileInclude  $(LOADABLE_SHRLIBNAME) *.manifest *.exp \
-	$(COMMON_INC) $(HDEPENDS_FILES) $(PRODTARGETS) $(TESTSCRIPTS)
+	$(COMMON_INC) $(HDEPENDS_FILES) $(PRODTARGETS) \
+	$(TESTSCRIPTS) $(TAPFILES)
 ifdef RES
 	@$(RM) *$(RES)
 endif
@@ -167,6 +171,10 @@ checkRelease:
 	$(CONVERTRELEASE) checkRelease
 warnRelease:
 	-$(CONVERTRELEASE) checkRelease
+noCheckRelease:
+ifeq ($(EPICS_HOST_ARCH),$(T_A))
+	@echo "Warning: RELEASE file consistency checks have been disabled"
+endif
 
 #---------------------------------------------------------------
 #  The order of the following rules is
@@ -190,22 +198,23 @@ $(OBJLIBNAME):%$(OBJ):
 	@$(RM) $@
 	$(COMPILE.ctdt) $<
 
-%$(OBJ): %.c
+# Cancel GNUMake's built-in rules, which don't have our _INC
+# dependencies so could get used in some circumstances (gdd)
+%.o : %.c
+%.o : %.cc
+%.o : %.cpp
+
+%$(OBJ): %.c $(COMMON_INC) $(INSTALL_INC)
 	@$(HDEPENDS_CMD)
 	@$(RM) $@
 	$(COMPILE.c) $(call PATH_FILTER,$<) $(COMPILE_FILTER.c)
 
-%$(OBJ): %.cc
+%$(OBJ): %.cc $(COMMON_INC) $(INSTALL_INC)
 	@$(HDEPENDS_CMD)
 	@$(RM) $@
 	$(COMPILE.cpp) $(call PATH_FILTER,$<) $(COMPILE_FILTER.cpp)
 
-%$(OBJ): %.cpp
-	@$(HDEPENDS_CMD)
-	@$(RM) $@
-	$(COMPILE.cpp) $(call PATH_FILTER,$<) $(COMPILE_FILTER.cpp)
-
-%$(OBJ): %.C
+%$(OBJ): %.cpp $(COMMON_INC) $(INSTALL_INC)
 	@$(HDEPENDS_CMD)
 	@$(RM) $@
 	$(COMPILE.cpp) $(call PATH_FILTER,$<) $(COMPILE_FILTER.cpp)
@@ -322,26 +331,38 @@ $(OBJLIB_MUNCHNAME):%.munch : %_ctdt$(OBJ) %$(OBJ)
 	@$(RM) $@
 	$(MUNCH_CMD)
 
-runtests: $(TESTSCRIPTS_$(BUILD_CLASS))
+# GeSys modules for RTEMS
+$(MODNAME): %$(MODEXT): %$(EXE)
+	@echo "Building module $@"
+	@$(RM) $@
+	$(LINK.mod)
+
+runtests: $(TESTSCRIPTS)
 	-$(PERL) -MTest::Harness -e 'runtests @ARGV if @ARGV;' $^
 
-testspec: $(TESTSCRIPTS_$(BUILD_CLASS))
+testspec: $(TESTSCRIPTS)
 	@$(RM) $@
 	@echo OS-class: $(OS_CLASS) > $@
 	@echo Target-arch: $(T_A) >> $@
 	$(if $^, @echo Tests: $^ >> $@)
 	$(if $(TESTSPEC_$(OS_CLASS)), @echo "Harness: $(TESTSPEC_$(OS_CLASS))" >> $@)
 
+tapfiles: $(TESTSCRIPTS) $(TAPFILES)
+
+# A .tap file is the output from running the associated test script
+%.tap: %.t
+	-$(PERL) $< -tap > $@
+
 # If there's a perl test script (.plt) available, use it
 %.t: ../%.plt
 	@$(RM) $@
-	@$(CP) $< $@
+	$(CP) $< $@
 
-# Some versions of Test::Harness expect test programs in perl only.
+# Test programs (.t files) must be written in Perl.
 # Generate a perl program to exec the real test binary.
-%.t: %$(EXE)
+%.t: %$(EXE) $(TOOLS)/makeTestfile.pl
 	@$(RM) $@
-	@$(PERL) $(TOOLS)/makeTestfile.pl $@ $<
+	$(PERL) $(TOOLS)/makeTestfile.pl $@ $<
 
 #---------------------------------------------------------------
 ## Install rules for BIN_INSTALLS and LIB_INSTALLS
@@ -383,11 +404,11 @@ $(INSTALL_LIB)/%.lib: %.lib
 
 $(INSTALL_SHRLIBS): $(INSTALL_SHRLIB)/%: %
 	$(ECHO) "Installing shared library $@"
-	@$(INSTALL_LIBRARY) -d -m $(LIB_PERMISSIONS) $< $(INSTALL_SHRLIB)
-ifneq ($(SHRLIB_SUFFIX),.dll)
+	@$(INSTALL_LIBRARY) -d -m $(SHRLIB_PERMISSIONS) $< $(INSTALL_SHRLIB)
+ifneq ($(SHRLIB_SUFFIX),$(SHRLIB_SUFFIX_BASE))
 ifneq (,$(strip $(SHRLIB_VERSION)))
-	@$(RM) $(subst .$(SHRLIB_VERSION),,$@)
-	ln -s $< $(subst .$(SHRLIB_VERSION),,$@)
+	@$(RM) $(subst $(SHRLIB_SUFFIX),$(SHRLIB_SUFFIX_BASE),$@)
+	ln -s $< $(subst $(SHRLIB_SUFFIX),$(SHRLIB_SUFFIX_BASE),$@)
 endif # SHRLIB_VERSION
 endif # SHRLIB_SUFFIX
 
@@ -408,10 +429,12 @@ $(INSTALL_TCLLIB)/$(TCLINDEX): $(INSTALL_TCLLIBS)
 $(INSTALL_LOADABLE_SHRLIBS): $(INSTALL_SHRLIB)/%: %
 	$(ECHO) "Installing loadable shared library $@"
 	@$(INSTALL_LIBRARY) -d -m 555 $< $(INSTALL_SHRLIB)
+ifneq ($(LOADABLE_SHRLIB_SUFFIX),$(SHRLIB_SUFFIX_BASE))
 ifneq (,$(strip $(LOADABLE_SHRLIB_VERSION)))
-	@$(RM) $(subst .$(LOADABLE_SHRLIB_VERSION),,$@)
-	ln -s $< $(subst .$(LOADABLE_SHRLIB_VERSION),,$@)
+	@$(RM) $(subst $(LOADABLE_SHRLIB_SUFFIX),$(SHRLIB_SUFFIX_BASE),$@)
+	ln -s $< $(subst $(LOADABLE_SHRLIB_SUFFIX),$(SHRLIB_SUFFIX_BASE),$@)
 endif # LOADABLE_SHRLIB_VERSION
+endif # LOADABLE_SHRLIB_SUFFIX
 
 $(INSTALL_CONFIG)/%: %
 	$(ECHO) "Installing config file $@"
@@ -463,7 +486,7 @@ $(INSTALL_TEMPLATES_SUBDIR)/%: %
 .PRECIOUS: $(COMMON_INC)
 
 .PHONY: all inc build install clean rebuild buildInstall
-.PHONY: runtests checkRelease warnRelease
+.PHONY: runtests checkRelease warnRelease noCheckRelease
 
 endif # BASE_RULES_BUILD
 #	EOF RULES_BUILD

configure/RULES_DIRS

@@ -12,28 +12,33 @@
 
 
 ARCHS += $(BUILD_ARCHS)
-ACTIONS += inc build install buildInstall clean realclean archclean runtests
-
-dirPart = $(join $(dir $@), $(word 1, $(subst $(DIVIDER), ,$(notdir $@))))
-
-actionArchPart = $(join $(word 2, $(subst $(DIVIDER), ,$(notdir $@))), \
- $(addprefix $(DIVIDER),$(word 3, $(subst $(DIVIDER), ,$(notdir $@))))) 
+ACTIONS += inc build install buildInstall clean realclean archclean
+ACTIONS += runtests tapfiles
 
 dirActionArchTargets = $(foreach dir, $(DIRS), \
-                       $(foreach action, $(ACTIONS),\
-                       $(foreach arch, $(ARCHS), \
-                       $(dir)$(DIVIDER)$(action)$(DIVIDER)$(arch))))
+    $(foreach action, $(ACTIONS), \
+        $(foreach arch, $(ARCHS), \
+            $(dir)$(DIVIDER)$(action)$(DIVIDER)$(arch))))
 dirArchTargets += $(foreach dir, $(DIRS), \
-                  $(foreach arch, $(ARCHS),\
-                  $(dir)$(DIVIDER)$(arch)))
+    $(foreach arch, $(ARCHS), \
+        $(dir)$(DIVIDER)$(arch)))
 dirActionTargets += $(foreach dir, $(DIRS), \
-                    $(foreach action, $(ACTIONS),\
-                    $(dir)$(DIVIDER)$(action)))
-actionArchTargets = $(foreach action, $(ACTIONS),\
-                    $(foreach arch, $(ARCHS), \
-                    $(action)$(DIVIDER)$(arch)))
+    $(foreach action, $(ACTIONS), \
+        $(dir)$(DIVIDER)$(action)))
+actionArchTargets = $(foreach action, $(ACTIONS), \
+    $(foreach arch, $(ARCHS), \
+        $(action)$(DIVIDER)$(arch)))
 
-all : install
+all: install
+
+# Include <top>/cfg/DIR_RULES* files from tops defined in RELEASE* files
+# Do this here so they can add ACTIONS
+#
+RELEASE_CFG_DIR_RULES = $(foreach top, $(RELEASE_TOPS), \
+    $(wildcard $($(top))/cfg/DIR_RULES*))
+ifneq ($(RELEASE_CFG_DIR_RULES),)
+  include $(RELEASE_CFG_DIR_RULES)
+endif
 
 # Allows rebuild to work with parallel builds option, -j.
 ifeq (rebuild,$(filter rebuild,$(MAKECMDGOALS)))
@@ -47,30 +52,42 @@ endif
 define DEP_template1
 $(1): $$($(1)_DEPEND_DIRS)
 endef
-$(foreach dir, $(DIRS),$(eval $(call DEP_template1,$(dir))))
+$(foreach dir, $(DIRS), \
+    $(eval $(call DEP_template1,$(dir))))
 
 define DEP_template2
-$(1)$$(DIVIDER)$(2) : $$(foreach ddir, $$($(1)_DEPEND_DIRS),$$(addsuffix $$(DIVIDER)$(2),$$(ddir)))
+$(1)$$(DIVIDER)$(2) : $$(foreach ddir, $$($(1)_DEPEND_DIRS), \
+    $$(addsuffix $$(DIVIDER)$(2),$$(ddir)))
 endef
-$(foreach action, $(ACTIONS), $(foreach dir, $(DIRS),$(eval $(call DEP_template2,$(dir),$(action)))))
+$(foreach action, $(ACTIONS), \
+    $(foreach dir, $(DIRS), \
+        $(eval $(call DEP_template2,$(dir),$(action)))))
 
 define DEP_template3
-$(1)$$(DIVIDER)$(2) : $$(foreach ddir, $$($(1)_DEPEND_DIRS),$$(addsuffix $$(DIVIDER)$(2),$$(ddir)))
+$(1)$$(DIVIDER)$(2) : $$(foreach ddir, $$($(1)_DEPEND_DIRS), \
+    $$(addsuffix $$(DIVIDER)$(2),$$(ddir)))
 endef
-$(foreach arch, $(ARCHS), $(foreach dir, $(DIRS),$(eval $(call DEP_template3,$(dir),$(arch)))))
+$(foreach arch, $(ARCHS), \
+    $(foreach dir, $(DIRS), \
+        $(eval $(call DEP_template3,$(dir),$(arch)))))
 
 define DEP_template4
-$(1)$$(DIVIDER)$(2)$$(DIVIDER)$(3) : $$(foreach ddir, $$($(1)_DEPEND_DIRS),$$(addsuffix $$(DIVIDER)$(2)$$(DIVIDER)$(3),$$(ddir)))
+$(1)$$(DIVIDER)$(2)$$(DIVIDER)$(3) : $$(foreach ddir, $$($(1)_DEPEND_DIRS), \
+    $$(addsuffix $$(DIVIDER)$(2)$$(DIVIDER)$(3),$$(ddir)))
 endef
-$(foreach arch, $(ARCHS), $(foreach action, $(ACTIONS), $(foreach dir, $(DIRS), \
-              $(eval $(call DEP_template4,$(dir),$(action),$(arch))))))
-
+$(foreach arch, $(ARCHS), \
+    $(foreach action, $(ACTIONS), \
+        $(foreach dir, $(DIRS), \
+            $(eval $(call DEP_template4,$(dir),$(action),$(arch))))))
 
+dirPart = $(join $(dir $@), $(word 1, $(subst $(DIVIDER), ,$(notdir $@))))
+actionArchPart = $(join $(word 2, $(subst $(DIVIDER), ,$(notdir $@))), \
+   $(addprefix $(DIVIDER),$(word 3, $(subst $(DIVIDER), ,$(notdir $@))))) 
 $(DIRS) $(dirActionTargets) $(dirArchTargets) $(dirActionArchTargets) :
 	$(MAKE) -C $(dirPart) $(actionArchPart)
 
 $(ARCHS) $(ACTIONS) $(actionArchTargets) :%: \
-	$(foreach dir, $(DIRS), $(dir)$(DIVIDER)%)
+    $(foreach dir, $(DIRS), $(dir)$(DIVIDER)%)
 
 .PHONY : $(DIRS) all rebuild
 .PHONY : $(ARCHS) $(ACTIONS)
@@ -78,3 +95,7 @@ $(ARCHS) $(ACTIONS) $(actionArchTargets) :%: \
 .PHONY : $(dirActionArchTargets)
 .PHONY : $(actionArchTargets)
 
+
+#  User specific rules
+#
+-include $(HOME)/configure/RULES_USER

configure/RULES_FILE_TYPE

@@ -1,32 +1,32 @@
 #*************************************************************************
-# Copyright (c) 2006 UChicago Argonne LLC, as Operator of Argonne
+# Copyright (c) 2013 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 the file LICENSE that is included with this distribution. 
+# in the file LICENSE that is included with this distribution.
 #*************************************************************************
+#
 # $Revision-Id$
 #
 
-#---------------------------------------------------------------
-# Include <top>/configure/RULES_BUILD definitions from tops defined in RELEASE* files
+# Include <top>/configure/RULES_BUILD from tops defined in RELEASE* files
 #
-RELEASE_RULES_BUILDS = $(foreach top, $(RELEASE_TOPS), $(wildcard $($(top))/configure/RULES_BUILD))
+RELEASE_RULES_BUILDS = $(foreach top, $(RELEASE_TOPS), \
+    $(wildcard $($(top))/configure/RULES_BUILD))
 ifneq ($(RELEASE_RULES_BUILDS),)
   include $(RELEASE_RULES_BUILDS)
 endif
 
-#---------------------------------------------------------------
-# Include <top>/cfg/RULES* definitions from tops defined in RELEASE* files
+# Include <top>/cfg/RULES* files from tops defined in RELEASE* files
 #
-RELEASE_CFG_RULES = $(foreach top, $(RELEASE_TOPS), $(wildcard $($(top))/cfg/RULES*))
+RELEASE_CFG_RULES = $(foreach top, $(RELEASE_TOPS), \
+    $(wildcard $($(top))/cfg/RULES*))
 ifneq ($(RELEASE_CFG_RULES),)
   include $(RELEASE_CFG_RULES)
 endif
 
-#---------------------------------------------------------------
-# If this is not BASE then include TOP/configure/RULES_BUILD definitions
+# If this is not BASE then include <TOP>/configure/RULES_BUILD
 #
 ifeq ($(wildcard $(TOP)/configure/CONFIG_BASE_VERSION),)
 TOP_RULES_BUILDS = $(wildcard $(TOP)/configure/RULES_BUILD)
@@ -35,39 +35,38 @@ ifneq ($(TOP_RULES_BUILDS),)
 endif
 endif
 
-#---------------------------------------------
-# Include existing and new $(INSTALL_CFG)/* definitions
+# Include our own $(INSTALL_CFG)/RULES* files
 #
-TOP_CFG_FILES = $(sort $(wildcard $(INSTALL_CFG)/RULES*) \
-                       $(wildcard $(INSTALL_CFG)/CONFIG*) \
-                       $(addprefix $(INSTALL_CFG)/,$(CFG)))
-ifneq ($(TOP_CFG_FILES),)
-  include $(TOP_CFG_FILES)
+TOP_CFG_RULES = $(wildcard $(INSTALL_CFG)/RULES*)
+ifneq ($(TOP_CFG_RULES),)
+  include $(TOP_CFG_RULES)
 endif
 
-#---------------------------------------------------------------
-
+# Rules to install each FILE_TYPE
+#
 define FILE_TYPE_template
-
-$(1) += $$(if $$(strip $$($(1)_$$(OS_CLASS))),$$(subst -nil-,,$$($(1)_$$(OS_CLASS))), $$($(1)_DEFAULT))
-
+$(1) += $$(if $$(strip $$($(1)_$(OS_CLASS))), \
+    $$(subst -nil-,,$$($(1)_$(OS_CLASS))), \
+    $$($(1)_DEFAULT))
 INSTALLS_$(1) = $$($(1):%=$$(INSTALL_$(1))/%)
 
 $$(INSTALL_$(1))/%: ../%
 	$(ECHO) "Installing $(1) file $$@"
 	@$$(INSTALL) -d -m  $$(INSTALL_PERMISSIONS) $$< $$(dir $$@)
-
 $$(INSTALL_$(1))/%: %
 	$(ECHO) "Installing $(1) file $$@"
 	@$$(INSTALL) -d -m  $$(INSTALL_PERMISSIONS) $$< $$(dir $$@)
 
-buildInstall : $$(INSTALLS_$(1))
-
+buildInstall: $$(INSTALLS_$(1))
 endef
+$(foreach type, $(FILE_TYPE), \
+    $(eval $(call FILE_TYPE_template,$(strip $(type)))))
 
-$(foreach type, $(FILE_TYPE),$(eval $(call FILE_TYPE_template,$(strip $(type)))))
-#---------------------------------------------
-
+# Cleaning FILE_TYPE files
+#
 clean::
 	@$(RM) $(foreach type, $(FILE_TYPE), $($(type)))
 
+#  User specific rules
+#
+-include $(HOME)/configure/RULES_USER

configure/RULES_TOP

@@ -1,85 +1,89 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2011 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 Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in the file LICENSE that is included with this distribution.
 #*************************************************************************
 #
-#  $Revision-Id$
+# $Revision-Id$
 #
 
 include $(CONFIG)/RULES_DIRS
 
-UNINSTALL_DIRS += $(INSTALL_DBD) $(INSTALL_INCLUDE) $(INSTALL_DOC)\
-        $(INSTALL_HTML) $(INSTALL_JAVA) $(INSTALL_TEMPLATES) \
-        $(INSTALL_DB)
+distclean: realclean cvsclean realuninstall
+
+CVSCLEAN = $(call FIND_TOOL,cvsclean.pl)
+cvsclean:
+	$(PERL) $(CVSCLEAN)
+
+realuninstall: uninstallDirs
+	$(RMDIR) $(INSTALL_LOCATION_BIN)
+	$(RMDIR) $(INSTALL_LOCATION_LIB)
+
+UNINSTALL_DIRS += $(INSTALL_DBD) $(INSTALL_INCLUDE) $(INSTALL_DOC) \
+    $(INSTALL_HTML) $(INSTALL_JAVA) $(INSTALL_TEMPLATES) $(INSTALL_DB)
 UNINSTALL_DIRS += $(DIRECTORY_TARGETS)
+uninstallDirs:
+	$(RMDIR) $(UNINSTALL_DIRS)
+
+uninstall: archuninstall uninstallDirs
+
+archuninstall: $(addprefix uninstall$(DIVIDER),$(BUILD_ARCHS)) | cleandirs
 
-uninstallArchTargets = $(foreach arch,$(BUILD_ARCHS), uninstall$(DIVIDER)$(arch))
 archPart = $(word 2, $(subst $(DIVIDER), ,$@))
-
-$(uninstallArchTargets): uninstallDirs
-	@$(RMDIR) $(INSTALL_LOCATION_BIN)/$(archPart) $(INSTALL_LOCATION_LIB)/$(archPart) 
+uninstall$(DIVIDER)%:
+	$(RMDIR) $(INSTALL_LOCATION_BIN)/$(archPart)
+	$(RMDIR) $(INSTALL_LOCATION_LIB)/$(archPart)
 
 cleandirs:
+	@$(NOP)
 ifeq ($(wildcard $(INSTALL_LOCATION_BIN)/*),)
-	@$(RMDIR) $(INSTALL_LOCATION_BIN)
+	$(RMDIR) $(INSTALL_LOCATION_BIN)
 endif
 ifeq ($(wildcard $(INSTALL_LOCATION_LIB)/*),)
-	@$(RMDIR) $(INSTALL_LOCATION_LIB)
+	$(RMDIR) $(INSTALL_LOCATION_LIB)
 endif
-	@echo
-# The echo above stops a "nothing to be done for cleandirs" message
 
-distclean: realclean realuninstall
-
-CVSCLEAN=$(firstword $(wildcard $(TOOLS)/cvsclean.pl $(TOP)/src/tools/cvsclean.pl))
-
-cvsclean:
-	@$(PERL) $(CVSCLEAN) 
-
-realuninstall:
-	@$(RMDIR) $(INSTALL_LOCATION_BIN) $(INSTALL_LOCATION_LIB)
-	@$(RMDIR) $(UNINSTALL_DIRS)
-
-uninstall: $(addprefix uninstall$(DIVIDER),$(BUILD_ARCHS))
-	@$(MAKE) -f Makefile  cleandirs
-
-uninstallDirs:
-	@$(RMDIR) $(UNINSTALL_DIRS)
 
 help:
 	@echo "Usage: gnumake [options] [target] ..."
 	@echo "Targets supported by all Makefiles:"
-	@echo "     install        - Builds and installs all targets (default rule)"
-	@echo "     all            - Same as install"
-	@echo "     buildInstall   - Same as install"
+	@echo "     all            - Same as install (default rule)"
+	@echo "     inc            - Installs header files"
+	@echo "     build          - Builds and installs all targets"
+	@echo "     install        - Builds and installs all targets"
+	@echo "     buildInstall   - Same as install (deprecated)"
 	@echo "     clean          - Removes the O.<arch> dirs created by running make"
 	@echo "                      In O.<arch> dir, clean removes build created files"
 	@echo "     realclean      - Removes ALL O.<arch> dirs"
 	@echo "                      Cannot be used within an O.<arch> dir"
 	@echo "     rebuild        - Same as clean install"
-	@echo "     inc            - Installs header files"
-	@echo "     build          - Builds all targets"
 	@echo "     archclean      - Removes O.<arch> dirs but not O.Common dir"
 	@echo "\"Partial\" build targets supported by Makefiles:"
-	@echo "     inc.<arch>     - Installs <arch> only header files."
-	@echo "     install.<arch> - Builds and installs <arch> only."
-	@echo "     clean.<arch>   - Cleans <arch> binaries in O.<arch> dirs only."
-	@echo "     build.<arch>   - Builds <arch> only."
+	@echo "     inc$(DIVIDER)<arch>     - Installs <arch> only header files."
+	@echo "     build$(DIVIDER)<arch>   - Builds and installs <arch> only."
+	@echo "     install$(DIVIDER)<arch> - Builds and installs <arch> only."
+	@echo "     clean$(DIVIDER)<arch>   - Cleans <arch> binaries in O.<arch> dirs only."
+	@echo "     uninstall$(DIVIDER)<arch> - Remove bin & lib directories for <arch> only."
 	@echo "Targets supported by top level Makefile:"
-	@echo "     uninstall      - Cleans directories created by the install."
+	@echo "     archuninstall  - Remove bin & lib directories created by this hostarch."
+	@echo "     uninstall      - Remove install directories created by this hostarch."
 	@echo "     realuninstall  - Removes ALL install dirs"
-	@echo "     distclean      - Same as realclean realuninstall."
+	@echo "     distclean      - Same as realclean cvsclean realuninstall."
 	@echo "     cvsclean       - Removes cvs .#* files in all dirs of directory tree"
 	@echo "     help           - Prints this list of valid make targets "
 	@echo "Indiv. object targets are supported by O.<arch> level Makefile .e.g"
 	@echo "     xxxRecord.o"
 
-.PHONY : $(uninstallArchTargets)
-.PHONY : uninstall help cleandirs distclean uninstallDirs realuninstall
-.PHONY : cvsclean
+.PHONY: cleandirs distclean cvsclean realuninstall archuninstall uninstallDirs
+.PHONY: uninstall help
 
+# Include <top>/cfg/TOP_RULES* files from tops defined in RELEASE* files
+#
+RELEASE_CFG_TOP_RULES = $(foreach top, $(RELEASE_TOPS), \
+    $(wildcard $($(top))/cfg/TOP_RULES*))
+ifneq ($(RELEASE_CFG_TOP_RULES),)
+  include $(RELEASE_CFG_TOP_RULES)
+endif

configure/os/CONFIG.Common.RTEMS

@@ -49,28 +49,31 @@ RANLIB := $(RTEMS_TOOLS)/bin/$(RANLIB)
 VALID_BUILDS = Ioc
 
 #--------------------------------------------------
-# The RTEMS Makefiles redefine several macros, so we have to go
-# through the following contortions to get the EPICS flags back.
-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)\
- $(HDEPENDS_CFLAGS)
+# The RTEMS Makefiles redefine several macros, so we have to
+# reset them to the proper EPICS values, from CONFIG_COMMON
+CFLAGS = $($(BUILD_CLASS)_CFLAGS) $(POSIX_CFLAGS) $(OPT_CFLAGS)\
+ $(DEBUG_CFLAGS) $(PIPE_CFLAGS) $(WARN_CFLAGS) $(TARGET_CFLAGS)\
+ $(USR_CFLAGS) $(CMD_CFLAGS) $(ARCH_DEP_CFLAGS) $(CODE_CFLAGS)\
+ $(STATIC_CFLAGS) $(OP_SYS_CFLAGS) $(LIBRARY_SRC_CFLAGS) $(HDEPENDS_CFLAGS)
 
-CXXFLAGS = $(CROSS_CXXFLAGS) $(OPT_CXXFLAGS)\
- $(DEBUG_CXXFLAGS) $(WARN_CXXFLAGS) $(TARGET_CXXFLAGS) $(USR_CXXFLAGS)\
- $(ARCH_DEP_CXXFLAGS) $(CODE_CXXFLAGS) $(STATIC_CXXCFLAGS) $(OP_SYS_CXXFLAGS)\
- $(LIBRARY_SRC_CFLAGS) $(HDEPENDS_CFLAGS)
+CXXFLAGS = $($(BUILD_CLASS)_CXXFLAGS) $(POSIX_CXXFLAGS) $(OPT_CXXFLAGS)\
+ $(DEBUG_CXXFLAGS) $(PIPE_CFLAGS) $(WARN_CXXFLAGS) $(TARGET_CXXFLAGS)\
+ $(USR_CXXFLAGS) $(CMD_CXXFLAGS) $(ARCH_DEP_CXXFLAGS) $(CODE_CXXFLAGS)\
+ $(STATIC_CXXCFLAGS) $(OP_SYS_CXXFLAGS) $(LIBRARY_SRC_CFLAGS) $(HDEPENDS_CFLAGS)
 
-LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) \
- $(ARCH_DEP_LDFLAGS) $(DEBUG_LDFLAGS) $(OP_SYS_LDFLAGS) $(CROSS_LDFLAGS)\
- $(RUNTIME_LDFLAGS) $(CODE_LDFLAGS)
+LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(CMD_LDFLAGS)\
+ $(POSIX_LDFLAGS) $(ARCH_DEP_LDFLAGS) $(DEBUG_LDFLAGS) $(OP_SYS_LDFLAGS)\
+ $($(BUILD_CLASS)_LDFLAGS) $(RUNTIME_LDFLAGS) $(CODE_LDFLAGS)
 
-LDLIBS = \
- $(POSIX_LDLIBS) $(ARCH_DEP_LDLIBS) $(DEBUG_LDLIBS) $(OP_SYS_LDLIBS)
+LDLIBS = $(POSIX_LDLIBS) $(ARCH_DEP_LDLIBS) $(DEBUG_LDLIBS) $(OP_SYS_LDLIBS)\
+ $(GNU_LDLIBS_$(GNU))
 
-CPPFLAGS += $(CROSS_CPPFLAGS) $(POSIX_CPPFLAGS)\
-$(BASE_CPPFLAGS) $(TARGET_CPPFLAGS) $(USR_CPPFLAGS) $(ARCH_DEP_CPPFLAGS)\
- $(OP_SYS_CPPFLAGS) $(OP_SYS_INCLUDE_CPPFLAGS) $(CODE_CPPFLAGS)
+CPPFLAGS += $($(BUILD_CLASS)_CPPFLAGS) $(POSIX_CPPFLAGS) $(OPT_CPPFLAGS)\
+ $(DEBUG_CPPFLAGS) $(WARN_CPPFLAGS) $(BASE_CPPFLAGS) $(TARGET_CPPFLAGS)\
+ $(USR_CPPFLAGS) $(CMD_CPPFLAGS) $(ARCH_DEP_CPPFLAGS) $(OP_SYS_CPPFLAGS)\
+ $(OP_SYS_INCLUDE_CPPFLAGS) $(CODE_CPPFLAGS)
+
+ECHO = @$(if $(findstring s,$(patsubst T_A=%,,$(MAKEFLAGS))),$(NOP),echo)
 
 #--------------------------------------------------
 # Although RTEMS uses gcc, it wants to use gcc its own way
@@ -82,6 +85,8 @@ OPT_CXXFLAGS_YES = $(CFLAGS_OPTIMIZE_V)
 OPT_CFLAGS_NO    = $(CFLAGS_DEBUG_V)
 OPT_CXXFLAGS_NO  = $(CFLAGS_DEBUG_V)
 
+MODEXT=.obj
+
 #--------------------------------------------------
 # operating system class (include/os/<os_class>)
 OS_CLASS = RTEMS
@@ -96,6 +101,42 @@ OP_SYS_LDFLAGS += $(CPU_CFLAGS) -u Init \
                  $(PROJECT_RELEASE)/lib/no-signal.rel \
                  $(PROJECT_RELEASE)/lib/no-rtmon.rel
 
+MOD_SYS_LDFLAGS += $(CPU_CFLAGS) -Wl,-r -nostdlib
+
+# Do not link against libraries which are part of the Generic Image
+GESYS_LIBS += -lgcc
+GESYS_LIBS += -lc -lm -lrtemscpu -lrtemsbsp -lrtems++ -lbspExt
+GESYS_LIBS += -lcexp -ltecla_r -lspencer_regexp -lpmelf -lpmbfd
+GESYS_LIBS += -lnfs -ltelnetd -lrtems-gdb-stub
+
+# While not part of the Generic Image it provides symbols which
+# would conflict.
+GESYS_LIBS += -lrtemsCom
+
+#--------------------------------------------------
+# Options for building GeSys loadable objects
+
+MODNAME_YES = $(PRODNAME:%$(EXE)=%$(MODEXT))
+MODNAME += $(MODNAME_$(USE_GESYS))
+PRODTARGETS += $(MODNAME)
+BIN_INSTALLS += $(MODNAME)
+
+# changes to LDFLAGS in CONFIG_COMMON and LINK.cpp in CONFIG.Common.UnixCommon
+# should be reflected here with the following exceptions
+#
+# replace OP_SYS_LDFLAGS with MOD_SYS_LDFLAGS
+# replace PROD_LDLIBS with MOD_LDLIBS
+# remove STATIC_LDFLAGS
+
+MOD_LDLIBS = $(filter-out $(GESYS_LIBS),$(PROD_LDLIBS))
+
+MOD_LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(POSIX_LDFLAGS) \
+ $(ARCH_DEP_LDFLAGS) $(DEBUG_LDFLAGS) $(MOD_SYS_LDFLAGS) $($(BUILD_CLASS)_LDFLAGS)\
+ $(RUNTIME_LDFLAGS) $(CODE_LDFLAGS)
+
+LINK.mod = $(CCC) -o $@ $(PRODDIR_LDFLAGS) $(MOD_LDFLAGS)
+LINK.mod += $(PROD_LDFLAGS) $(PROD_LD_OBJS) $(PROD_LD_RESS) $(MOD_LDLIBS)
+
 #--------------------------------------------------
 # RTEMS has neither shared libraries nor dynamic loading
 STATIC_BUILD=YES

configure/os/CONFIG.Common.RTEMS-beatnik

@@ -1,17 +1,19 @@
 #
 # CONFIG.Common.RTEMS-beatnik
-# A migration from Eric Norum's CONFIG.Common.RTEMS-mvme5500
-# Author: Dayle Kotturi
-#         SLAC
-#         dayle@slac.stanford.edu
+# $Revision-Id$
+# Author: Dayle Kotturi <dayle@slac.stanford.edu>
 #
 # All RTEMS targets use the same Makefile fragment
 #
-override EXE=.elf
+EXE = .elf
 RTEMS_TARGET_CPU = powerpc
-GNU_TARGET=powerpc-rtems
+GNU_TARGET = powerpc-rtems
 ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
 ARCH_DEP_CFLAGS += -DHAVE_MOTLOAD
+ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_CONFIG_MBUF_SPACE=2048
+ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_CONFIG_CLUSTER_SPACE=5120
+
+OP_SYS_LDLIBS += -lbspExt
 
 MUNCH_SUFFIX = .boot
 MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
@@ -19,16 +21,13 @@ define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary $< $@
 endef
 
-CROSS_COMPILER_TARGET_ARCHS=RTEMS-beatnik
-
 include $(CONFIG)/os/CONFIG.Common.RTEMS
+
 RTEMSSYMS=$(PRODNAME:%$(EXE)=%.sym)
 RTEMSIMGS=$(PRODNAME:%$(EXE)=%.bin)
 INSTALL_RTEMSSYMS=$(RTEMSSYMS:%=$(INSTALL_BIN)/%)
 INSTALL_RTEMSIMGS=$(RTEMSIMGS:%=$(INSTALL_BIN)/%)
 
-OP_SYS_LDLIBS += -lbspExt
-
 %.sym: %$(EXE)
 	$(XSYMS) $^ $@
 

configure/os/CONFIG.Common.RTEMS-mvme2100

@@ -1,15 +1,18 @@
 #
+# CONFIG.Common.RTEMS-mvme2100
 # $Revision-Id$
-# Author: W. Eric Norum
-#         Canadian Light Source
-#         eric@cls.usask.ca
+# Author: W. Eric Norum <wenorum@lbl.gov>
 #
 # All RTEMS targets use the same Makefile fragment
 #
+EXE = .elf
 RTEMS_TARGET_CPU = powerpc
+GNU_TARGET = powerpc-rtems
 ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
 ARCH_DEP_CFLAGS += -DHAVE_PPCBUG
 
+OP_SYS_LDLIBS += -lbspExt
+
 MUNCH_SUFFIX = .boot
 MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
@@ -24,6 +27,4 @@ define MUNCH_CMD
 	rm -f rtems.gz
 endef
 
-OP_SYS_LDLIBS += -lbspExt
-
 include $(CONFIG)/os/CONFIG.Common.RTEMS

configure/os/CONFIG.Common.RTEMS-mvme3100

@@ -1,11 +1,19 @@
 #
+# CONFIG.Common.RTEMS-mvme3100
+# $Revision-Id$
+# Author: W. Eric Norum <wenorum@lbl.gov>
+#
 # All RTEMS targets use the same Makefile fragment
 #
-override EXE=.elf
+EXE = .elf
 RTEMS_TARGET_CPU = powerpc
-GNU_TARGET=powerpc-rtems
+GNU_TARGET = powerpc-rtems
 ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
 ARCH_DEP_CFLAGS += -DHAVE_MOTLOAD
+ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_CONFIG_MBUF_SPACE=2048
+ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_CONFIG_CLUSTER_SPACE=5120
+
+OP_SYS_LDLIBS += -lbspExt
 
 MUNCH_SUFFIX = .boot
 MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
@@ -13,16 +21,13 @@ define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary $< $@
 endef
 
-CROSS_COMPILER_TARGET_ARCHS=RTEMS-beatnik
-
 include $(CONFIG)/os/CONFIG.Common.RTEMS
+
 RTEMSSYMS=$(PRODNAME:%$(EXE)=%.sym)
 RTEMSIMGS=$(PRODNAME:%$(EXE)=%.bin)
 INSTALL_RTEMSSYMS=$(RTEMSSYMS:%=$(INSTALL_BIN)/%)
 INSTALL_RTEMSIMGS=$(RTEMSIMGS:%=$(INSTALL_BIN)/%)
 
-OP_SYS_LDLIBS += -lbspExt
-
 %.sym: %$(EXE)
 	$(XSYMS) $^ $@
 

configure/os/CONFIG.Common.RTEMS-mvme5500

@@ -1,20 +1,27 @@
 #
+# CONFIG.Common.RTEMS-mvme5500
 # $Revision-Id$
-# Author: W. Eric Norum
-#         Advanced Photon Source
-#         norume@aps.anl.gov
+# Author: W. Eric Norum <wenorum@lbl.gov>
 #
 # All RTEMS targets use the same Makefile fragment
 #
+EXE = .elf
 RTEMS_TARGET_CPU = powerpc
+GNU_TARGET = powerpc-rtems
 ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
 ARCH_DEP_CFLAGS += -DHAVE_MOTLOAD
+ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_CONFIG_MBUF_SPACE=2048
+ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_CONFIG_CLUSTER_SPACE=5120
 ARCH_DEP_CFLAGS += -DBSP_NVRAM_BASE_ADDR=0xf1110000
 
+OP_SYS_LDLIBS += -lbspExt
+
 MUNCH_SUFFIX = .boot
 MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary $< $@
 endef
 
+OP_SYS_LDLIBS += -lbspExt
+
 include $(CONFIG)/os/CONFIG.Common.RTEMS

configure/os/CONFIG.Common.RTEMS-pc386

@@ -12,7 +12,7 @@ MUNCH_SUFFIX = .boot
 MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< temp.bin
-	$(PROJECT_RELEASE)/build-tools/bin2boot $@ 0x00097E00 \
+	$(BIN2BOOT) $@ 0x00097E00 \
 		$(PROJECT_RELEASE)/lib/start16.bin 0x00097C00 0 temp.bin 0x00100000 0
 	rm -f temp.bin
 endef

configure/os/CONFIG.Common.UnixCommon

@@ -19,8 +19,9 @@ OBJ = .o
 #Library prefix and suffixes
 LIB_PREFIX = lib
 LIB_SUFFIX = .a
-SHRLIB_SUFFIX = .so$(addprefix .,$(SHRLIB_VERSION))
-LOADABLE_SHRLIB_SUFFIX = .so$(addprefix .,$(LOADABLE_SHRLIB_VERSION))
+SHRLIB_SUFFIX_BASE = .so
+SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)$(addprefix .,$(SHRLIB_VERSION))
+LOADABLE_SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)$(addprefix .,$(LOADABLE_SHRLIB_VERSION))
 LOADABLE_SHRLIB_PREFIX = lib
 
 #-------------------------------------------------------
@@ -49,7 +50,7 @@ SHRLIB_LDLIBS = $(addprefix -l, $($*_LDLIBS) $(LIB_LIBS) $(USR_LIBS))\
  $(LDLIBS)
 
 SHRLIB_DEPLIB_DIRS = $(foreach word,$(sort $(dir $($*_DEPLIBS) $(SHRLIB_DEPLIBS))), \
-   $(shell $(PERL) $(TOOLS)/fullPathName.pl $(word)))
+   $(shell $(FULLPATHNAME) $(word)))
 
 SHRLIBDIR_LDFLAGS += $(SHRLIB_DEPLIB_DIRS:%=-L%)
 
@@ -72,7 +73,7 @@ PROD_LDLIBS += $($(firstword $(LDLIBS_STATIC_$(STATIC_BUILD)) \
                $(LDLIBS_SHARED_$(SHARED_LIBRARIES))))
 
 PROD_DEPLIB_DIRS = $(foreach word,$(sort $(dir $($*_DEPLIBS) $(PROD_DEPLIBS))), \
-  $(shell $(PERL) $(TOOLS)/fullPathName.pl $(word)))
+  $(shell $(FULLPATHNAME) $(word)))
 
 PRODDIR_LDFLAGS += $(PROD_DEPLIB_DIRS:%=-L%)
 

configure/os/CONFIG.Common.cygwin-x86

@@ -14,7 +14,7 @@ OS_CLASS = cygwin32
 ARCH_CLASS = x86
 
 #  Definitions used when COMMANDLINE_LIBRARY is READLINE
-LDLIBS_READLINE = -lreadline -lcurses
+LDLIBS_READLINE = -lreadline
 
 POSIX_CPPFLAGS = -D_POSIX_THREADS -D_POSIX_TIMERS
 #POSIX_CPPFLAGS += -D_POSIX_SOURCE
@@ -48,11 +48,12 @@ STATIC_CXXFLAGS_NO=  $(VISC_DLL) -D_DLL
 #	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_PREFIX=
-SHRLIB_SUFFIX=.dll
+SHRLIB_PREFIX =
+SHRLIB_SUFFIX_BASE = .dll
+SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)
 SHRLIBNAME_YES = $(BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX))
-LOADABLE_SHRLIB_PREFIX=
-LOADABLE_SHRLIB_SUFFIX=.dll
+LOADABLE_SHRLIB_PREFIX =
+LOADABLE_SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)
 LOADABLE_SHRLIBNAME = $(LOADABLE_BUILD_LIBRARY:%=%$(LOADABLE_SHRLIB_SUFFIX))
 
 #

configure/os/CONFIG.Common.cygwin-x86_64

@@ -0,0 +1,14 @@
+# CONFIG.Common.cygwin-x86_64
+#
+# $Revision-Id$
+# This file is maintained by the build community.
+#
+# Definitions for cygwin-x86_64 target builds
+# Sites may override these definitions in CONFIG_SITE.Common.cygwin-x86_64
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.Common.cygwin-x86
+
+ARCH_DEP_CFLAGS = -m64
+ARCH_DEP_LDFLAGS = -m64
+

configure/os/CONFIG.Common.ios-arm

@@ -1,18 +1,18 @@
 # CONFIG.Common.ios-arm
 #
+# $Revision-Id$
 # This file is maintained by the build community.
 #
 # Definitions for ios-arm target builds
+# Sites may override these definitions in CONFIG_SITE.Common.ios-arm
+# or CONFIG_SITE.<host>.ios-arm
 #-------------------------------------------------------
 
 IOS_PLATFORM = iPhoneOS
 
-#
-# Architecture-specific information
-#
-ARCH_CLASS = armv6
-
 OP_SYS_CFLAGS += -fno-inline-functions
+OP_SYS_CFLAGS += -miphoneos-version-min=$(IOS_DEPLOYMENT_TARGET)
+OP_SYS_LDFLAGS += -miphoneos-version-min=$(IOS_DEPLOYMENT_TARGET)
 
 # iOS optimization flags for arm architecture
 OPT_CFLAGS_YES = -O2

configure/os/CONFIG.Common.ios-x86

@@ -1,16 +1,17 @@
 # CONFIG.Common.ios-x86
 #
+# $Revision-Id$
 # This file is maintained by the build community.
 #
 # Definitions for ios-x86 target builds
+# Sites may override these definitions in CONFIG_SITE.Common.ios-x86
+# or CONFIG_SITE.<host>.ios-x86
 #-------------------------------------------------------
 
 IOS_PLATFORM = iPhoneSimulator
 
-#
-# Architecture-specific information
-#
-ARCH_CLASS = i386
+OP_SYS_CFLAGS += -mios-simulator-version-min=$(IOS_DEPLOYMENT_TARGET)
+OP_SYS_LDFLAGS += -mios-simulator-version-min=$(IOS_DEPLOYMENT_TARGET)
 
 # Include definitions common to all iOS targets
 include $(CONFIG)/os/CONFIG.Common.iosCommon

configure/os/CONFIG.Common.iosCommon

@@ -3,7 +3,7 @@
 # $Revision-Id$
 # This file is maintained by the build community.
 #
-# Definitions for iOS target archs
+# Definitions for all Apple iOS builds
 # Sites may override these definitions in CONFIG_SITE.Common.iosCommon
 # or CONFIG_SITE.<host>.iosCommon
 #-------------------------------------------------------
@@ -25,20 +25,23 @@ OS_CLASS = iOS
 #--------------------------------------------------
 # GNU and SDK directories
 GNU_DIR = $(PLATFORM_DIR)/Developer/usr
-SDK_DIR = $(PLATFORM_DIR)/Developer/SDKs/$(IOS_PLATFORM)$(IOS_VERSION).sdk
+SDK_DIR = $(PLATFORM_DIR)/Developer/SDKs/$(IOS_PLATFORM).sdk
 
 #-------------------------------------------------------
 # Build architecture flags
-ARCH_DEP_CFLAGS += -arch $(ARCH_CLASS)
-ARCH_DEP_LDFLAGS += -arch $(ARCH_CLASS)
+#   ARCH_CLASS must contain a list of CPU architectures which must be
+#   valid arguments to the -arch options for the cc and ld commands.
+#   ARCH_CLASS is defined in a CONFIG_SITE file which is not loaded
+#   until after this file.
+#
+ARCH_DEP_FLAGS = $(addprefix -arch ,$(ARCH_CLASS))
+ARCH_DEP_CFLAGS += $(ARCH_DEP_FLAGS)
+ARCH_DEP_LDFLAGS += $(ARCH_DEP_FLAGS)
 
 #--------------------------------------------------
 # Operating system flags
-OP_SYS_CFLAGS += -isysroot $(SDK_DIR) -D__IPHONE_OS_VERSION_MIN_REQUIRED=30200
-
-#--------------------------------------------------
-# Don't try to use precompiled headers when converting sequencer files
-CPPSNCFLAGS += -no-cpp-precomp
+OP_SYS_CFLAGS += -isysroot $(SDK_DIR)
+OP_SYS_LDFLAGS += -isysroot $(SDK_DIR)
 
 #--------------------------------------------------
 # Always compile in debugging symbol table information
@@ -48,23 +51,33 @@ OPT_CXXFLAGS_YES += -g
 
 #-------------------------------------------------------
 # Compiler definitions:
-#   Use clang instead of gcc
-#   Must use g++ still
-CC = $(GNU_BIN)/clang
-CCC = $(GNU_BIN)/c++
+
+CC_GNU  = gcc
+CCC_GNU = g++
+
+CC_LLVM_GNU  = llvm-gcc
+CCC_LLVM_GNU = llvm-g++
+
+CC_CLANG  = clang
+CCC_CLANG = clang++
+
+# Convert the iOS platform to lowercase for passing to xcrun's sdk parameter
+XCRUN_SDK_BASE = $(shell echo $(IOS_PLATFORM) | tr A-Z a-z)
 
 #-------------------------------------------------------
 # Linker flags
-OP_SYS_LDFLAGS += -dynamic -Z -L$(SDK_DIR)/usr/lib
+GNU_LDLIBS_YES =
+OP_SYS_LDFLAGS += -dynamic -Z -L$(SDK_DIR)/usr/lib -L$(SDK_DIR)/usr/lib/system
 
 #-------------------------------------------------------
 # Shared libraries
 SHRLIB_VERSION = $(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)
 SHRLIB_LDFLAGS = -dynamiclib -flat_namespace -undefined suppress \
-       -install_name $(shell perl $(TOOLS)/fullPathName.pl $(INSTALL_LIB))/$@ \
+       -install_name $(shell $(FULLPATHNAME) $(INSTALL_LIB))/$@ \
        -compatibility_version $(EPICS_VERSION).$(EPICS_REVISION) \
        -current_version $(SHRLIB_VERSION)
-SHRLIB_SUFFIX = .$(SHRLIB_VERSION).dylib
+SHRLIB_SUFFIX_BASE = .dylib
+SHRLIB_SUFFIX = .$(SHRLIB_VERSION)$(SHRLIB_SUFFIX_BASE)
 
 LOADABLE_SHRLIB_LDFLAGS = -bundle -flat_namespace -undefined suppress
 
@@ -80,7 +93,20 @@ vpath %.m $(USR_VPATH) $(ALL_SRC_DIRS)
 %.o: %.m
 	$(COMPILE.c) -c $<
 
+#--------------------------------------------------
+# Header dependency file generation
+#
+HDEPENDS_METHOD = CMD
+
 #--------------------------------------------------
 # Allow site overrides
 -include $(CONFIG)/os/CONFIG_SITE.Common.iosCommon
 -include $(CONFIG)/os/CONFIG_SITE.$(EPICS_HOST_ARCH).iosCommon
+
+#--------------------------------------------------
+# Find the Xcode programs for the selected SDK
+CC := $(shell xcrun -sdk $(XCRUN_SDK_BASE) -find $(CC_$(COMPILER)))
+CCC := $(shell xcrun -sdk $(XCRUN_SDK_BASE) -find $(CCC_$(COMPILER)))
+AR := $(shell xcrun -sdk $(XCRUN_SDK_BASE) -find ar) -rc
+LD := $(shell xcrun -sdk $(XCRUN_SDK_BASE) -find ld) -r
+RANLIB := $(shell xcrun -sdk $(XCRUN_SDK_BASE) -find ranlib)

configure/os/CONFIG.Common.linux-arm

@@ -1,9 +1,7 @@
 # CONFIG.Common.linux-arm
 #
-# This file is maintained by the build community.
-#
 # Definitions for linux-arm target builds
-# Sites may override these definitions in CONFIG_SITE.Common.linux-arm
+# Override these settings in CONFIG_SITE.Common.linux-arm
 #-------------------------------------------------------
 
 # Include definitions common to all Linux targets
@@ -11,29 +9,3 @@ include $(CONFIG)/os/CONFIG.Common.linuxCommon
 
 ARCH_CLASS = arm
 
-# Set a special definition for network order of Netwinder ARM floating point
-ARCH_DEP_CPPFLAGS += -D_ARM_NWFP_
-
-ifeq ($(BUILD_CLASS),CROSS)
-    VALID_BUILDS = Ioc
-    GNU_TARGET = arm-linux
-
-    # prefix of compiler tools
-    CMPLR_SUFFIX =
-    CMPLR_PREFIX = $(addsuffix -,$(GNU_TARGET))
-
-    # Provide a link-time path for shared libraries
-    SHRLIBDIR_RPATH_LDFLAGS_YES += $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath-link,%)
-    SHRLIBDIR_LDFLAGS += $(SHRLIBDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH))
-
-    # Provide a link-time path for products
-    PRODDIR_RPATH_LDFLAGS_YES += $(PROD_DEPLIB_DIRS:%=-Wl,-rpath-link,%)
-    PRODDIR_LDFLAGS += $(PRODDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH))
-
-    # Provide a link-time path for readline 
-    RUNTIME_LDFLAGS_READLINE_YES = -Wl,-rpath-link,$(GNU_DIR)/lib
-    RUNTIME_LDFLAGS_READLINE = $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH))
-    RUNTIME_LDFLAGS_READLINE_CURSES = $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH))
-    RUNTIME_LDFLAGS_READLINE_NCURSES = $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH))
-
-endif

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

@@ -0,0 +1,13 @@
+# CONFIG.Common.linux-arm-debug
+#
+# $Revision-Id$
+# This file is maintained by the build community.
+#
+# Definitions for linux-arm with debug compiler flags
+# Override these settings in CONFIG_SITE.Common.linux-arm-debug
+#-------------------------------------------------------
+
+# Include definitions common to all linux-arm target archs
+include $(CONFIG)/os/CONFIG.Common.linux-arm
+
+HOST_OPT=NO

configure/os/CONFIG.Common.linux-microblaze

@@ -0,0 +1,21 @@
+# CONFIG.Common.linux-microblaze
+#
+# This file is maintained by the build community.
+#
+# Definitions for Xilinx MicroBlaze FPGA Soft Core Processor target builds.
+# This target has been tested with the Xilinx Spartan 6 MicroBlaze.
+
+# Site-specific overrides of these definitions should be made in the file
+#   CONFIG_SITE.Common.linux-microblaze
+#-------------------------------------------------------
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = microblaze
+
+ifeq ($(BUILD_CLASS),CROSS)
+	VALID_BUILDS = Ioc
+	GNU_TARGET = microblazeel-unknown-linux-gnu
+	CMPLR_PREFIX = $(addsuffix -,$(GNU_TARGET))
+endif

configure/os/CONFIG.Common.linux-xscale_be

@@ -5,7 +5,8 @@
 # Definitions for linux-xscale_be (big-endian) target builds.
 # This target has been tested with the MOXA UC-7408-LX Plus.
 
-# Sites may override these definitions in CONFIG_SITE.Common.linux-xscale_be
+# Site-specific overrides of these definitions should be made in the file
+#   CONFIG_SITE.Common.linux-xscale_be
 #-------------------------------------------------------
 
 # Include definitions common to all Linux targets
@@ -13,11 +14,6 @@ include $(CONFIG)/os/CONFIG.Common.linuxCommon
 
 ARCH_CLASS = xscale
 
-#
-# The vendor's tool chain needs to be located here
-#
-GNU_DIR=/usr/local/xscale_be
-
 ifeq ($(BUILD_CLASS),CROSS)
     VALID_BUILDS = Ioc
     GNU_TARGET = xscale_be

configure/os/CONFIG.Common.linuxCommon

@@ -12,13 +12,10 @@ 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
+# Define _GNU_SOURCE and _DEFAULT_SOURCE for maximum portability
+POSIX_CPPFLAGS = -D_GNU_SOURCE -D_DEFAULT_SOURCE
 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 -ldl
 

configure/os/CONFIG.Common.solaris-sparc

@@ -21,7 +21,6 @@ COMPILER_LDFLAGS += -mt
 SOLARIS_VERSION = $(subst 5.,,$(shell uname -r))
 
 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)
@@ -51,8 +50,8 @@ OP_SYS_LDLIBS += $(STLPORT_LDLIBS_$(USE_STLPORT))
 
 # OS libraries used when generating shared libraries or static binaries
 OP_SYS_LDLIBS += -lsocket -lnsl
-OP_SYS_LDLIBS_8 += -lCrun -lc
-OP_SYS_LDLIBS_9 += -lumem -lCrun -lc
+OP_SYS_LDLIBS_8 += -ldl -lCrun -lc
+OP_SYS_LDLIBS_9 += -ldl -lumem -lCrun -lc
 OP_SYS_LDLIBS_10 += -lumem -lCrun -lc
 OP_SYS_LDLIBS += $(OP_SYS_LDLIBS_$(SOLARIS_VERSION))
 

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

@@ -15,7 +15,7 @@ COMPILER_CPPFLAGS =  -D_REENTRANT
 
 STLPORT_LDLIBS_NO =
 
-OP_SYS_LDLIBS_8 =
-OP_SYS_LDLIBS_9 =
+OP_SYS_LDLIBS_8 = -ldl
+OP_SYS_LDLIBS_9 = -ldl
 OP_SYS_LDLIBS_10 =
 

configure/os/CONFIG.Common.solaris-x86

@@ -21,7 +21,6 @@ COMPILER_LDFLAGS += -mt
 SOLARIS_VERSION = $(subst 5.,,$(shell uname -r))
 
 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)
@@ -50,9 +49,10 @@ OP_SYS_CFLAGS+=$(STLPORT_CFLAGS_$(USE_STLPORT))
 OP_SYS_LDFLAGS+=$(STLPORT_CFLAGS_$(USE_STLPORT))
 
 OP_SYS_LDLIBS += -lsocket -lnsl
-OP_SYS_LDLIBS_8 += -lCrun -lc
-OP_SYS_LDLIBS_9 += -lCrun -lc
+OP_SYS_LDLIBS_8 += -ldl -lCrun -lc
+OP_SYS_LDLIBS_9 += -ldl -lCrun -lc
 OP_SYS_LDLIBS_10 += -lCrun -lc
+OP_SYS_LDLIBS_11 += -lCrun -lc
 OP_SYS_LDLIBS += $(OP_SYS_LDLIBS_$(SOLARIS_VERSION))
 OP_SYS_LDLIBS += $(STLPORT_LDLIBS_$(USE_STLPORT))
 

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

@@ -14,7 +14,8 @@ COMPILER_CPPFLAGS = -D_REENTRANT
 
 STLPORT_LDLIBS_NO =
 
-OP_SYS_LDLIBS_8 = -lc
-OP_SYS_LDLIBS_9 = -lc
+OP_SYS_LDLIBS_8 = -ldl -lc
+OP_SYS_LDLIBS_9 = -ldl -lc
 OP_SYS_LDLIBS_10 = -lc
+OP_SYS_LDLIBS_11 = -lc
 

configure/os/CONFIG.Common.vxWorks-486

@@ -11,14 +11,13 @@
 include $(CONFIG)/os/CONFIG.Common.vxWorksCommon
 
 # Vx GNU cross compiler suffix
-CMPLR_SUFFIX = 386
+CMPLR_SUFFIX = pentium
  
-ARCH_CLASS = pc486
+ARCH_CLASS = x86
 
-ARCH_DEP_CPPFLAGS = -DCPU=I80486 -D_X86_ 
-ARCH_DEP_CFLAGS = -m486
-ARCH_DEP_CXXFLAGS += -x 'c++' 
-ARCH_DEP_CFLAGS += -fno-defer-pop
+ARCH_DEP_CPPFLAGS = -DCPU=I80486 -D_X86_
+ARCH_DEP_CFLAGS = -mtune=i486 -march=i486
+ARCH_DEP_CFLAGS += -fno-zero-initialized-in-bss -fno-defer-pop
 
 # Allow site overrides
 -include $(CONFIG)/os/CONFIG_SITE.Common.vxWorks-486

configure/os/CONFIG.Common.vxWorks-mpc8540

@@ -1,9 +1,10 @@
+# CONFIG.Common.vxWorks-mpc8540
+#
 # $Revision-Id$
+# This file is maintained by the build community.
 #
-# Definitions for vxWorks-mpc8540 targets: MPC8540 CPU with >32MB RAM.
-# Site-specific overrides go in CONFIG_SITE.Common.vxWorks-mpc8540
-#
-# This file is maintained by the EPICS build community.
+# Definitions for vxWorks-mpc8540 target archs
+# Sites may override these definitions in CONFIG_SITE.Common.vxWorks-mpc8540
 #-------------------------------------------------------
 
 # Include definitions common to all vxWorks target archs

configure/os/CONFIG.Common.vxWorks-mpc8548

@@ -0,0 +1,26 @@
+# CONFIG.Common.vxWorks-mpc8548
+#
+# $Revision-Id$
+# This file is maintained by the build community.
+#
+# Definitions for vxWorks-mpc8548 target archs
+# Sites may override these definitions in CONFIG_SITE.Common.vxWorks-mpc8548
+#-------------------------------------------------------
+
+# Include definitions common to all vxWorks target archs
+include $(CONFIG)/os/CONFIG.Common.vxWorksCommon
+
+# Vx GNU cross compiler suffix
+CMPLR_SUFFIX = ppc
+
+ARCH_CLASS = ppc
+
+# Architecture specific build flags
+ARCH_DEP_CPPFLAGS = -DCPU=PPC32
+ARCH_DEP_CFLAGS = -DCPU_VARIANT=_ppc85XX_e500v2
+ARCH_DEP_CFLAGS += -mlongcall
+
+# This flag isn't present in early vxWorks 6.x versions
+#ARCH_DEP_CFLAGS += -te500v2
+
+GNU_TARGET = powerpc-wrs-vxworks

configure/os/CONFIG.Common.vxWorks-mpc8548-debug

@@ -0,0 +1,14 @@
+# CONFIG.Common.vxWorks-mpc8548-debug
+#
+# $Revision-Id$
+# This file is maintained by the build community.
+#
+# Definitions for vxWorks-mpc8548-debug targets.
+# Sites may override these definitions in CONFIG_SITE.Common.vxWorks-mpc8548-debug
+#-------------------------------------------------------
+
+# Include definitions common to all vxWorks archs
+include $(CONFIG)/os/CONFIG.Common.vxWorks-mpc8548
+
+CROSS_OPT = NO
+

configure/os/CONFIG.Common.vxWorks-pentium

@@ -11,12 +11,14 @@
 include $(CONFIG)/os/CONFIG.Common.vxWorksCommon
 
 # Vx GNU cross compiler suffix
-CMPLR_SUFFIX = 386
- 
-ARCH_CLASS = pcPentium
+CMPLR_SUFFIX = pentium
 
-ARCH_DEP_CPPFLAGS = -DCPU=PENTIUM -D_X86_ 
-ARCH_DEP_CFLAGS = -mpentium
-ARCH_DEP_CXXFLAGS += -x 'c++' 
-ARCH_DEP_CFLAGS += -fno-defer-pop
+ARCH_CLASS = x86
+
+ARCH_DEP_CPPFLAGS = -DCPU=PENTIUM -D_X86_
+ARCH_DEP_CFLAGS = -mtune=pentium -march=pentium
+ARCH_DEP_CFLAGS += -fno-zero-initialized-in-bss -fno-defer-pop
+
+# Allow site overrides
+-include $(CONFIG)/os/CONFIG_SITE.Common.vxWorks-pentium
 

configure/os/CONFIG.Common.vxWorks-ppc32

@@ -0,0 +1,24 @@
+# $Revision-Id$
+#
+# Definitions for vxWorks-ppc603 targets with >32MB of RAM
+# Site-specific overrides go in CONFIG_SITE.Common.vxWorks-ppc603_long
+#
+# This file is maintained by the EPICS build community.
+#-------------------------------------------------------
+
+# Include definitions common to all vxWorks target archs
+include $(CONFIG)/os/CONFIG.Common.vxWorksCommon
+
+# Vx GNU cross compiler suffix
+CMPLR_SUFFIX = ppc
+ 
+ARCH_CLASS = ppc
+
+# Architecture specific build flags
+ARCH_DEP_CPPFLAGS = -DCPU=PPC32
+ARCH_DEP_CFLAGS = -mstrict-align
+
+GNU_TARGET = powerpc-wrs-vxworks
+
+# Tell compiler to generate long branches
+ARCH_DEP_CFLAGS += -mlongcall

configure/os/CONFIG.Common.vxWorks-ppc32-debug

@@ -0,0 +1,14 @@
+# CONFIG.Common.vxWorks-ppc32-debug
+#
+# $Revision-Id$
+# This file is maintained by the build community.
+#
+# Definitions for vxWorks-ppc32-debug target archs
+# Sites may override these definitions in CONFIG_SITE.Common.vxWorks-ppc32-debug
+#-------------------------------------------------------
+
+# Include definitions common to all vxWorks archs
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc32
+
+CROSS_OPT = NO
+

configure/os/CONFIG.Common.vxWorks-ppc32sf

@@ -0,0 +1,13 @@
+# $Revision-Id$
+#
+# Definitions for vxWorks-ppc32sf targets
+# Site-specific overrides go in CONFIG_SITE.Common.vxWorks-ppc32sf
+#
+# This file is maintained by the EPICS build community.
+#-------------------------------------------------------
+
+# Inherit the settings from vxWorks-ppc32
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc32
+
+# Tell compiler to use software floating-point
+ARCH_DEP_CFLAGS += -msoft-float

configure/os/CONFIG.Common.vxWorks-ppc32sf-debug

@@ -0,0 +1,14 @@
+# CONFIG.Common.vxWorks-ppc32sf-debug
+#
+# $Revision-Id$
+# This file is maintained by the build community.
+#
+# Definitions for vxWorks-ppc32sf-debug target archs
+# Sites may override these definitions in CONFIG_SITE.Common.vxWorks-ppc32sf-debug
+#-------------------------------------------------------
+
+# Include definitions common to all vxWorks archs
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc32sf
+
+CROSS_OPT = NO
+

configure/os/CONFIG.Common.vxWorksCommon

@@ -93,6 +93,7 @@ VX_GNU_VERSION_6.5 = 3.4.4
 VX_GNU_VERSION_6.6 = 4.1.2
 VX_GNU_VERSION_6.7 = 4.1.2
 VX_GNU_VERSION_6.8 = 4.1.2
+VX_GNU_VERSION_6.9 = 4.3.3
 VX_GNU_VERSION = $(VX_GNU_VERSION_$(VXWORKS_VERSION))
 
 VX_GNU_MAJOR_VERSION = $(basename $(basename $(VX_GNU_VERSION)))
@@ -134,6 +135,7 @@ NM_DIR_6.5 = $(WORKBENCH_BIN)
 NM_DIR_6.6 = $(WORKBENCH_BIN)
 NM_DIR_6.7 = $(GNU_BIN)
 NM_DIR_6.8 = $(UTILITIES_BIN)
+NM_DIR_6.9 = $(UTILITIES_BIN)
 NM_DIR = $(firstword $(NM_DIR_$(VXWORKS_VERSION)) $(GNU_BIN))
 
 NM = $(NM_DIR)/$(CMPLR_PREFIX)nm$(CMPLR_SUFFIX)$(HOSTEXE)
@@ -159,7 +161,7 @@ export TOOL_FAMILY = GNU
 
 #--------------------------------------------------
 # Operating system flags
-OP_SYS_CPPFLAGS += -DvxWorks
+OP_SYS_CPPFLAGS += -DvxWorks=vxWorks
 OP_SYS_CFLAGS += -fno-builtin
 
 # Fix for vxWorks 5 headers that use macros defined in vxWorks.h but

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

@@ -4,7 +4,7 @@
 # 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
+# Sites may override these definitions in CONFIG_SITE.Common.win32-x86-cygwin
 #-------------------------------------------------------
 
 # Include definitions common to all Unix targets
@@ -55,11 +55,12 @@ STATIC_CXXFLAGS_NO=  $(VISC_DLL) -D_DLL
 #	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_PREFIX=
-SHRLIB_SUFFIX=.dll
+SHRLIB_PREFIX =
+SHRLIB_SUFFIX_BASE = .dll
+SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)
 SHRLIBNAME_YES = $(BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX))
-LOADABLE_SHRLIB_PREFIX=
-LOADABLE_SHRLIB_SUFFIX=.dll
+LOADABLE_SHRLIB_PREFIX =
+LOADABLE_SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)
 LOADABLE_SHRLIBNAME = $(LOADABLE_BUILD_LIBRARY:%=%$(LOADABLE_SHRLIB_SUFFIX))
 
 #

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

@@ -34,7 +34,8 @@ ARCH_DEP_LDFLAGS += -m32
 # Override for -DUNIX from CONFIG.Common.UnixCommon
 OP_SYS_CPPFLAGS = -D_MINGW
 
-EXE=.exe
+EXE = .exe
+RES = .coff
 
 VISC_DLL_NO = -DEPICS_DLL_NO
 VISC_DLL_YES =
@@ -49,11 +50,12 @@ STATIC_CXXFLAGS_NO=  $(VISC_DLL) -D_DLL
 #	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_PREFIX=
-SHRLIB_SUFFIX=.dll
+SHRLIB_PREFIX =
+SHRLIB_SUFFIX_BASE = .dll
+SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)
 SHRLIBNAME_YES = $(BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX))
-LOADABLE_SHRLIB_PREFIX=
-LOADABLE_SHRLIB_SUFFIX=.dll
+LOADABLE_SHRLIB_PREFIX =
+LOADABLE_SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)
 LOADABLE_SHRLIBNAME = $(LOADABLE_BUILD_LIBRARY:%=%$(LOADABLE_SHRLIB_SUFFIX))
 
 #

configure/os/CONFIG.Common.windows-x64-mingw

@@ -0,0 +1,15 @@
+# CONFIG.Common.windows-x64-mingw
+#
+# $Revision-Id$
+# This file is maintained by the build community.
+#
+# Definitions for windows-x64-mingw target builds
+# Sites may override these definitions in CONFIG_SITE.Common.windows-x64-mingw
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.Common.win32-x86-mingw
+
+ARCH_CLASS = x64
+
+ARCH_DEP_CFLAGS = -m64
+ARCH_DEP_LDFLAGS = -m64

configure/os/CONFIG.cygwin-x86_64.Common

@@ -0,0 +1,10 @@
+# CONFIG.cygwin-x86_64.Common
+#
+# $Revision-Id$
+# This file is maintained by the build community.
+#
+# Definitions for cygwin-x86_64 host archs
+# Sites may override these definitions in CONFIG_SITE.cygwin-x86_64.Common
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.cygwin-x86.Common

configure/os/CONFIG.cygwin-x86_64.cygwin-x86_64

@@ -0,0 +1,11 @@
+#  CONFIG.cygwin-x86_64.cygwin-x86_64
+#
+# $Revision-Id$
+#
+# Definitions for cygwin-x86_64 host - cygwin-x86_64 target builds
+# Sites may override these definitions in CONFIG_SITE.cygwin-x86_64.cygwin-x86_64
+#-------------------------------------------------------
+
+# Include common gnu compiler definitions
+include $(CONFIG)/os/CONFIG.cygwin-x86.cygwin-x86
+

configure/os/CONFIG.darwinCommon.darwinCommon

@@ -36,11 +36,6 @@ ARCH_DEP_LDFLAGS += $(ARCH_DEP_FLAGS)
 #
 OP_SYS_CFLAGS += -fno-common
 
-#
-# Don't try to use precompiled headers when converting sequencer files
-#
-CPPSNCFLAGS += -no-cpp-precomp
-
 #
 # Darwin os definition
 #
@@ -52,20 +47,6 @@ OP_SYS_CPPFLAGS += -Ddarwin
 OPT_CFLAGS_YES += -g
 OPT_CXXFLAGS_YES += -g
 
-#
-# 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_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.
 #
@@ -78,18 +59,21 @@ COMMANDLINE_LIBRARY=READLINE
 
 GNU_DIR = /usr
 
-CC = $(GNU_BIN)/cc
-CCC = $(GNU_BIN)/c++
+# Apple soft-links these compilers to clang/clang++
+CC = cc
+CCC = c++
+GNU = NO
 
 #
 # Darwin shared libraries
 #
 SHRLIB_VERSION = $(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)
 SHRLIB_LDFLAGS = -dynamiclib -flat_namespace -undefined suppress \
-       -install_name $(shell perl $(TOOLS)/fullPathName.pl $(INSTALL_LIB))/$@ \
+       -install_name $(shell $(FULLPATHNAME) $(INSTALL_LIB))/$@ \
        -compatibility_version $(EPICS_VERSION).$(EPICS_REVISION) \
        -current_version $(SHRLIB_VERSION)
-SHRLIB_SUFFIX = .$(SHRLIB_VERSION).dylib
+SHRLIB_SUFFIX_BASE = .dylib
+SHRLIB_SUFFIX = .$(SHRLIB_VERSION)$(SHRLIB_SUFFIX_BASE)
 
 LOADABLE_SHRLIB_LDFLAGS = -bundle -flat_namespace -undefined suppress
 

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

@@ -0,0 +1,12 @@
+# CONFIG.linux-arm-debug.Common
+#
+# $Revision-Id$
+# This file is maintained by the build community.
+#
+# Definitions for linux-arm-debug host builds
+# Override these settings in CONFIG_SITE.linux-arm-debug.Common
+#-------------------------------------------------------
+
+#Include definitions common to linux-arm hosts
+include $(CONFIG)/os/CONFIG.linux-arm.Common
+

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

@@ -0,0 +1,14 @@
+# CONFIG.linux-arm-debug.linux-arm-debug
+#
+# $Revision-Id$
+# This file is maintained by the build community.
+#
+# Definitions for linux-arm-debug host and target build
+# Override these settings in CONFIG_SITE.linux-arm-debug.linux-arm-debug
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.linux-arm.linux-arm
+
+# Removes -O optimization and adds -g compile option
+HOST_OPT=NO
+

configure/os/CONFIG.linux-arm.Common

@@ -0,0 +1,10 @@
+# CONFIG.linux-arm.Common
+#
+# $Revision-Id$
+#
+# Definitions for linux-arm host builds
+# Sites may override these definitions in CONFIG_SITE.linux-arm.Common
+#-------------------------------------------------------
+
+#Include definitions common to unix hosts
+include $(CONFIG)/os/CONFIG.UnixCommon.Common

configure/os/CONFIG.linux-arm.linux-arm

@@ -0,0 +1,10 @@
+# CONFIG.linux-arm.linux-arm
+#
+# $Revision-Id$
+#
+# Definitions for native linux-arm builds
+# Sites may override these definitions in CONFIG_SITE.linux-arm.linux-arm
+#-------------------------------------------------------
+
+# Include common gnu compiler definitions
+include $(CONFIG)/CONFIG.gnuCommon

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

@@ -0,0 +1,15 @@
+# CONFIG.linux-arm.linux-arm-debug
+#
+# $Revision-Id$
+# This file is maintained by the build community.
+#
+# Definitions for linux-arm host - linux-arm-debug target build
+# Override these settings in CONFIG_SITE.linux-arm.linux-arm-debug
+#-------------------------------------------------------
+
+-include $(CONFIG)/os/CONFIG.linux-arm.linux-arm
+-include $(CONFIG)/os/CONFIG_SITE.Common.linux-arm
+-include $(CONFIG)/os/CONFIG_SITE.linux-arm.linux-arm
+
+BUILD_CLASS=HOST
+HOST_OPT=NO

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

@@ -1,10 +1,31 @@
 # CONFIG.linux-x86.linux-arm
 #
 # Definitions for linux-x86 host - linux-arm target builds
-# Sites may override these definitions in CONFIG_SITE.linux-x86.linux-arm
+# Override these settings in CONFIG_SITE.linux-x86.linux-arm
 #-------------------------------------------------------
 
-# Copied from x86.x86
+VALID_BUILDS = Ioc
+GNU_TARGET = arm-linux
+
+# prefix of compiler tools
+CMPLR_SUFFIX =
+CMPLR_PREFIX = $(addsuffix -,$(GNU_TARGET))
+
+# Provide a link-time path for shared libraries
+SHRLIBDIR_RPATH_LDFLAGS_YES += $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath-link,%)
+SHRLIBDIR_LDFLAGS += $(SHRLIBDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH))
+
+# Provide a link-time path for products
+PRODDIR_RPATH_LDFLAGS_YES += $(PROD_DEPLIB_DIRS:%=-Wl,-rpath-link,%)
+PRODDIR_LDFLAGS += $(PRODDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH))
+
+# Provide a link-time path for readline 
+RUNTIME_LDFLAGS_READLINE_YES = -Wl,-rpath-link,$(GNU_DIR)/lib
+RUNTIME_LDFLAGS_READLINE = $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH))
+RUNTIME_LDFLAGS_READLINE_CURSES = $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH))
+RUNTIME_LDFLAGS_READLINE_NCURSES = $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH))
+
+# Library flags
 STATIC_LDFLAGS_YES= -Wl,-Bstatic
 STATIC_LDFLAGS_NO= 
 STATIC_LDLIBS_YES= -Wl,-Bdynamic

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

@@ -0,0 +1,9 @@
+# CONFIG.linux-x86.linux-arm-debug
+#
+# Definitions for linux-x86 host - linux-arm-debug target builds
+# Override these settings in CONFIG_SITE.linux-x86.linux-arm-debug
+#-------------------------------------------------------
+
+# Include definitions for linux-arm targets
+include $(CONFIG)/os/CONFIG.linux-x86.linux-arm
+

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

@@ -0,0 +1,22 @@
+# CONFIG.linux-x86.win32-x86-mingw
+#
+# Definitions for linux-x86 host win32-x86-mingw target builds
+# Override these definitions in CONFIG_SITE.linux-x86.win32-x86-mingw
+#-------------------------------------------------------
+
+# Include common gnu compiler definitions
+include $(CONFIG)/CONFIG.gnuCommon
+
+# Add resource compiler
+RCCMD = $(CMPLR_PREFIX)windres$(CMPLR_SUFFIX) $(INCLUDES) $< $@
+
+# Remove -fPIC flags, add out-implib
+SHRLIB_CFLAGS =
+SHRLIB_LDFLAGS = -shared -Wl,--out-implib,$(LIB_PREFIX)$*$(LIB_SUFFIX)
+LOADABLE_SHRLIB_LDFLAGS = -shared -Wl,--out-implib,$(LIB_PREFIX)$*$(LIB_SUFFIX)
+
+# Don't link with gcc library
+GNU_LDLIBS_YES =
+
+# Link with winsock2
+OP_SYS_LDLIBS = -lws2_32

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

@@ -0,0 +1,8 @@
+# CONFIG.linux-x86_64.linux-arm
+#
+# Definitions for linux-x86_64 host - linux-arm target builds
+# Sites may override these definitions in CONFIG_SITE.linux-x86_64.linux-arm
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.linux-x86.linux-arm
+

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

@@ -0,0 +1,8 @@
+# CONFIG.linux-x86_64.linux-arm-debug
+#
+# Definitions for linux-x86_64 host - linux-arm-debug target builds
+# Override these settings in CONFIG_SITE.linux-x86_64.linux-arm-debug
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.linux-x86.linux-arm
+

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

@@ -0,0 +1,9 @@
+# CONFIG.linux-x86_64.win32-x86-mingw
+#
+# Definitions for linux-x86_64 host win32-x86-mingw target builds
+# Override these definitions in CONFIG_SITE.linux-x86_64.win32-x86-mingw
+#-------------------------------------------------------
+
+# Settings as for the linux-x86 host architecture
+include $(CONFIG)/os/CONFIG.linux-x86.win32-x86-mingw
+

configure/os/CONFIG.solaris-sparc64.Common

@@ -3,7 +3,7 @@
 # $Revision-Id$
 # This file is maintained by the build community.
 #
-# Definitions for solaris-sparc Sun compiler host builds
+# Definitions for solaris-sparc64 Sun compiler host builds
 # Sites may override these definitions in CONFIG_SITE.solaris-sparc64.Common
 #-------------------------------------------------------
 

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

@@ -3,7 +3,7 @@
 # $Revision-Id$
 # This file is maintained by the build community.
 #
-# Definitions for solaris-sparc Sun compiler host - solaris-sparc Sun compiler target builds
+# Definitions for solaris-sparc64 compiler host - solaris-sparc64 compiler target builds
 # Sites may override these definitions in CONFIG_SITE.solaris-sparc64.solaris-sparc64
 #-------------------------------------------------------
 

configure/os/CONFIG.solarisCommon.solarisCommon

@@ -3,13 +3,14 @@
 # $Revision-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
+# Definitions for solaris host - solaris target build
+# Sites may override these definitions in CONFIG_SITE.solarisCommon.solarisCommon
 #-------------------------------------------------------
 
-SPARCWORKS = /opt/SUNWspro
 GNU = NO
 
+# SPARCWORKS path is set in a CONFIG_SITE file
+
 CC = $(SPARCWORKS)/bin/cc
 CCC = $(SPARCWORKS)/bin/CC
 CPP = $(CC) -E -Qn

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

@@ -8,10 +8,11 @@
 #-------------------------------------------------------
 
 CP = $(PERL) -MExtUtils::Command -e cp
-MV = $(PERL) -MExtUtils::Command -e mv 
+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

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

@@ -176,7 +176,8 @@ LINK.shrlib+= $(DLL_DEF_FLAG),$(LIBRARY_LD_RESS)
 #	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=.dll
+SHRLIB_SUFFIX_BASE = .dll
+SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)
 SHRLIBNAME_YES = $(BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX))
 LOADABLE_SHRLIBNAME = $(LOADABLE_BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX))
 
@@ -260,7 +261,7 @@ LINK.cpp += , $@ ,,$(LINKLIBS)  $(subst /,\\,$(PROD_LDLIBS))
 #--------------------------------------------------
 
 # override of CONFIG_COMMON
-HDEPENDS_INCLUDES_MKMF = $(filter-out $(BORLAND_INC),$(subst -I,,$(INCLUDES)))
+HDEPENDS_INCLUDES_MKMF = $(filter-out $(addprefix -I,$(BORLAND_INC)),$(INCLUDES))
 
 
 TDS = $(addsuffix .tds,$(basename $(PROD) $(TESTPROD) $(BUILD_LIBRARY)))

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

@@ -4,17 +4,18 @@
 # 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
+# Sites may override these definitions in CONFIG_SITE.win32-x86-mingw.Common
 #-------------------------------------------------------
 
 #Include definitions common to unix hosts
 include $(CONFIG)/os/CONFIG.UnixCommon.Common
 
 CP = $(PERL) -MExtUtils::Command -e cp
-MV = $(PERL) -MExtUtils::Command -e mv 
+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

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

@@ -9,21 +9,27 @@
 # Include common gnu compiler definitions
 include $(CONFIG)/CONFIG.gnuCommon
 
-# gcc, g++, ar, ld, and ranlib must be in user's path
-CC = gcc
-CCC = g++
-AR = ar -rc
-LD = ld -r
-RANLIB = ranlib
-RES=.coff
-RCCMD = windres $(INCLUDES) $< $@
+# Undo various things set by CONFIG.gnuCommon
 
-# No -fPIC avoids "-fPIC ignored for target (all code is position independent)"
+CMPLR_PREFIX =
+
+# Remove $(GNU_BIN)/ path
+CC  = $(CMPLR_PREFIX)gcc
+CCC = $(CMPLR_PREFIX)g++
+AR  = $(CMPLR_PREFIX)ar -rc
+LD  = $(CMPLR_PREFIX)ld -r
+RANLIB = $(CMPLR_PREFIX)ranlib
+
+# Add resource compiler
+RCCMD = $(CMPLR_PREFIX)windres $(INCLUDES) $< $@
+
+# Remove -fPIC flags, add out-implib
 SHRLIB_CFLAGS =
 SHRLIB_LDFLAGS = -shared -Wl,--out-implib,$(LIB_PREFIX)$*$(LIB_SUFFIX)
 LOADABLE_SHRLIB_LDFLAGS = -shared -Wl,--out-implib,$(LIB_PREFIX)$*$(LIB_SUFFIX)
 
-# Override linking with gcc library from CONFIG.gnuCommon
+# Don't link with gcc library
 GNU_LDLIBS_YES =
 
-OP_SYS_LDLIBS = -lws2_32 
+# Link with winsock2
+OP_SYS_LDLIBS = -lws2_32

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

@@ -0,0 +1,11 @@
+# CONFIG.win32-x86-static.Common
+#
+# $Revision-Id$
+# This file is maintained by the build community.
+#
+# Definitions for win32-x86-static host archs
+# Sites may override these definitions in CONFIG_SITE.win32-x86-static.Common
+#-------------------------------------------------------
+
+include  $(CONFIG)/os/CONFIG.win32-x86.Common
+

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

@@ -0,0 +1,13 @@
+# CONFIG.win32-x86-static.win32-x86.static
+#
+# $Revision-Id$
+# This file is maintained by the build community.
+#
+# Definitions for win32-x86-static target archs when host arch is win32-x86-static
+# Sites may override these definitions in CONFIG_SITE.win32-x86-static.win32-x86-static
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.win32-x86.win32-x86
+
+SHARED_LIBRARIES = NO
+STATIC_BUILD = YES

configure/os/CONFIG.win32-x86.Common

@@ -8,10 +8,11 @@
 #-------------------------------------------------------
 
 CP = $(PERL) -MExtUtils::Command -e cp
-MV = $(PERL) -MExtUtils::Command -e mv 
+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

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

@@ -31,7 +31,9 @@ BAFCMD = bscmake /nologo /o $@
 # Configure OS vendor C compiler
 CC = cl
 
+# Override CONFIG.gnuCommon for cross builds.
 GNU = NO
+HDEPENDS_METHOD = CMD
 
 #
 # /W<N> use warning level N
@@ -187,7 +189,8 @@ OP_SYS_CXXFLAGS = $(COMPILER_CXXFLAGS)
 #		'-entry:_DllMainCRTStartup$(DLLENTRY)'
 DLLENTRY = @12
 
-WIN32_DLLFLAGS = /subsystem:windows /dll $(OPT_LDFLAGS) $(USR_LDFLAGS) $(TARGET_LDFLAGS) $(LIB_LDFLAGS)
+WIN32_DLLFLAGS = /subsystem:windows /dll $(OPT_LDFLAGS) \
+ $(USR_LDFLAGS) $(CMD_LDFLAGS) $(TARGET_LDFLAGS) $(LIB_LDFLAGS)
 
 #
 # specify dll .def file only if it exists
@@ -210,7 +213,8 @@ MUNCH_CMD =  $(CCC) /Fo $@ $^
 #	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=.dll
+SHRLIB_SUFFIX_BASE = .dll
+SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)
 SHRLIBNAME_YES = $(BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX))
 LOADABLE_SHRLIBNAME = $(LOADABLE_BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX))
 

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

@@ -0,0 +1,14 @@
+# CONFIG.win32-x86.win32-x86-static
+#
+# $Revision-Id$
+# This file is maintained by the build community.
+#
+# Definitions for win32-x86-static target archs when host arch is win32-x86
+# Sites may override these definitions in CONFIG_SITE.win32-x86.win32-x86-static
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.win32-x86.win32-x86
+
+BUILD_CLASS = HOST
+SHARED_LIBRARIES = NO
+STATIC_BUILD = YES

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

@@ -13,7 +13,7 @@
 ARCH_DEP_CPPFLAGS += /favor:blend
 #ARCH_DEP_CPPFLAGS += /Wp64
 
-#	/favor:blend	both AMD64 and INTEL64
+#	/favor:blend	both AMD64 and INTEL64  This is the default
 #	/favor:AMD64
 #	/favor:INTEL64 (new value)
 #	/favor:EN64T   (old value)

configure/os/CONFIG.windows-x64-mingw.Common

@@ -0,0 +1,11 @@
+# CONFIG.windows-x64-mingw.Common
+#
+# $Revision-Id$
+# This file is maintained by the build community.
+#
+# Definitions for windows-x64-mingw host archs
+# Sites may override these definitions in CONFIG_SITE.windows-x64-mingw.Common
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.win32-x86-mingw.Common
+

configure/os/CONFIG.windows-x64-mingw.windows-x64-mingw

@@ -0,0 +1,11 @@
+# CONFIG.windows-x64-mingw.windows-x64-mingw
+#
+# $Revision-Id$
+# This file is maintained by the build community.
+#
+# Definitions for windows-x64-mingw target archs
+# Sites may override these definitions in CONFIG_SITE.windows-x64-mingw.windows-x64-mingw
+#-------------------------------------------------------
+
+# Include common gnu compiler definitions
+include $(CONFIG)/os/CONFIG.win32-x86-mingw.win32-x86-mingw

configure/os/CONFIG.windows-x64-static.Common

@@ -0,0 +1,11 @@
+# CONFIG.windows-x64-static.Common
+#
+# $Revision-Id$
+# This file is maintained by the build community.
+#
+# Definitions for windows-x64-static host archs
+# Sites may override these definitions in CONFIG_SITE.windows-x64-static.Common
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.windows-x64.Common
+

configure/os/CONFIG.windows-x64-static.windows-x64-static

@@ -0,0 +1,13 @@
+# CONFIG.windows-x64-static.windows-x64-static
+#
+# $Revision-Id$
+# This file is maintained by the build community.
+#
+# Definitions for windows-x64-static target archs when host arch is windows-x64-static
+# Sites may override these definitions in CONFIG_SITE.windows-x64-static.windows-x64-static
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.windows-x64.windows-x64
+
+SHARED_LIBRARIES = NO
+STATIC_BUILD= YES

configure/os/CONFIG.windows-x64.windows-x64-debug

@@ -0,0 +1,12 @@
+# CONFIG.windows-x64.windows-x64-debug
+#
+# $Revision-Id$
+# This file is maintained by the build community.
+#
+# Definitions for windows-x64 compiler host - windows-x64 debug compiler target builds
+# Sites may override these definitions in CONFIG_SITE.windows-x64.windows-x64-debug
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.windows-x64.windows-x64
+
+HOST_OPT=NO

configure/os/CONFIG.windows-x64.windows-x64-static

@@ -0,0 +1,14 @@
+# CONFIG.windows-x86.windows-x86-static
+#
+# $Revision-Id$
+# This file is maintained by the build community.
+#
+# Definitions for windows-x64-static target archs when host arch is windows-x64
+# Sites may override these definitions in CONFIG_SITE.windows-x64.windows-x64-static
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.windows-x64.windows-x64
+
+BUILD_CLASS = HOST
+SHARED_LIBRARIES = NO
+STATIC_BUILD = YES

configure/os/CONFIG_SITE.Common.RTEMS

@@ -1,25 +1,35 @@
+# CONFIG_SITE.Common.RTEMS
+#
+# $Revision-Id$
 #
 # Site-specific information for all RTEMS targets
-#
 #-------------------------------------------------------
 
 # Where to find RTEMS
 #
-RTEMS_VERSION=4.9.2
-RTEMS_BASE=/usr/local/rtems/rtems-$(RTEMS_VERSION)
+# APS:
+RTEMS_VERSION = 4.10.2
+RTEMS_BASE = /usr/local/vw/rtems/rtems-$(RTEMS_VERSION)
 
 # Cross-compile toolchain in $(RTEMS_TOOLS)/bin
 #
-RTEMS_TOOLS=$(RTEMS_BASE)
+RTEMS_TOOLS = $(RTEMS_BASE)
 
+# Link Generic System loadable objects instead of full executable.
+#
+# A GeSys object is similar to a shared library.  It can be (un)loaded
+# at runtime by the Generic System loader which is available as a
+# patch against RTEMS.
+USE_GESYS = NO
 
 # If you're using neither BOOTP/DHCP nor FLASH to pick up your IOC
-# network configuration you must uncomment and specify your Internet 
+# network configuration you must uncomment and specify your Internet
 # Domain Name here
 #
 #OP_SYS_CFLAGS += -DRTEMS_NETWORK_CONFIG_DNS_DOMAINNAME=<domainname>
 
-#
-# Specify your desired command-line-input library
+# Select the command-line-input library to use
 #
 COMMANDLINE_LIBRARY = EPICS
+#COMMANDLINE_LIBRARY = LIBTECLA
+#COMMANDLINE_LIBRARY = READLINE

configure/os/CONFIG_SITE.Common.cygwin-x86

@@ -7,4 +7,7 @@
 
 # If readline is installed uncomment the following line
 # to add command-line editing and history support
-COMMANDLINE_LIBRARY = READLINE
+#COMMANDLINE_LIBRARY = READLINE
+
+# Uncomment the following line if readline has problems
+#LDLIBS_READLINE= -lreadline -lcurses

configure/os/CONFIG_SITE.Common.cygwin-x86_64

@@ -0,0 +1,14 @@
+# CONFIG_SITE.Common.cygwin-x86_64
+#
+# $Revision-Id$
+#
+# Site Specific definitions for cygwin-x86_64 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
+
+# Uncomment the following line if readline has problems
+#LDLIBS_READLINE = -lreadline -lcurses
+

configure/os/CONFIG_SITE.Common.darwin-x86

@@ -7,9 +7,31 @@
 #-------------------------------------------------------
 
 # Select which CPU architecture(s) to include in your MacOS binaries:
-#   i386
-#   x86_64  - Needs MacOS 10.4 with the Universal SDK, or 10.5 and later
+#   i386, x86_64, or both (fat binaries).
 
-ARCH_CLASS = i386
-#ARCH_CLASS = x86_64
+#ARCH_CLASS = i386
+ARCH_CLASS = x86_64
 #ARCH_CLASS = i386 x86_64
+
+#
+# Uncomment the following 3 lines to build with Apple's GCC instead of CLANG.
+#
+#CC  = gcc
+#CCC = g++
+#GNU = YES
+
+
+# To use MacPorts GCC uncomment (and modify if necessary) the following:
+
+#GNU_DIR = /opt/local
+#CC = $(GNU_BIN)/gcc -m64
+#CCC = $(GNU_BIN)/g++ -m64
+#GNU = YES
+
+# If you see this or similar errors while building in the src/cap5 directory
+#   gcc: error: unrecognized option '-no-cpp-precomp'
+# the problem is due to the ccflags configuration that your version of Perl
+# was built with.  You can replace the Cap5_CFLAGS setting in the Makefile
+# with a hand-edited set of flags for building that Perl library, or ignore
+# this problem if you don't need to use Channel Access from Perl.
+

configure/os/CONFIG_SITE.Common.ios-arm

@@ -0,0 +1,32 @@
+# CONFIG_SITE.Common.ios-arm
+#
+# $Revision-Id$
+#
+# Site-specific settings for ios-arm target builds
+#-------------------------------------------------------
+
+# Which ARM instruction set(s) to generate code for:
+#   Most iOS devices can run programs compiled for older
+#   instruction sets, although the newer instructions are
+#   more efficient.
+#
+#   Apple's compilers can build for multiple architectures,
+#   generating a Universal binary.  This is larger and takes
+#   longer to compile, but runs efficiently on all devices.
+#
+#   Xcode 4.5 dropped support for the ARMv6.
+#
+#   arm64 devices:  iPhone 5S, 6 and 6 Plus, iPad Air Gen 1 and 2,
+#                   iPad Mini Gen 2 and 3
+#   armv7s devices: iPhone 5 and 5C, iPad Gen 4
+#   armv7 devices:  iPhone 3GS, 4 and 4S, iPod Touch Gen 3 to 5
+#                   iPad Gen 1 to 3, iPad Mini, Apple TV Gen 2 and 3
+#   armv6 devices:  iPhone 1 and 3G, iPod Touch Gen 1 and 2
+
+#ARCH_CLASS = arm64
+#ARCH_CLASS = armv7s arm64
+ARCH_CLASS = armv7 armv7s arm64
+#ARCH_CLASS = armv7 armv7s
+#ARCH_CLASS = armv7
+#ARCH_CLASS = armv6 armv7
+#ARCH_CLASS = armv6

configure/os/CONFIG_SITE.Common.ios-x86

@@ -0,0 +1,18 @@
+# CONFIG_SITE.Common.ios-x86
+#
+# $Revision-Id$
+#
+# Site-specific settings for ios-x86 target builds
+#-------------------------------------------------------
+
+# Which x86 instruction set(s) to generate code for:
+#   The iPhone Simulator now supports both 32-bit and 64-bit
+#   instruction sets since the iPhone 6 uses a 64-bit CPU.
+#
+#   Apple's compilers can build for multiple architectures,
+#   generating a Universal binary.  This is larger and takes
+#   longer to compile, but runs efficiently on all devices.
+
+#ARCH_CLASS = i386
+ARCH_CLASS = i386 x86_64
+#ARCH_CLASS = x86_64

configure/os/CONFIG_SITE.Common.iosCommon

@@ -1,24 +1,44 @@
 # CONFIG_SITE.Common.iosCommon
 #
 # $Revision-Id$
-# This file is maintained by the build community.
 #
 # Site-specific settings for Apple iOS builds
 #-------------------------------------------------------
 
-# iOS Version number
+# Minimum version of iOS the executables must run on.
+# Earlier versions may work, if XCode supports them.
 
-#IOS_VERSION = 3.2
-IOS_VERSION = 4.1
+#IOS_DEPLOYMENT_TARGET = 5.0
+#IOS_DEPLOYMENT_TARGET = 5.1
+#IOS_DEPLOYMENT_TARGET = 6.0
+#IOS_DEPLOYMENT_TARGET = 6.1
+#IOS_DEPLOYMENT_TARGET = 7.0
+#IOS_DEPLOYMENT_TARGET = 7.1
+IOS_DEPLOYMENT_TARGET = 8.0
+#IOS_DEPLOYMENT_TARGET = 8.1
+
+# Older versions of Xcode may require this SDK_DIR definition
+#SDK_DIR = $(PLATFORM_DIR)/Developer/SDKs/$(IOS_PLATFORM)$(IOS_DEPLOYMENT_TARGET).sdk
 
 
-# Most sites will want shared libraries
+# Which compiler to use:
+#   CLANG is required for Xcode 5.0 and later
+#   LLVM_GNU uses the llvm-gcc and llvm-g++ compilers
+#   GNU is needed for older versions of Xcode
 
-STATIC_BUILD=NO
-SHARED_LIBRARIES=YES
+COMPILER = CLANG
+#COMPILER = LLVM_GNU
+#COMPILER = GNU
 
 
-# Platform path, this is probably correct
+# Most sites will want to build shared libraries (which is the
+# default), but if you get an error from ld while building libCom,
+# try uncommenting this, which is needed for some compiler versions:
+
+#SHARED_LIBRARIES = NO
+
+
+# Get platform path from OS, these are usually correct:
 
 XCODE_PATH := $(shell xcode-select -print-path)
 PLATFORM_DIR = $(XCODE_PATH)/Platforms/$(IOS_PLATFORM).platform

configure/os/CONFIG_SITE.Common.linux-arm

@@ -0,0 +1,41 @@
+# CONFIG_SITE.Common.linux-arm
+#
+# $Revision-Id$
+#
+# Site Specific definitions for all linux-arm targets
+#-------------------------------------------------------
+
+# 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_DEPLIB_DIRS and PROD_DEPLIB_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.
+
+# Depending on your version of Linux you'll want one of the following
+# lines to enable command-line editing and history in iocsh.  If you're
+# not sure which, start with the top one and work downwards until the
+# build doesn't fail to link the readline library.  If none of them work,
+# comment them all out to build without readline support.
+
+# No other libraries needed (recent Fedora, Ubuntu etc.):
+#COMMANDLINE_LIBRARY = READLINE
+
+# Needs -lncurses (RHEL 5 etc.):
+#COMMANDLINE_LIBRARY = READLINE_NCURSES
+
+# Needs -lcurses (older versions)
+#COMMANDLINE_LIBRARY = READLINE_CURSES
+
+
+# It makes sense to include debugging symbols even in optimized builds
+# in case you want to attach gdb to the process or examine a core-dump.
+# This does cost disk space, but not memory as debug symbols are not
+# loaded into RAM when the binary is loaded.
+OPT_CFLAGS_YES += -g
+OPT_CXXFLAGS_YES += -g

configure/os/CONFIG_SITE.Common.linux-cris

@@ -1,5 +1,7 @@
 # CONFIG_SITE.Common.linux-cris
 #
+# $Revision-Id$
+#
 # Site Specific definitions for linux-cris target
 # Only the local epics system manager should modify this file
 
@@ -15,9 +17,21 @@
 # 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
+# Depending on your version of Linux you may want one of the following
+# lines to enable command-line editing and history in iocsh.  If you're
+# not sure which, start with the top one and work downwards until the
+# build doesn't fail to link the readline library.  If none of them work,
+# comment them all out to build without readline support.
 
+# No other libraries needed (recent Fedora, Ubuntu etc.):
 #COMMANDLINE_LIBRARY = READLINE
+
+# Needs -lncurses (RHEL 5 etc.):
+#COMMANDLINE_LIBRARY = READLINE_NCURSES
+
+# Needs -lcurses (older versions)
+#COMMANDLINE_LIBRARY = READLINE_CURSES
+
+
 OP_SYS_CFLAGS += -g
 

configure/os/CONFIG_SITE.Common.linux-microblaze

@@ -0,0 +1,14 @@
+# CONFIG_SITE.Common.linux-microblaze
+#
+# Site specific definitions for linux-microblaze target builds.
+#-------------------------------------------------------
+
+# The gnu tools for cross compiling for MicroBlaze (little endian)
+# on Linux can be downloaded from the Xilinx git server:
+#   git clone git://git.xilinx.com/xldk/microblaze_v2.0_le.git
+#
+# The result contains a .tgz file with the tool-chain in it.
+# Set GNU_DIR to point to the un-tarred tool-chain:
+
+GNU_DIR = /usr/local/vw/microblaze-2.0/microblazeel-unknown-linux-gnu
+

configure/os/CONFIG_SITE.Common.linux-x86

@@ -18,12 +18,24 @@
 #    to inform the system of the shared library location.
 
 # Depending on your version of Linux you'll want one of the following
-# lines to enable command-line editing and history support.  If you're
+# lines to enable command-line editing and history in iocsh.  If you're
 # not sure which, start with the top one and work downwards until the
-# build doesn't fail to link the readline library.  If none of them
-# work, comment them all out.
-#COMMANDLINE_LIBRARY = READLINE
-COMMANDLINE_LIBRARY = READLINE_NCURSES
+# build doesn't fail to link the readline library.  If none of them work,
+# comment them all out to build without readline support.
+
+# No other libraries needed (recent Fedora, Ubuntu etc.):
+COMMANDLINE_LIBRARY = READLINE
+
+# Needs -lncurses (RHEL 5 etc.):
+#COMMANDLINE_LIBRARY = READLINE_NCURSES
+
+# Needs -lcurses (older versions)
 #COMMANDLINE_LIBRARY = READLINE_CURSES
 
-OP_SYS_CFLAGS += -g
+
+# It makes sense to include debugging symbols even in optimized builds
+# in case you want to attach gdb to the process or examine a core-dump.
+# This does cost disk space, but not memory as debug symbols are not
+# loaded into RAM when the binary is loaded.
+OPT_CFLAGS_YES += -g
+OPT_CXXFLAGS_YES += -g

configure/os/CONFIG_SITE.Common.linux-x86_64

@@ -18,12 +18,24 @@
 #    to inform the system of the shared library location.
 
 # Depending on your version of Linux you'll want one of the following
-# lines to enable command-line editing and history support.  If you're
+# lines to enable command-line editing and history in iocsh.  If you're
 # not sure which, start with the top one and work downwards until the
-# build doesn't fail to link the readline library.  If none of them
-# work, comment them all out.
+# build doesn't fail to link the readline library.  If none of them work,
+# comment them all out to build without readline support.
+
+# No other libraries needed (recent Fedora, Ubuntu etc.):
 COMMANDLINE_LIBRARY = READLINE
+
+# Needs -lncurses (RHEL 5 etc.):
 #COMMANDLINE_LIBRARY = READLINE_NCURSES
+
+# Needs -lcurses (older versions)
 #COMMANDLINE_LIBRARY = READLINE_CURSES
 
-OP_SYS_CFLAGS += -g
+
+# It makes sense to include debugging symbols even in optimized builds
+# in case you want to attach gdb to the process or examine a core-dump.
+# This does cost disk space, but not memory as debug symbols are not
+# loaded into RAM when the binary is loaded.
+OPT_CFLAGS_YES += -g
+OPT_CXXFLAGS_YES += -g

configure/os/CONFIG_SITE.Common.linux-xscale_be

@@ -0,0 +1,12 @@
+# CONFIG_SITE.Common.linux-xscale_be
+#
+# $Revision-Id$
+#
+# Site specific definitions for linux-xscale_be target builds.
+#-------------------------------------------------------
+
+# Set GNU_DIR to point to directory containing the tool-chain
+
+# APS:
+GNU_DIR = /usr/local/vw/xscale_be
+

configure/os/CONFIG_SITE.Common.solaris-sparc

@@ -5,11 +5,12 @@
 # Site Specific definitions for solaris-sparc target
 # Only the local epics system manager should modify this file
 
-# If readline is installed uncomment the following macro definition
-# to include command-line editing and history support
-#
+# location of the Solaris Studio (was SunPro) compilers
+SPARCWORKS = /opt/SUNWspro
+#SPARCWORKS = /opt/solarisstudio12.3
 
-# Readline library provides command-line editing and history in IOC shell
+# If readline is installed, uncomment the following macro definition
+# to use it for command-line editing and history support
 #COMMANDLINE_LIBRARY = READLINE
 
 # Use stLport library instead of default Cstd library