R3.14.9-RC1

requestMessageBytesPending and flush
2) Removed callback control guards from this interface

Makefile

@@ -15,7 +15,7 @@ TOP = .
 include $(TOP)/configure/CONFIG
 
 ifeq ($(findstring YES,$(COMPAT_313) $(COMPAT_TOOLS_313)),YES)
-DIRS += config config/tools
+DIRS += config
 endif
 DIRS += configure src
 

config/CONFIG.Host.WIN32

@@ -96,13 +96,14 @@ ACC_SLIBS_NO=
 # Use of /Za would dissable DLL import/export keywords which
 # EPICS include/excludes using architecture neutral macros
 #
-# /GX support C++ exceptions
+# /EHsc support C++ exceptions
 # /GR generate RTTI information
 #
-CCC = cl /GX /GR
+CCC = cl /EHsc /GR
 CCC_NORMAL = $(CCC) /nologo /D__STDC__=0
 CCC_STRICT = $(CCC) /nologo /D__STDC__=0
 CCC_TEMPL_INST_FLAG =
+ARCH_DEP_CPPFLAGS += /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
 
 #
 # /W<N> use warning level N
@@ -269,3 +270,14 @@ LINK.cc = $(WINLINK) -nologo $(LDFLAGS) -out:$@
 # Overrides for CONFIG_COMMON default
 POSIX_CPPFLAGS_YES = 
 
+#--------------------------------------------------
+# UseManifestTool.pl checks MS Visual c++ compiler version number to
+# decide whether or not to use the Manifest Tool command to embed the
+# linker created .manifest file into a library or product target.
+# useManifestTool.pl returns 0(don't use) or 1(use).
+#
+ifeq ($(shell $(PERL) $(EPICS_BASE_TOOLS)/useManifestTool.pl),1)
+MT_DLL_COMMAND = mt.exe /manifest $@.manifest "/outputresource:$@;\#2"
+MT_EXE_COMMAND = mt.exe /manifest $@.manifest "/outputresource:$@;\#1"
+endif
+

config/CONFIG.Host.cygwin-x86

@@ -0,0 +1,13 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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. 
+#*************************************************************************
+# $Id$
+
+# cygwin-x86 is the new name for cygwin32
+-include $(EPICS_BASE)/config/CONFIG.Host.cygwin32

config/CONFIG.Host.cygwin32

@@ -20,6 +20,17 @@ include $(EPICS_BASE)/config/CONFIG.Host.UnixCommon
 
 EXE=.exe
 
+#==========================
+#These overrides remove -ansi because -ansi eliminates strdup
+GCC_ANSI = $(GCC)
+GCC_STRICT = $(GCC) -pedantic
+G++_NORMAL = $(G++) -pedantic
+G++_STRICT = $(G++) -pedantic
+
+#==========================
+#This override will eliminate warnings for old R3.13 extensions
+#GCC_WARN_YES =
+
 #==========================
 # These are overrides of ANSI and CPLUSPLUS values in CONFIG_SITE
 # since OS vendor compilers ACC and CCC are not defined here for cygwin32
@@ -32,7 +43,7 @@ SHARED_LIBRARIES=NO
 #OP_SYS_INCLUDES += /usr/local/include/g++
 #==========================
  
-ARCH_DEP_CFLAGS = -DCYGWIN32 -U_WIN32
+ARCH_DEP_CPPFLAGS = -DCYGWIN32 -U_WIN32
 ARCH_DEP_LDLIBS =
 OP_SYS_LDLIBS =
 
@@ -41,7 +52,9 @@ OP_SYS_LDLIBS =
 GCC_DEP_CFLAGS = -D_REENTRANT
 G++_DEP_CFLAGS = -D_REENTRANT
 
-POSIX_CPPFLAGS_YES = -D_POSIX_SOURCE
+#POSIX_SOURCE eliminates select()
+#POSIX_CPPFLAGS_YES = -D_POSIX_SOURCE
+POSIX_CPPFLAGS_YES = -D_POSIX_THREADS -D_POSIX_TIMERS
 
 # Runtime ldflags
 RUNTIME_LIBS =$(EPICS_BASE)/lib/$(EPICS_HOST_ARCH)\

config/CONFIG.Host.darwin-ppcx86

@@ -0,0 +1,14 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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. 
+#*************************************************************************
+# $Id$
+
+-include $(EPICS_BASE)/config/CONFIG.Host.Darwin
+OP_SYS_CFLAGS += "-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386"
+OP_SYS_LDFLAGS += "-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386"

config/CONFIG.Host.darwin-x86

@@ -0,0 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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. 
+#*************************************************************************
+# $Id$
+
+-include $(EPICS_BASE)/config/CONFIG.Host.Darwin

config/CONFIG.Host.freebsd

@@ -0,0 +1,35 @@
+#*************************************************************************
+# Copyright (c) 2006 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Id$
+#
+#  This file is maintained by the EPICS community.
+#  Sites may override these definitions in CONFIG_SITE.Host.freebsd
+ 
+OS_CLASS = freebsd
+
+# Include definitions common to all Unix archs
+include $(EPICS_BASE)/config/CONFIG.Host.UnixCommon
+
+CODE_CPPFLAGS = -D_REENTRANT
+
+POSIX_CPPFLAGS = -D_POSIX_THREADS
+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 += -Dfreebsd
+
+# Set runtime path for shared libraries
+RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_FULLPATHDIRS:%=-Wl,-rpath,%)
+
+#  Definitions used when COMMANDLINE_LIBRARY is READLINE
+LDLIBS_READLINE = -lreadline -lcurses
+
+GNU_LDLIBS_YES = -lgcc_pic
+

config/CONFIG.Host.freebsd-x86

@@ -0,0 +1,15 @@
+#*************************************************************************
+# Copyright (c) 2006 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Id$
+
+ARCH_CLASS = x86
+
+-include $(EPICS_BASE)/config/CONFIG.Host.freebsd
+
+ARCH_DEP_CPPFLAGS += -D_X86_

config/CONFIG.Host.freebsd-x86_64

@@ -0,0 +1,15 @@
+#*************************************************************************
+# Copyright (c) 2006 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Id$
+
+ARCH_CLASS = x86_64
+
+-include $(EPICS_BASE)/config/CONFIG.Host.freebsd
+
+ARCH_DEP_CPPFLAGS += -D_X86_64_

config/CONFIG.Host.linux-ppc

@@ -7,18 +7,18 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-#
 # $Id$
-#
 
-TOP=../..
+-include $(EPICS_BASE)/config/CONFIG.Host.Linux
 
-include $(TOP)/configure/CONFIG
+ARCH_CLASS = ppc
 
-ifeq ($(findstring YES,$(COMPAT_313) $(COMPAT_TOOLS_313)),YES)
-SCRIPTS_HOST += $(subst ../,,$(wildcard ../*.pl)) 
-SCRIPTS_HOST += installEpics
-endif
+ARCH_DEP_CPPFLAGS += -D_ppc_
 
-include $(TOP)/configure/RULES
+GNU_DIR = /usr
+
+GCC = $(GNU_BIN)/gcc
+G++ = $(GNU_BIN)/g++
+
+ARCH_DEP_LDLIBS = -lgcc
 

config/CONFIG.Host.linux-x86-debug

@@ -0,0 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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. 
+#*************************************************************************
+# $Id$
+
+-include $(EPICS_BASE)/config/CONFIG.Host.Linux

config/CONFIG.Host.linux-x86_64

@@ -0,0 +1,17 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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. 
+#*************************************************************************
+# $Id$
+
+-include $(EPICS_BASE)/config/CONFIG.Host.Linux
+
+ARCH_CLASS = Linux
+
+ARCH_DEP_CFLAGS = -D_X86_64_ -Dlinux
+

config/CONFIG.Host.linux-x86_64-debug

@@ -0,0 +1,13 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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. 
+#*************************************************************************
+# $Id$
+
+-include $(EPICS_BASE)/config/CONFIG.Host.linux-x86_64
+

config/CONFIG.Host.osf-alpha-gnu

@@ -0,0 +1,20 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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. 
+#*************************************************************************
+# $Id$
+
+# osf-alpha is the new name for alpha
+-include $(EPICS_BASE)/config/CONFIG.Host.alpha
+
+#==========================
+# These are overrides of ANSI and CPLUSPLUS values in CONFIG_SITE
+ANSI=GCC
+CPLUSPLUS=G++
+#==========================
+

config/CONFIG.Host.solaris

@@ -71,16 +71,19 @@ POSIX_CPPFLAGS_YES += -D__EXTENSIONS__ -mt
 
 ARCH_DEP_LDFLAGS += -mt
 
-# socket and nsl needed by libca.a
+# socket and nsl needed by libca.a when SHARED_LIBRARIES = NO
 ARCH_DEP_LDLIBS += -lsocket -lnsl
 ARCH_DEP_LDLIBS += -lposix4 -lpthread
-ARCH_DEP_LDLIBS_8 = -lCrun
-ARCH_DEP_LDLIBS_9 = -lCrun
+
+ARCH_DEP_LDLIBS_8 += -lCrun -lc -lCstd
+ARCH_DEP_LDLIBS_9 += -lCrun -lc -lCstd
+ARCH_DEP_LDLIBS_10 += -lCrun -lc -lCstd
 ARCH_DEP_LDLIBS += $(ARCH_DEP_LDLIBS_$(SOLARIS_VERSION))
 
 #Allows R3.13 built extensions to load R3.14 shared libs
 SYS_DLL_LIBS_solaris_8 = Crun
 SYS_DLL_LIBS_solaris_9 = Crun
+SYS_DLL_LIBS_solaris_10 = Crun
 SYS_DLL_LIBS_solaris += posix4 pthread $(SYS_DLL_LIBS_solaris_$(SOLARIS_VERSION))
 
 # Runtime ldflags

config/CONFIG.Host.solaris-sparc64

@@ -0,0 +1,18 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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. 
+#*************************************************************************
+# $Id$
+
+# solaris-sparc is the new name for solaris
+-include $(EPICS_BASE)/config/CONFIG.Host.solaris
+
+ARCH_DEP_CFLAGS += -xarch=generic64
+ARCH_DEP_CXXFLAGS += -xarch=generic64
+ARCH_DEP_LDFLAGS += -xarch=generic64
+

config/CONFIG.Host.solaris-sparc64-gnu

@@ -0,0 +1,18 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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. 
+#*************************************************************************
+# $Id$
+
+# solaris-sparc is the new name for solaris
+-include $(EPICS_BASE)/config/CONFIG.Host.solarisGnu
+
+ARCH_DEP_CFLAGS += -mcpu=v9 -m64
+ARCH_DEP_CXXFLAGS += -mcpu=v9 -m64
+ARCH_DEP_LDFLAGS += -mcpu=v9 -m64
+

config/CONFIG.Host.solaris-x86-gnu

@@ -7,7 +7,7 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-# CONFIG.Host.solaris-x86
+# CONFIG.Host.solaris-x86-gnu
 #
 #  This file is maintained by the EPICS community.
 #  Sites may override these definitions in CONFIG_SITE.Host.solaris-x86

config/CONFIG.Host.solarisGnu

@@ -12,20 +12,7 @@
 #  This file is maintained by the EPICS community.
 #  Sites may override these definitions in CONFIG_SITE.Host.solarisGnu
 
-ARCH_CLASS = solaris
-
-# Include definitions common to all Unix archs
-include $(EPICS_BASE)/config/CONFIG.Host.UnixCommon
-
-#
-# required by sun's C++ compiler
-#
-AR = ar
-_AR = $(AR) $(ARFLAGS)
-G++_AR = $(_AR)
-CCC_AR = $(CCC) -xar -o
-ARCMD = $($(CPLUSPLUS)_AR) $@
-RANLIB =
+include $(EPICS_BASE)/config/CONFIG.Host.solaris
 
 #==========================
 # These are overrides of ANSI and CPLUSPLUS values in CONFIG_SITE
@@ -33,25 +20,3 @@ ANSI=GCC
 CPLUSPLUS=G++
 #==========================
 
-SOLARIS_VERSION = $(subst 5.,,$(shell uname -r))
-ARCH_DEP_CPPFLAGS += -DSOLARIS=$(SOLARIS_VERSION) 
-POSIX_CPPFLAGS_YES += -D__EXTENSIONS__
-
-ARCH_DEP_LDFLAGS += -mt
-
-# socket and nsl needed by libca.a
-ARCH_DEP_LDLIBS += -lsocket -lnsl
-ARCH_DEP_LDLIBS += -lposix4 -lpthread
-ARCH_DEP_LDLIBS_8 = -lCrun
-ARCH_DEP_LDLIBS_9 = -lCrun
-ARCH_DEP_LDLIBS += $(ARCH_DEP_LDLIBS_$(SOLARIS_VERSION))
-
-#Allows R3.13 built extensions to load R3.14 shared libs
-SYS_DLL_LIBS_solaris_8 = Crun
-SYS_DLL_LIBS_solaris_9 = Crun
-SYS_DLL_LIBS_solaris += posix4 pthread $(SYS_DLL_LIBS_solaris_$(SOLARIS_VERSION))
-
-# Runtime ldflags
-RUNTIME_LDFLAGS =$(addprefix -R,$(EPICS_BASE)/lib/$(EPICS_HOST_ARCH)\
- $(EPICS_EXTENSIONS)/lib/$(EPICS_HOST_ARCH))
-

config/CONFIG.Host.win32-x86-cygwin

@@ -0,0 +1,62 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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. 
+#*************************************************************************
+# $Id$
+#
+#  This file is maintained by the EPICS community.
+#  Sites may override these definitions in CONFIG_SITE.Host.win32-x86-cygwin
+
+# Include definitions common to all Unix archs
+include $(EPICS_BASE)/config/CONFIG.Host.UnixCommon
+
+EXE = .exe
+
+SHARED_LIBRARIES = NO
+ 
+ARCH_CLASS = WIN32
+
+AR = ar -rc
+ARCMD = $(AR) $@
+RANLIB = ranlib -t
+
+ANSI=GCC
+CPLUSPLUS=G++
+
+# Dont use -ansi: -ansi eliminates strdup and _tempnam
+GCC_ANSI = $(GCC)
+GCC_STRICT = $(GCC) -pedantic
+G++_NORMAL = $(G++) -pedantic
+G++_STRICT = $(G++) -pedantic
+
+# Dont use -fPIC: with -fPIC we get
+# "warning: -fPIC ignored for target (all code is position independent) "
+GCC_DEP_CFLAGS =
+G++_DEP_CFLAGS =
+
+OP_SYS_CFLAGS =
+OP_SYS_CPPFLAGS = -mno-cygwin
+OP_SYS_CXXFLAGS += -D__cplusplus
+OP_SYS_LDFLAGS += -mno-cygwin
+
+POSIX_CPPFLAGS_YES = 
+
+# With no-cygwin option:
+#       compiler defines _X86_ 1
+#       compiler defines __MSVCRT__ 1
+#       compiler defines __MINGW32__ 1
+#       compiler defines __WIN32 1
+#       compiler defines __WIN32__ 1
+#       compiler defines _WIN32 1
+#       compiler defines WIN32 1
+#       compiler defines WINNT 1
+#       compiler does not define  __unix __unix__ unix
+#       compiler does not define  __CYGWIN__ __CYGWIN32__
+
+ARCH_DEP_LDLIBS = -lws2_32 -ladvapi32 -luser32 -lkernel32 -lwinmm
+

config/CONFIG.Host.win32-x86-debug

@@ -0,0 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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. 
+#*************************************************************************
+# $Id$
+
+-include $(EPICS_BASE)/config/CONFIG.Host.WIN32

config/CONFIG.Host.win32-x86-mingw

@@ -0,0 +1,58 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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. 
+#*************************************************************************
+# $Id$
+#
+#  This file is maintained by the EPICS community.
+#  Sites may override these definitions in CONFIG_SITE.Host.win32-x86-mingw
+ 
+# Include definitions common to all Unix archs
+include $(EPICS_BASE)/config/CONFIG.Host.UnixCommon
+
+EXE = .exe
+
+SHARED_LIBRARIES = NO
+
+ARCH_CLASS = WIN32
+
+AR = ar -rc
+ARCMD = $(AR) $@
+RANLIB = ranlib -t
+
+ANSI=GCC
+CPLUSPLUS=G++
+
+# Compiler defines _X86_ 1
+
+# Compiler defines __MSVCRT__ 1
+# Compiler defines __MINGW32__ 1
+# Compiler defines __WIN32 1
+# Compiler defines __WINNT 1
+# Compiler defines __WINNT__ 1
+# Compiler defines __WIN32__ 1
+# Compiler defines _WIN32 1
+# Compiler defines WIN32 1
+# Compiler defines WINNT 1
+# Compiler does not define  __unix __unix__ unix
+
+OP_SYS_CFLAGS =
+OP_SYS_CXXFLAGS += -D__cplusplus
+
+GCC_DEP_CFLAGS =
+G++_DEP_CFLAGS =
+
+POSIX_CPPFLAGS_YES = 
+
+ARCH_DEP_LDLIBS = -lws2_32 -ladvapi32 -luser32 -lkernel32 -lwinmm
+
+# Remove -ansi compile option for gcc (does not allow c++ type comments).
+GCC_ANSI = $(GCC)
+GCC_STRICT = $(GCC) -pedantic
+G++_NORMAL = $(G++) -pedantic
+G++_STRICT = $(G++)  -pedantic

config/CONFIG_BASE

@@ -52,6 +52,9 @@ EPICS_BASE = $(TOP)
 # EPICS include config file
 include $(EPICS_BASE)/config/CONFIG
 
+-include $(EPICS_BASE)/configure/RELEASE
+-include $(EPICS_BASE)/configure/RELEASE.$(EPICS_HOST_ARCH)
+
 ifdef INSTALL_LOCATION_BASE
 INSTALL_LOCATION = $(INSTALL_LOCATION_BASE)
 endif

config/CONFIG_COMMON

@@ -90,7 +90,7 @@ GCC_STRICT = $(GCC) -ansi -pedantic
 GCC_TRAD = $(GCC)
 GCC_DEP_CFLAGS = -fPIC -D_REENTRANT
 
-GCC_WARN_YES = -Wall -Wtraditional -Wmissing-prototypes -Wstrict-prototypes
+GCC_WARN_YES = -Wall -Wmissing-prototypes -Wstrict-prototypes
 GCC_WARN_NO = -w
 GCC_OPT_YES = -O3
 GCC_OPT_NO = -g
@@ -244,7 +244,7 @@ LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS)\
 LDLIBS = $(TARGET_LDLIBS) $(USR_LDLIBS) $(STATIC_LDLIBS) $(ARCH_DEP_LDLIBS)\
   $(OP_SYS_LDLIBS) $(POSIX_LDLIBS)
 
-CPPFLAGS += $(TARGET_CPPFLAGS) $(USR_CPPFLAGS) $(ARCH_DEP_CPPFLAGS) $(POSIX_CPPFLAGS)
+CPPFLAGS += $(TARGET_CPPFLAGS) $(USR_CPPFLAGS) $(ARCH_DEP_CPPFLAGS) $(POSIX_CPPFLAGS)  $(OP_SYS_CPPFLAGS)
 
 CPPSNCFLAGS = $(INCLUDES)
 

config/CONFIG_COMPAT

@@ -21,8 +21,9 @@ ARCH_solarisNonshared = solaris-sparc-nonshared
 ARCH_solaris = solaris-sparc
 ARCH_sun4 = sun4-sparc
 ARCH_Linux = linux-x86
+ARCH_freebsd = freebsd-x86_64
 ARCH_WIN32 = win32-x86
-ARCH_hp700 = hpux-m68k
+ARCH_hp700 = hpux-parisc
 ARCH_alpha = osf-alpha
 ARCH_Borland = win32-x86-borland
 ARCH_cygwin32 = cygwin-x86

config/CONFIG_HOST_ARCH.Darwin

@@ -9,7 +9,6 @@
 #*************************************************************************
 #  CONFIG_HOST_ARCH.Darwin
 #
-# Override values in CONFIG.Vx
 
 # Include definitions common to all Unix archs
 include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon

config/CONFIG_HOST_ARCH.Linux

@@ -9,7 +9,6 @@
 #*************************************************************************
 #  CONFIG_HOST_ARCH.Linux
 #
-# Override values in CONFIG.Vx
 
 # Include definitions common to all Unix archs
 include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon

config/CONFIG_HOST_ARCH.alpha

@@ -9,7 +9,6 @@
 #*************************************************************************
 #  CONFIG_HOST_ARCH.alpha
 #
-# Override values in CONFIG.Vx
 
 # Include definitions common to all Unix archs
 include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon

config/CONFIG_HOST_ARCH.cygwin-x86

@@ -0,0 +1,23 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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. 
+#*************************************************************************
+# CONFIG_HOST_ARCH.cygwin-x86
+#
+# This file is maintained by the EPICS community.
+
+# Include definitions common to all Unix archs
+-include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon
+
+EXE=.exe
+HOSTEXE=.exe
+
+TORNADO=YES
+
+WIND_HOST_TYPE = x86-win32
+

config/CONFIG_HOST_ARCH.darwin-ppcx86

@@ -0,0 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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. 
+#*************************************************************************
+# $Id$
+
+-include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.Darwin

config/CONFIG_HOST_ARCH.darwin-x86

@@ -0,0 +1,12 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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. 
+#*************************************************************************
+# $Id$
+
+-include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.Darwin

config/CONFIG_HOST_ARCH.freebsd-x86_64

@@ -0,0 +1,11 @@
+#*************************************************************************
+# Copyright (c) 2006 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+# $Id$
+
+-include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon

config/CONFIG_HOST_ARCH.hp700

@@ -9,7 +9,6 @@
 #*************************************************************************
 #  CONFIG_HOST_ARCH.hp700
 #
-# Override values in CONFIG.Vx
 
 # Include definitions common to all Unix archs
 include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon

config/CONFIG_HOST_ARCH.linux-ppc

@@ -0,0 +1,14 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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. 
+#*************************************************************************
+# $Id$
+
+-include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.Linux
+
+WIND_HOST_TYPE = ppc-linux

config/CONFIG_HOST_ARCH.linux-x86-debug

@@ -0,0 +1,15 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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. 
+#*************************************************************************
+# $Id$
+
+# linux-x86 is the new name for linux
+-include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.Linux
+
+HOST_OPT = NO

config/CONFIG_HOST_ARCH.linux-x86_64

@@ -0,0 +1,15 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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. 
+#*************************************************************************
+# $Id$
+
+# Include definitions common to all Unix archs
+include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon
+
+WIND_HOST_TYPE = x86-linux2

config/CONFIG_HOST_ARCH.linux-x86_64-debug

@@ -0,0 +1,15 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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. 
+#*************************************************************************
+# $Id$
+
+# Include definitions common to all Unix archs
+include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.linux-x86_64
+
+HOST_OPT = NO

config/CONFIG_HOST_ARCH.sgi

@@ -9,7 +9,6 @@
 #*************************************************************************
 #  CONFIG_HOST_ARCH.sgi
 #
-# Override values in CONFIG.Vx
 
 # Include definitions common to all Unix archs
 include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon

config/CONFIG_HOST_ARCH.solaris

@@ -8,8 +8,6 @@
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 #  CONFIG_HOST_ARCH.solaris
-#
-# Override values in CONFIG.Vx
 
 # Include definitions common to all Unix archs
 include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon

config/CONFIG_HOST_ARCH.solaris-sparc-debug

@@ -11,3 +11,4 @@
 
 -include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.solaris
 
+HOST_OPT = NO

config/CONFIG_HOST_ARCH.solaris-sparc64

@@ -0,0 +1,13 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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. 
+#*************************************************************************
+# $Id$
+
+# solaris-sparc is the new name for solaris
+-include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.solaris

config/CONFIG_HOST_ARCH.solaris-sparc64-gnu

@@ -0,0 +1,13 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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. 
+#*************************************************************************
+#  $Id$
+
+-include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.solarisGnu
+

config/CONFIG_HOST_ARCH.solaris-x86

@@ -8,8 +8,6 @@
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 #  CONFIG_HOST_ARCH.solaris-x86
-#
-# Override values in CONFIG.Vx
 
 # Include definitions common to all Unix archs
 include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon

config/CONFIG_HOST_ARCH.solarisGnu

@@ -1,6 +1,5 @@
 #  CONFIG_HOST_ARCH.solarisGnu
 #
-# Override values in CONFIG.Vx
 
 # Include definitions common to all Unix archs
 include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon

config/CONFIG_HOST_ARCH.sun4

@@ -9,7 +9,6 @@
 #*************************************************************************
 #  CONFIG_HOST_ARCH.sun4
 #
-# Override values in CONFIG.Vx
 
 # Include definitions common to all Unix archs
 include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon

config/CONFIG_HOST_ARCH.win32-x86-cygwin

@@ -0,0 +1,20 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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. 
+#*************************************************************************
+#  $Id$
+#
+# Override values in CONFIG_SITE_HOST_ARCH.win32-x86-cygwin
+
+# Include definitions common to all Unix archs
+include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon
+
+HOSTEXE=.exe
+
+WIND_HOST_TYPE = x86-win32
+

config/CONFIG_HOST_ARCH.win32-x86-debug

@@ -0,0 +1,14 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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. 
+#*************************************************************************
+# $Id$
+
+-include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.WIN32
+
+HOST_OPT = NO

config/CONFIG_HOST_ARCH.win32-x86-mingw

@@ -0,0 +1,29 @@
+#*************************************************************************
+# Copyright (c) 2002 The University of Chicago, 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. 
+#*************************************************************************
+#  $Id$
+#
+# Override values in CONFIG_SITE_HOST_ARCH.win32-x86-mingw
+
+# Include definitions common to all Unix archs
+include $(EPICS_BASE)/config/CONFIG_HOST_ARCH.UnixCommon
+
+EXE=.exe
+HOSTEXE=.exe
+
+CP   =$(PERL) $(EPICS_BASE_TOOLS)/cp.pl
+MV   =$(PERL) $(EPICS_BASE_TOOLS)/mv.pl
+RM   =$(PERL) $(EPICS_BASE_TOOLS)/rm.pl -f
+MKDIR=$(PERL) $(EPICS_BASE_TOOLS)/mkdir.pl
+RMDIR=$(PERL) $(EPICS_BASE_TOOLS)/rm.pl -rf
+CHMOD=echo
+ECHO=echo
+
+WIND_HOST_TYPE = x86-win32
+

config/CONFIG_SITE.Host.darwin-x86

@@ -0,0 +1,5 @@
+# $Id$
+
+-include $(EPICS_BASE)/config/CONFIG_SITE.Host.Darwin
+
+SHARED_LIBRARIES=NO

config/CONFIG_SITE.Host.solaris-sparc64

@@ -0,0 +1,4 @@
+# $Id$
+
+# solaris-sparc is the new name for solaris
+-include $(EPICS_BASE)/config/CONFIG_SITE.Host.solaris

config/CONFIG_SITE.Vx.ppc604

@@ -1,3 +1,4 @@
+#  CONFIG_SITE.Vx.ppc604
 
 # APS override of tornado directory for ppc
 #VX_DIR_YES = /usr/local/vw/tornado101ppc2

config/Makefile

@@ -20,6 +20,9 @@ INSTALL_CONFIG = $(INSTALL_LOCATION)/config
 
 CONFIGS += $(subst ../,,$(wildcard ../CONFIG*))
 CONFIGS += $(subst ../,,$(wildcard ../RULES*))
+
+CONFIGS += $(subst ../,,$(wildcard ../tools/*.pl))
+
 endif
 
 include $(TOP)/configure/RULES

config/RULES.Host

@@ -427,6 +427,7 @@ else
 $(PRODNAME): $(PRODNAME_OBJS) $(PRODNAME_RESS)
 	@$(RM) $@
 	$(PRODNAME_LINKER) $(PRODNAME_OBJS) $(PRODNAME_RESS) $(LDLIBS)
+	$(MT_EXE_COMMAND)
 
 endif
 endif  # ifdef PRODNAME_SRCS
@@ -738,6 +739,7 @@ $(DLL_LINK_LIBNAME) $(SHRLIBNAME): $(LIBOBJS) $(LIBNAME_RESS)
 else
 $(DLL_LINK_LIBNAME) $(SHRLIBNAME): $(LIBOBJS) $(LIBNAME_RESS)
 	$(LINK.shrlib) $(LIBOBJS) $(DLL_LDLIBS) $(LIBNAME_RESS)
+	$(MT_DLL_COMMAND)
 
 endif
 ifdef BORLANDC

config/tools/useManifestTool.pl

@@ -0,0 +1,31 @@
+eval 'exec perl -S -w  $0 ${1+"$@"}'  # -*- Mode: perl -*-
+        if 0; 
+
+#
+# Use MS Visual C++ compiler version number to determine if
+# we want to use the Manifest Tool (status=1) or not (status=0)
+#
+# VC compiler versions >= 14.00 will have status=1
+# VC compiler versions 10.00 - 13.10 will have status=0
+# EPICS builds with older VC compilers is not supported
+#
+
+my $versionString=`cl 2>&1`;
+
+if ($versionString =~ m/Version 14./) {
+ $status=1;
+} elsif ($versionString =~ m/Version 13.10/){
+ $status=0;
+} elsif ($versionString =~ m/Version 13.0/){
+ $status=0;
+} elsif ($versionString =~ m/Version 12./){
+ $status=0;
+} elsif ($versionString =~ m/Version 11./){
+ $status=0;
+} elsif ($versionString =~ m/Version 10./){
+ $status=0;
+} else {
+ $status=1;
+}
+print "$status\n";
+exit;

configure/CONFIG

@@ -17,12 +17,19 @@
 #  Common build definitions
 #
 
-CONFIG ?= $(TOP)/configure
+ifndef EPICS_BASE
+EPICS_BASE = $(INSTALL_LOCATION)
+CONFIG = $(TOP)/configure
+BASE_TOP=YES
+else
+CONFIG = $(EPICS_BASE)/configure
+endif
 
 -include $(CONFIG)/os/CONFIG_COMPAT
 
 -include $(CONFIG)/RELEASE
 -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)
@@ -33,12 +40,15 @@ include $(CONFIG)/CONFIG_COMMON
 #  Base-specific build options
 #
 include $(CONFIG)/CONFIG_BASE
-include $(CONFIG)/CONFIG_BASE_VERSION
 
 #  Site-specific build options
 #
 include $(CONFIG)/CONFIG_SITE
 
+#  Version numbering
+#
+include $(CONFIG)/CONFIG_BASE_VERSION
+
 #  Host architecture specific definitions
 #
 include $(CONFIG)/os/CONFIG.$(EPICS_HOST_ARCH).Common

configure/CONFIG.CrossCommon

@@ -27,7 +27,7 @@ CROSS_INCLUDES = $(addprefix -I,$(GNU_TARGET_INCLUDE_DIR))
 CROSS_LDFLAGS = $(addprefix -L,$(GNU_TARGET_LIB_DIR))
 
 CMPLR_PREFIX_CROSS=$(addsuffix -,$(GNU_TARGET))
-CMPLR_PREFIX=$(CMPLR_PREFIX_$(BUILD_CLASSS))
+CMPLR_PREFIX=$(CMPLR_PREFIX_$(BUILD_CLASS))
 
 # All cross builds use the gnu compiler
 include $(CONFIG)/CONFIG.gnuCommon

configure/CONFIG_ADDONS

@@ -51,9 +51,9 @@
 #    PROD          products to build and install
 #    PROD_HOST     products to build and install
 #    PROD_IOC      products to build and install
-#    TESTPROD      products to build and install
-#    TESTPROD_HOST products to build and install
-#    TESTPROD_IOC  products to build and install
+#    TESTPROD      products to build
+#    TESTPROD_HOST products to build
+#    TESTPROD_IOC  products to build
 #    LIBRARY       products to build and install
 #    LIBRARY_HOST  products to build and install
 #    LIBRARY_IOC   products to build and install
@@ -62,6 +62,9 @@
 #    SCRIPTS       scripts and install
 #    SCRIPTS_HOST  host system scripts to install
 #    SCRIPTS_IOC   ioc system scripts to install
+#    TESTSCRIPTS       scripts
+#    TESTSCRIPTS_HOST  host system scripts
+#    TESTSCRIPTS_IOC   ioc system scripts
 #    OBJS          object files to build and install
 #    OBJS_HOST     host system object files to build and install
 #    OBJS_IOC      ioc system object files to build and install
@@ -493,6 +496,33 @@ SCRIPTS_HOST+=$(SCRIPTS_HOST_DEFAULT)
 endif
 endif
 
+#
+#	concat specific scripts
+#
+ifneq ($(strip $(TESTSCRIPTS_$(OS_CLASS))),)
+TESTSCRIPTS += $(subst -nil-,,$(TESTSCRIPTS_$(OS_CLASS)))
+else
+ifdef TESTSCRIPTS_DEFAULT
+TESTSCRIPTS += $(TESTSCRIPTS_DEFAULT)
+endif
+endif
+
+ifneq ($(strip $(TESTSCRIPTS_IOC_$(OS_CLASS))),)
+TESTSCRIPTS_IOC+=$(subst -nil-,,$(TESTSCRIPTS_IOC_$(OS_CLASS)))
+else
+ifneq (,$(strip $(TESTSCRIPTS_IOC_DEFAULT)))
+TESTSCRIPTS_IOC+=$(TESTSCRIPTS_IOC_DEFAULT)
+endif
+endif
+
+ifneq ($(strip $(TESTSCRIPTS_HOST_$(OS_CLASS))),)
+TESTSCRIPTS_HOST+=$(subst -nil-,,$(TESTSCRIPTS_HOST_$(OS_CLASS)))
+else
+ifneq (,$(strip $(TESTSCRIPTS_HOST_DEFAULT)))
+TESTSCRIPTS_HOST+=$(TESTSCRIPTS_HOST_DEFAULT)
+endif
+endif
+
 #
 #	concat specific resource files
 #

configure/CONFIG_BASE

@@ -8,10 +8,6 @@
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 
-ifndef EPICS_BASE
-EPICS_BASE = $(INSTALL_LOCATION)
-endif
-
 #---------------------------------------------------------------
 # Epics base directories
 
@@ -32,16 +28,16 @@ EPICS_BASE_IOC_LIBS += dbIoc registryIoc dbStaticIoc ca Com
 #---------------------------------------------------------------
 # Epics base Host libraries 
 
-EPICS_BASE_HOST_LIBS += cas gdd iocsh asHost dbStaticHost registryIoc
+EPICS_BASE_HOST_LIBS += cas gdd iocshHost asHost dbStaticHost registryIoc
 EPICS_BASE_HOST_LIBS += ca Com
 
 #---------------------------------------------------------------
 # Version number for base shared libraries (and win32 products)
 
-ifeq ($(EPICS_BASE),$(TOP))
+ifdef BASE_TOP
 SHRLIB_VERSION = $(EPICS_VERSION).$(EPICS_REVISION)
 PROD_VERSION = $(EPICS_VERSION).$(EPICS_REVISION)
-endif # EPICS_BASE
+endif # BASE_TOP
 
 #---------------------------------------------------------------
 # Base c preprocessor flags

configure/CONFIG_BASE_VERSION

@@ -1,11 +1,10 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2006 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. 
 #*************************************************************************
 #
 #  $Id$
@@ -24,14 +23,14 @@ EPICS_VERSION = 3
 EPICS_REVISION = 14
 
 # This part may contain letters, eg 0beta1
-EPICS_MODIFICATION = 8
+EPICS_MODIFICATION = 9
 
 # Not included if zero
-EPICS_PATCH_LEVEL = 1
+EPICS_PATCH_LEVEL = 0
 
 # This will be -CVS or empty at an official release point
-#EPICS_CVS_SNAPSHOT=-CVS
-EPICS_CVS_SNAPSHOT=
+EPICS_CVS_SNAPSHOT=-RC1
+#EPICS_CVS_SNAPSHOT=
 
 # No changes should be needed below here
 

configure/CONFIG_COMMON

@@ -37,15 +37,20 @@ BUILD_ARCHS = $(EPICS_HOST_ARCH) $(CROSS1) $(CROSS2)
 # otherwise override this in os/CONFIG_SITE.<host_arch>.Common
 PERL=perl
 
+#-------------------------------------------------------
+# dbst based database optimization default
+DB_OPT = NO
+
 #-------------------------------------------------------
 # Check configure/RELEASE file for consistency
 CHECK_RELEASE_YES = checkRelease
 CHECK_RELEASE_NO =
+CHECK_RELEASE_WARN = warnRelease
 
 #-------------------------------------------------------
 # Directories
 
-INSTALL_LOCATION            ?= $(TOP)
+INSTALL_LOCATION            = $(TOP)
 TOOLS                       = $(CONFIG)/tools
 
 INSTALL_LOCATION_LIB        = $(INSTALL_LOCATION)/lib
@@ -105,6 +110,8 @@ OBJ = .
 RES = .
 CMPLR_SUFFIX=
 CMPLR_PREFIX=
+LIB_PREFIX=
+SHRLIB_PREFIX= $(LIB_PREFIX)
 
 #-------------------------------------------------------
 # tools for installing libraries and products
@@ -223,7 +230,7 @@ TARGET_LDFLAGS = $($*_LDFLAGS)
 # Level of ansi conformance flags
 CONFORM_CPPFLAGS = $(CONFORM_CPPFLAGS_$(CMPLR))
 CONFORM_CFLAGS = $(CONFORM_CFLAGS_$(CMPLR))
-CONFORM_CXXFLAGS = $(CONFORM_CXXFLAGS_$(CMPLR))
+CONFORM_CXXFLAGS = $(CONFORM_CXXFLAGS_$(CXXCMPLR))
 
 # Warnings flags
 WARN_CFLAGS = $(WARN_CFLAGS_$($(BUILD_CLASS)_WARN))
@@ -305,8 +312,7 @@ PREPROCESS.cpp = $(CPP) $(CPPFLAGS) $(INCLUDES) $< > $@
 # Depends command
 
 HDEPENDS_FLAGS =
-# Use only dependancies from current top tree
-HDEPENDS_INCLUDES = $(filter .%,$(subst -I,,$(INCLUDES)))
+HDEPENDS_INCLUDES = $(subst -I,,$(INCLUDES))
 HDEPENDSFLAGS = -m $*$(DEP) $(HDEPENDS_INCLUDES) $@ $<
 HDEPENDS_CMD_YES   = -$(MKMF) $(HDEPENDS_FLAGS) $(HDEPENDSFLAGS)
 HDEPENDS_CMD_NO   = echo ""

configure/CONFIG_SITE

@@ -1,36 +1,32 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2006 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.
 #*************************************************************************
 #
 #  $Id$
 #
-#  CONFIG_SITE  - config file
-#	by Matthew Needes and Mike Bordua
-#
-#  This file is to be modified by the build system manager
-#	only.
+#  CONFIG_SITE  - Global site configuration file
 #
 
-
-#  The host architecture performing the build,
-#	i.e.: the arch running DCT/getrel/etc.
-#       <operating system>-<architecture>[-<alternate compiler>]
+#  The host architecture performing the build, in the form
+#       <operating system>-<architecture>[-<toolset>]
 #
 #  Currently Supporting:
-#	aix-ppc                (HP compiler used for host builds)
+#	aix-ppc                (IBM compiler used for host builds)
 #	aix-ppc-gnu            (GNU compiler used for host builds)
 #	cygwin-x86             (cygwin compiler used for host builds)
-#	darwin-ppc
+#	darwin-ppc             (PowerPC based Apple running OSX)
+#	darwin-x86             (Intel based Apple running OSX)
+#	darwin-ppcx86          (Universal binaries for both CPUs)
+#	freebsd-x86            (GNU compiler used for host builds)
+#	freebsd-x86_64         (GNU compiler used for host builds)
 #	hpux-parisc            (HP compiler used for host builds)
 #	hpux-parisc-gnu        (GNU compiler used for host builds)
 #	linux-ppc              (GNU compiler used for host builds)
-#	linux-ppc-bgl
 #	linux-x86              (GNU compiler used for host builds)
 #	linux-x86_64           (GNU compiler used for host builds)
 #	linux-x86-borland      (Borland C++ compiler used for host builds)
@@ -41,9 +37,9 @@
 #	solaris-x86            (sun compiler used for host builds)
 #	solaris-x86-gnu        (GNU compiler used for host builds)
 #	win32-x86              (MS Visual C++ compiler used for host builds)
-#	win32-x86_mingw        (MinGW compiler used for host builds)
+#	win32-x86-mingw        (MinGW compiler used for host builds)
 #	win32-x86-borland      (Borland C++ compiler used for host builds)
-#	win32-x86-cygwin       (cygwin GNU compiler used for host builds)
+#	win32-x86-cygwin       (WIN32 API with cygwin GNU compiler used for host builds)
 
 #  Debugging builds 
 #	linux-x86-debug        (GNU compiler with -g option for host builds)
@@ -55,7 +51,7 @@
 #  EPICS_HOST_ARCH is a required environment variable
 #  Do not set EPICS_HOST_ARCH in this file. 
 #  Use base/startup files to set EPICS_HOST_ARCH or 
-#  set EPICS_HOST_ARCH on the GNU make command line.
+#  provide EPICS_HOST_ARCH on the GNU make command line.
 
 #  The cross-compiler architectures to build EPICS for
 #
@@ -65,7 +61,7 @@
 #       linux-586     (linux-x86 host)
 #       linux-686     (linux-x86 host)
 #       linux-athlon  (linux-x86 host)
-#       linuxRT-mvme2100  (linux-x86 host)
+#       linux-arm
 #       vxWorks-486
 #       vxWorks-68040
 #       vxWorks-68040lc
@@ -75,8 +71,8 @@
 #       vxWorks-ppc603_long
 #       vxWorks-ppc604
 #       vxWorks-ppc604_long
-#       vxWorks6-mv2100
-#       vxWorks6-mv5100
+#       vxWorks-ppc604_altivec
+#       vxWorks-mpc8540
 #       RTEMS-gen68360
 #       RTEMS-mcp750
 #       RTEMS-mvme167
@@ -86,8 +82,6 @@
 #       RTEMS-psim
 #       RTEMS-uC5282
 #
-#  Debugging builds 
-#       vxWorks-68040-debug
 
 # Definitions of CROSS_COMPILER_TARGET_ARCHS in
 # configure/os/CONFIG_SITE.<host>.Common files will
@@ -158,7 +152,7 @@ CROSS_WARN=YES
 #  NOTE: Set to YES only if you have existing R3.13 extensions to be
 #  built with this base
 #
-COMPAT_TOOLS_313=NO
+#COMPAT_TOOLS_313=YES
 
 #  Create and/or install files for R3.13 ioc application and extension builds?
 #  must be either YES or NO
@@ -169,7 +163,9 @@ COMPAT_TOOLS_313=NO
 COMPAT_313=NO
 
 #  Installation directory
-#Note: INSTALL_LOCATION definition moved to configure/RELEASE file
+# If you don't want to install into $(TOP) dir then
+# define INSTALL_LOCATION here
+#INSTALL_LOCATION=<fullpathname>
 
 # Use POSIX thread priority scheduling (YES or NO)
 USE_POSIX_THREAD_PRIORITY_SCHEDULING = NO

configure/CONFIG_SITE_ENV

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

configure/RELEASE

@@ -9,17 +9,13 @@
 #*************************************************************************
 # RELEASE: Define location of external EPICS products
 
+# Define INSTALL_LOCATION in CONFIG_SITE
+
 # VX_DIR definition now in os/CONFIG_SITE.Common.vxWorksCommon
 # RTEMS_BASE (and RTEMS_VERSION) now in os/CONFIG_SITE.Common.RTEMS
 
 # NB: Settings in RELEASE files can be overridden in files named
-#   RELEASE.$(EPICS_HOST_ARCH)
-#   RELEASE.Common.$(OS_CLASS)Common
+#   RELEASE.$(EPICS_HOST_ARCH).Common
 #   RELEASE.Common.$(T_A)
 #   RELEASE.$(EPICS_HOST_ARCH).$(T_A)
 
-# If you don't want to install into $(TOP) dir then 
-# define INSTALL_LOCATION here
-#INSTALL_LOCATION=<fullpathname>
-#INSTALL_LOCATION=/home/phoebus/JBA/install
-

configure/RULES.Db

@@ -78,7 +78,7 @@ COMMON_DBDINC += $(addprefix $(COMMON_DIR),$(HINC))
 DBDDEPENDS_FILES += $(addsuffix $(DEP),$(COMMON_DBDS) \
                     $(COMMON_DBDINC) $(COMMON_DBS))
 
-DBDDEPENDS_FLAGS = $(filter .%,$(subst -I,,$(filter-out -S%,$(DBDFLAGS))))
+DBDDEPENDS_FLAGS = $(subst -I,,$(filter-out -S%,$(DBDFLAGS)))
 DBDDEPENDS_CMD = -$(MKMF) -m $@$(DEP) $(DBDDEPENDS_FLAGS) $@ $<
 
 MAKEDBDEPENDS = $(PERL) $(TOOLS)/makeDbDepends.pl

configure/RULES_ARCHS

@@ -1,11 +1,10 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2006 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. 
 #*************************************************************************
 #
 # $Id$
@@ -20,8 +19,9 @@ rebuild: clean install
 ACTIONS = inc
 ACTIONS += build
 ACTIONS += install
-ACTIONS += buildInstall 
-ACTIONS += browse 
+ACTIONS += buildInstall
+ACTIONS += browse
+ACTIONS += runtests
 
 actionPart = $(word 1, $(subst $(DIVIDER), ,$@))
 archPart = $(word 2, $(subst $(DIVIDER), ,$@))
@@ -41,7 +41,7 @@ $(BUILD_ARCHS) : % : O.% O.Common
 
 $(ACTIONS):%: $(foreach arch, $(BUILD_ARCHS), %$(DIVIDER)$(arch))
 
-$(buildDirs): 
+$(buildDirs):
 	$(PERL) $(TOOLS)/makeMakefile.pl $@ $(TOP)/..
 
 O.Common:
@@ -54,14 +54,19 @@ O.Common:
 targetReleaseFiles = $(wildcard $(foreach arch, $(BUILD_ARCHS), \
 		$(TOP)/configure/RELEASE.Common.$(arch) \
 		$(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).$(arch)))
+
 checkReleaseTargets = $(addprefix checkRelease, $(suffix $(targetReleaseFiles)))
-
 checkRelease: $(checkReleaseTargets)
-	$(PERL) $(TOOLS)/convertRelease.pl -h $(EPICS_HOST_ARCH) $@
-
+	$(PERL) $(TOOLS)/convertRelease.pl -h $(EPICS_HOST_ARCH) checkRelease
 $(checkReleaseTargets):checkRelease.%:
 	$(PERL) $(TOOLS)/convertRelease.pl -h $(EPICS_HOST_ARCH) -a $* checkRelease
 
+warnReleaseTargets = $(addprefix warnRelease, $(suffix $(targetReleaseFiles)))
+warnRelease: $(warnReleaseTargets)
+	-$(PERL) $(TOOLS)/convertRelease.pl -h $(EPICS_HOST_ARCH) checkRelease
+$(warnReleaseTargets):warnRelease.%:
+	-$(PERL) $(TOOLS)/convertRelease.pl -h $(EPICS_HOST_ARCH) -a $* checkRelease
+
 #
 # special clean rule
 #
@@ -74,7 +79,7 @@ archclean ::
 $(cleanArchTargets) ::
 	$(RMDIR) O.$(archPart)
 
-realclean :: 
+realclean ::
 	$(RMDIR) O.*
 
 .PHONY : $(actionArchTargets)
@@ -82,4 +87,3 @@ realclean ::
 .PHONY : $(BUILD_ARCHS)
 .PHONY : $(ACTIONS) clean realclean archclean all
 .PHONY : checkRelease $(checkReleaseTargets)
-

configure/RULES_BUILD

@@ -1,11 +1,10 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2006 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. 
 #*************************************************************************
 # $Id$
 #
@@ -40,6 +39,7 @@ LOADABLE_LIBRARY += $(LOADABLE_LIBRARY_HOST)
 OBJS += $(OBJS_HOST)
 PROD += $(PROD_HOST)
 SCRIPTS += $(SCRIPTS_HOST)
+TESTSCRIPTS += $(TESTSCRIPTS_HOST)
 TESTPROD += $(TESTPROD_HOST)
 endif
 
@@ -48,6 +48,7 @@ LIBRARY += $(LIBRARY_IOC)
 OBJS += $(OBJS_IOC)
 PROD += $(PROD_IOC)
 SCRIPTS += $(SCRIPTS_IOC)
+TESTSCRIPTS += $(TESTSCRIPTS_IOC)
 TESTPROD += $(TESTPROD_IOC)
 endif
 
@@ -118,7 +119,7 @@ rebuild: clean install
 build : inc 
 
 build: $(OBJSNAME) $(LIBTARGETS) $(PRODTARGETS) $(TESTPRODNAME) \
-	$(TARGETS)
+	$(TARGETS) $(TESTSCRIPTS)
 
 inc : $(COMMON_INC) $(INSTALL_INC)
 
@@ -144,7 +145,7 @@ clean::
 	@$(RM) *.i *$(OBJ) *.a $(TESTPRODNAME) $(LIBNAME) $(SHRLIBNAME)\
 	$(INC) *$(RES) $(TARGETS) $(DLL_LINK_LIBNAME) $(TDS) \
 	*.out MakefileInclude  $(LOADABLE_SHRLIBNAME) *.manifest *.exp \
-	$(COMMON_INC) $(HDEPENDS_FILES) $(PRODTARGETS)
+	$(COMMON_INC) $(HDEPENDS_FILES) $(PRODTARGETS) $(TESTSCRIPTS)
 ifdef BAF
 	@$(RM) $(PROD_BAF) $(LIB_BAF) *$(BOF)
 endif
@@ -161,12 +162,17 @@ $(DIRECTORY_TARGETS) :
 #  The order of the following rules is
 #  VERY IMPORTANT !!!!
 
-$(TESTPRODNAME) $(PRODNAME):%$(EXE): $(PRODUCT_OBJS) $(PROD_RESS) $(PROD_DEPLIBS)
+$(TESTPRODNAME) $(PRODNAME): $(PRODUCT_OBJS) $(PROD_RESS) $(PROD_DEPLIBS)
+
+$(TESTPRODNAME) $(PRODNAME):%$(EXE):
 	@$(RM) $@
 	$(DEBUGCMD) $(LINK.cpp)
+	$(MT_EXE_COMMAND)
 
 # object libs for R3.13 vxWorks compatibility only
-$(OBJLIBNAME):%$(OBJ): $(OBJLIB_LD_OBJS)
+$(OBJLIBNAME): $(OBJLIB_LD_OBJS)
+
+$(OBJLIBNAME):%$(OBJ):
 	@$(RM) $@
 	$(OBJLIB_LINK.cpp)
 
@@ -259,22 +265,32 @@ $(LIBNAME): ../baseLIBOBJS
 endif
 
 # rule for lib (archive of object files) creation
-$(LIBNAME): $(LIB_PREFIX)%$(LIB_SUFFIX): $(LIBRARY_OBJS)
+$(LIBNAME): $(LIBRARY_OBJS)
+
+$(LIBNAME): $(LIB_PREFIX)%$(LIB_SUFFIX):
 	@$(RM) $@
 	$(ARCMD)
 ifneq ($(strip $(RANLIB)),)
 	$(RANLIB) $@
 endif # RANLIB
 
-$(DLL_LINK_LIBNAME):$(LIB_PREFIX)%.lib: $(LIBRARY_OBJS) $(LIBRARY_RESS) $(SHRLIB_DEPLIBS) 
+$(DLL_LINK_LIBNAME): $(LIBRARY_OBJS) $(LIBRARY_RESS) $(SHRLIB_DEPLIBS) 
+
+$(DLL_LINK_LIBNAME):$(SHRLIB_PREFIX)%.lib:
 	@$(RM) $@
 	$(LINK.shrlib)
+	$(MT_DLL_COMMAND)
 
-$(SHRLIBNAME):$(LIB_PREFIX)%$(SHRLIB_SUFFIX): $(LIBRARY_OBJS) $(LIBRARY_RESS) $(SHRLIB_DEPLIBS)
+$(SHRLIBNAME): $(LIBRARY_OBJS) $(LIBRARY_RESS) $(SHRLIB_DEPLIBS)
+
+$(SHRLIBNAME):$(SHRLIB_PREFIX)%$(SHRLIB_SUFFIX):
 	@$(RM) $@
 	$(LINK.shrlib)
+	$(MT_DLL_COMMAND)
 
-$(LOADABLE_SHRLIBNAME):$(LOADABLE_SHRLIB_PREFIX)%$(LOADABLE_SHRLIB_SUFFIX): $(LIBRARY_OBJS) $(LIBRARY_RESS) $(SHRLIB_DEPLIBS)
+$(LOADABLE_SHRLIBNAME): $(LIBRARY_OBJS) $(LIBRARY_RESS) $(SHRLIB_DEPLIBS)
+
+$(LOADABLE_SHRLIBNAME):$(LOADABLE_SHRLIB_PREFIX)%$(LOADABLE_SHRLIB_SUFFIX):
 	@$(RM) $@
 	$(LINK.loadable_shrlib)
 
@@ -299,6 +315,21 @@ $(OBJLIB_MUNCHNAME):%.munch : %_ctdt$(OBJ) %$(OBJ)
 	@$(RM) $@
 	$(MUNCH_CMD)
 
+runtests: $(TESTSCRIPTS_$(BUILD_CLASS))
+	$(PERL) -e 'use Test::Harness; runtests @ARGV if @ARGV;' $^
+
+# If there's a perl test script (.plt) available, use it
+%.t: ../%.plt
+	@$(RM) $@
+	@$(CP) $< $@
+
+# Some versions of Test::Harness expect test programs in perl only.
+# Generate a 1-line perl program to exec the real test binary.
+# Uses the $0 runtime path to itself to find the executable.
+%.t: %$(EXE)
+	@$(RM) $@
+	@echo '($$e=$$0)=~s/.t$$/$(EXE)/;exec "./$$e" or die "exec failed";'>$@
+
 # Ext, app and module rules
 RULES_INCLUDE CONFIG_APP_INCLUDE: $(wildcard $(TOP)/configure/RELEASE*)
 	@$(RM) $@
@@ -318,15 +349,7 @@ $(INSTALL_BIN)/%: ../os/$(OS_CLASS)/%
 
 $(INSTALL_BIN)/%: %
 	@echo "Installing binary $@"
-ifdef WIN32
-ifdef BORLAND
 	@$(INSTALL_PRODUCT) -d -m 555 $< $(INSTALL_BIN)
-else
-	@$(INSTALL_PRODUCT) -d -m 555 $<* $(INSTALL_BIN)
-endif
-else
-	@$(INSTALL_PRODUCT) -d -m 555 $< $(INSTALL_BIN)
-endif
 
 $(INSTALL_BIN)/%: ../%
 	@echo "Installing script $@"
@@ -422,6 +445,7 @@ $(INSTALL_TEMPLATES_SUBDIR)/%: %
 .PRECIOUS: $(COMMON_INC)
 
 .PHONY: all inc build install clean rebuild buildInstall binInstalls libInstalls
+.PHONY: runtests
 
 endif # BASE_RULES_BUILD
 #	EOF RULES_BUILD

configure/RULES_DIRS

@@ -1,24 +1,23 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2006 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. 
 #*************************************************************************
 #
 #  $Id$
 #
- 
+
 
 ARCHS += $(BUILD_ARCHS)
-ACTIONS += inc build install buildInstall clean realclean archclean
- 
+ACTIONS += inc build install buildInstall clean realclean archclean runtests
+
 dirPart = $(word 1, $(subst $(DIVIDER), ,$@))
 actionArchPart = $(join $(word 2, $(subst $(DIVIDER), ,$@)), \
- $(addprefix $(DIVIDER),$(word 3, $(subst $(DIVIDER), ,$@))))
- 
+    $(addprefix $(DIVIDER),$(word 3, $(subst $(DIVIDER), ,$@))))
+
 dirActionArchTargets = $(foreach dir, $(DIRS), \
                        $(foreach action, $(ACTIONS),\
                        $(foreach arch, $(ARCHS), \

configure/os/CONFIG.Common.RTEMS-at91rm9200ek

@@ -0,0 +1,13 @@
+#
+# CONFIG.Common.RTEMS-at91rm9200ek
+# Author: Ralf Hartmann
+#         BESSY
+#         Ralf.Hartmann@bessy.de
+#
+# Atmel AT91RM9200-EK evaluation kit
+# using the AT91RM9200 ARM9-based 32-bit RISC microcontroller
+#
+# All RTEMS targets use the same Makefile fragment
+#
+RTEMS_TARGET_CPU=arm
+include $(CONFIG)/os/CONFIG.Common.RTEMS

configure/os/CONFIG.Common.UnixCommon

@@ -16,11 +16,6 @@ VALID_BUILDS = Host Ioc
 # Gnu directory
 GNU_DIR = /usr/local
 
-#-------------------------------------------------------
-# Get fullpathname of relative dirs
-SHRLIB_SEARCH_FULLPATHDIRS = $(foreach dir,$(SHRLIB_SEARCH_DIRS), \
-  $(shell perl $(TOOLS)/fullPathName.pl $(dir)))
-
 #-------------------------------------------------------
 # Unix prefix and suffix definitions
 EXE =
@@ -55,8 +50,10 @@ SHRLIB_DEPLIBS=$(foreach lib, $(LIB_LIBS) $(USR_LIBS), \
 SHRLIB_LDLIBS = $(addprefix -l, $($*_LDLIBS) $(LIB_LIBS) $(USR_LIBS) \
  $($*_SYS_LIBS) $(LIB_SYS_LIBS) $(USR_SYS_LIBS)) $(LDLIBS)
 
-SHRLIB_DEPLIB_DIRS = $(dir $($*_DEPLIBS)) $(dir $(SHRLIB_DEPLIBS))
-SHRLIBDIR_LDFLAGS += $(sort $(SHRLIB_DEPLIB_DIRS:%=-L%))
+SHRLIB_DEPLIB_DIRS = $(foreach word,$(sort $(dir $($*_DEPLIBS) $(SHRLIB_DEPLIBS))), \
+  $(shell $(PERL) $(TOOLS)/fullPathName.pl $(word)))
+
+SHRLIBDIR_LDFLAGS += $(SHRLIB_DEPLIB_DIRS:%=-L%)
 
 #-------------------------------------------------------
 # Prod: DEPLIBS, LDFLAGS, and LDLIBS definitions
@@ -75,8 +72,10 @@ LDLIBS_SHARED_NO = LDLIBS
 PROD_LDLIBS += $($(firstword $(LDLIBS_STATIC_$(STATIC_BUILD)) \
                $(LDLIBS_SHARED_$(SHARED_LIBRARIES))))
 
-PROD_DEPLIB_DIRS = $(dir $($*_DEPLIBS)) $(dir $(PROD_DEPLIBS))
-PRODDIR_LDFLAGS += $(sort $(PROD_DEPLIB_DIRS:%=-L%))
+PROD_DEPLIB_DIRS = $(foreach word,$(sort $(dir $($*_DEPLIBS) $(PROD_DEPLIBS))), \
+  $(shell $(PERL) $(TOOLS)/fullPathName.pl $(word)))
+
+PRODDIR_LDFLAGS += $(PROD_DEPLIB_DIRS:%=-L%)
 
 #--------------------------------------------------
 # Link definitions

configure/os/CONFIG.Common.cygwin-x86

@@ -27,7 +27,10 @@ ARCH_DEP_CPPFLAGS += -D_X86_
 OP_SYS_CPPFLAGS += -DCYGWIN32 -U_WIN32
 
 # Set runtime path for shared libraries
-RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_FULLPATHDIRS:%=-Wl,-rpath,%)
+SHRLIBDIR_LDFLAGS += $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath,%)
+
+# Set runtime path for products
+PRODDIR_LDFLAGS += $(PROD_DEPLIB_DIRS:%=-Wl,-rpath,%)
 
 #  Definitions used when COMMANDLINE_LIBRARY is READLINE
 INCLUDES_READLINE = -I$(GNU_DIR)/include

configure/os/CONFIG.Common.darwin-ppc

@@ -7,52 +7,10 @@
 # Sites may override these definitions in CONFIG_SITE.Common.darwin-ppc
 #-------------------------------------------------------
 
-# Include definitions common to all Unix targets
-include $(CONFIG)/os/CONFIG.Common.UnixCommon
-
 #
-# Set OS-specific information
+# Architecture-specific information
 #
-OS_CLASS = Darwin
 ARCH_CLASS = ppc
 
-#
-# Special flags for Darwin
-#   No common blocks (as required when using shared libraries)
-#
-OP_SYS_CFLAGS += -fno-common
-
-#
-# Don't try to use precompiled headers when converting sequencer files
-#
-CPPSNCFLAGS += -no-cpp-precomp
-
-#
-# Darwin os definition
-#
-OP_SYS_CPPFLAGS += -Ddarwin
-
-#
-# The following two definitions enable the use of DarwinPorts packages.
-
-#
-OP_SYS_INCLUDES += -I/opt/local/include
-# dir/firstword/wildcard used to avoid warning -L: directory name (...) does not exist
-OP_SYS_LDFLAGS +=  $(addprefix -L,$(dir $(firstword $(wildcard /opt/local/lib/*))))
-
-#
-# The following two definitions enable the use of Fink packages.
-#
-OP_SYS_INCLUDES += -I/sw/include
-# dir/firstword/wildcard used to avoid warning -L: directory name (...) does not exist
-OP_SYS_LDFLAGS +=  $(addprefix -L,$(dir $(firstword $(wildcard /sw/lib/*))))
-
-#
-# Libraries for command-line editing.
-#
-LDLIBS_READLINE = -lreadline
-
-#
-# Command-line input support
-#
-COMMANDLINE_LIBRARY=READLINE
+# Include definitions common to all Darwin targets
+include $(CONFIG)/os/CONFIG.darwinCommon.darwinCommon

configure/os/CONFIG.Common.darwin-ppcx86

@@ -0,0 +1,22 @@
+# CONFIG.Common.darwin-ppcx86
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for Darwin 'universal' (PowerPC, Intel) target builds
+# Sites may override these definitions in CONFIG_SITE.Common.darwin-ppcx86
+#-------------------------------------------------------
+
+#
+# Set architecture-specific information
+#
+ARCH_CLASS = ppcx86
+
+#
+# Universal binary support
+#
+OP_SYS_CFLAGS += -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc
+OP_SYS_LDFLAGS += -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc
+
+# Include definitions common to all Darwin targets
+include $(CONFIG)/os/CONFIG.darwinCommon.darwinCommon

configure/os/CONFIG.Common.darwin-x86

@@ -0,0 +1,16 @@
+# CONFIG.Common.darwin-x86
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for darwin-x86 target builds
+# Sites may override these definitions in CONFIG_SITE.Common.darwin-x86
+#-------------------------------------------------------
+
+#
+# Architecture-specific information
+#
+ARCH_CLASS = x86
+
+# Include definitions common to all Darwin targets
+include $(CONFIG)/os/CONFIG.darwinCommon.darwinCommon

configure/os/CONFIG.Common.freebsd-x86

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

configure/os/CONFIG.Common.freebsd-x86_64

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

configure/os/CONFIG.Common.freebsdCommon

@@ -0,0 +1,32 @@
+# $Id$
+#
+# This file is maintained by the build community.
+#
+# Definitions for freebsd target builds
+# Sites may override these definitions in CONFIG_SITE.Common.freebsdCommon
+#-------------------------------------------------------
+
+# Include definitions common to all Unix targets
+include $(CONFIG)/os/CONFIG.Common.UnixCommon
+
+OS_CLASS = freebsd
+
+CODE_CPPFLAGS = -D_REENTRANT
+
+POSIX_CPPFLAGS = -D_POSIX_THREADS
+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 += -Dfreebsd
+
+# Set runtime path for shared libraries
+SHRLIBDIR_LDFLAGS += $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath,%)
+
+# Set runtime path for products
+PRODDIR_LDFLAGS += $(PROD_DEPLIB_DIRS:%=-Wl,-rpath,%)
+
+#  Definitions used when COMMANDLINE_LIBRARY is READLINE
+LDLIBS_READLINE = -lreadline -lcurses
+
+GNU_LDLIBS_YES = -lgcc_pic

configure/os/CONFIG.Common.hpux-parisc

@@ -26,6 +26,9 @@ LOADABLE_SHRLIB_SUFFIX = .sl$(addprefix .,$(LOADABLE_SHRLIB_VERSION))
 # Set runtime path for shared libraries
 empty:=                                      # trick from the make docs...
 space:= $(empty) $(empty)
-RUNTIME_LDFLAGS = -Wl,+b$(subst $(space),:,$(sort $(SHRLIB_SEARCH_FULLPATHDIRS))),+s
+SHRLIBDIR_LDFLAGS += -Wl,+b$(subst $(space),:,$(SHRLIB_DEPLIB_DIRS)),+s
+
+# Set runtime path for products
+PRODDIR_LDFLAGS += -Wl,+b$(subst $(space),:,$(PROD_DEPLIB_DIRS)),+s
 
 GNU_TARGET=parisc-hp-unix

configure/os/CONFIG.Common.interix-x86

@@ -0,0 +1,41 @@
+# CONFIG.Common.interix-x86
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for interix-x86 target builds
+# Sites may override these definitions in CONFIG_SITE.Common.interix-x86
+#-------------------------------------------------------
+
+# Include definitions common to all Unix targets
+include $(CONFIG)/os/CONFIG.Common.UnixCommon
+
+OS_CLASS = interix
+ARCH_CLASS = x86
+
+EXE=
+
+POSIX_CPPFLAGS  = -D_POSIX_C_SOURCE=199506L 
+POSIX_CPPFLAGS += -D_POSIX_THREADS
+POSIX_CPPFLAGS += -D_ALL_SOURCE
+POSIX_CPPFLAGS += -D_POSIX_TIMERS
+
+POSIX_CPPFLAGS += -D_REENTRANT
+
+POSIX_LDLIBS += -lpthread
+
+ARCH_DEP_CPPFLAGS += -D_X86_
+
+OP_SYS_CPPFLAGS += -DUNIX
+
+# Set runtime path for shared libraries
+SHRLIBDIR_LDFLAGS += $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath,%)
+
+# Set runtime path for products
+PRODDIR_LDFLAGS += $(PROD_DEPLIB_DIRS:%=-Wl,-rpath,%)
+
+#  Definitions used when COMMANDLINE_LIBRARY is READLINE
+INCLUDES_READLINE = -I$(GNU_DIR)/include
+LDFLAGS_READLINE += -L$(GNU_DIR)/lib
+LDLIBS_READLINE = -lreadline
+

configure/os/CONFIG.Common.linux-arm

@@ -0,0 +1,29 @@
+# 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
+#-------------------------------------------------------
+
+# Include definitions common to all Linux targets
+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)
+    GNU_TARGET = arm-linux
+
+    # prefix of compiler tools
+    CMPLR_SUFFIX =
+    CMPLR_PREFIX = $(addsuffix -,$(GNU_TARGET))
+
+    # Provide a link-time path for shared libraries
+    SHRLIBDIR_LDFLAGS += $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath-link,%)
+
+    # Provide a link-time path for products
+    PRODDIR_LDFLAGS += $(PROD_DEPLIB_DIRS:%=-Wl,-rpath-link,%)
+endif

configure/os/CONFIG.Common.linuxCommon

@@ -23,7 +23,10 @@ OP_SYS_CPPFLAGS += -Dlinux
 OP_SYS_LDLIBS += -lrt
 
 # Set runtime path for shared libraries
-RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_FULLPATHDIRS:%=-Wl,-rpath,%)
+SHRLIBDIR_LDFLAGS += $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath,%)
+
+# Set runtime path for products
+PRODDIR_LDFLAGS += $(PROD_DEPLIB_DIRS:%=-Wl,-rpath,%)
 
 #  Definitions used when COMMANDLINE_LIBRARY is READLINE
 LDLIBS_READLINE = -lreadline -lcurses

configure/os/CONFIG.Common.osf-alpha

@@ -0,0 +1,40 @@
+# CONFIG.Common.osf-alpha
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for osf-alpha target archs
+# Sites may override these definitions in CONFIG_SITE.Common.osf-alpha
+#-------------------------------------------------------
+
+# Include definitions common to all Unix targets
+include $(CONFIG)/os/CONFIG.Common.UnixCommon
+
+OS_CLASS = osf
+ARCH_CLASS = alpha
+
+CODE_CPPFLAGS =
+
+POSIX_CPPFLAGS += -pthread -ieee
+POSIX_LDFLAGS += -pthread -ieee
+
+OP_SYS_CPPFLAGS += -D_OSF_SOURCE
+OP_SYS_LDLIBS += -lrt
+# Unknown reason why USR_SYS_LIBS += m is needed
+USR_SYS_LIBS += m
+
+space:=$(empty) $(empty)
+colon := :
+
+# Set runtime path for shared libraries
+SHRLIBDIR_LDFLAGS += $(SHRLIB_DEPLIB_DIRS:%=-rpath %)
+
+# Set runtime path for products
+PRODDIR_LDFLAGS += $(PROD_DEPLIB_DIRS:%=-rpath %)
+
+ifdef CROSS
+   GNU_TARGET=alpha-osf
+   CMPLR_SUFFIX=
+   CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
+endif
+

configure/os/CONFIG.Common.osf-alpha-gnu

@@ -0,0 +1,38 @@
+# CONFIG.Common.osf-alpha-gnu
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for osf-alpha target archs
+# Sites may override these definitions in CONFIG_SITE.Common.osf-alpha-gnu
+#-------------------------------------------------------
+
+# Include definitions common to all Unix targets
+include $(CONFIG)/os/CONFIG.Common.UnixCommon
+
+OS_CLASS = osf
+ARCH_CLASS = alpha
+
+CODE_CPPFLAGS =
+
+POSIX_CPPFLAGS += -D_REENTRANT
+POSIX_LDLIBS += -lpthread -lexc
+
+OP_SYS_CPPFLAGS += -D_OSF_SOURCE
+OP_SYS_LDLIBS += -lrt
+
+space:=$(empty) $(empty)
+colon := :
+
+# Set runtime path for shared libraries
+SHRLIBDIR_LDFLAGS += $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath,%)
+
+# Set runtime path for products
+PRODDIR_LDFLAGS += $(PROD_DEPLIB_DIRS:%=-Wl,-rpath,%)
+
+ifdef CROSS
+   GNU_TARGET=alpha-osf
+   CMPLR_SUFFIX=
+   CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
+endif
+

configure/os/CONFIG.Common.solaris-sparc

@@ -28,7 +28,11 @@ OP_SYS_CPPFLAGS += -DSOLARIS=$(SOLARIS_VERSION) $(COMPILER_CPPFLAGS)
 OP_SYS_LDFLAGS +=  $(COMPILER_LDFLAGS)
 
 # Set runtime path for shared libraries
-RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_FULLPATHDIRS:%=-R%)
+SHRLIBDIR_LDFLAGS += $(SHRLIB_DEPLIB_DIRS:%=-R%)
+
+# Set runtime path for products
+PRODDIR_LDFLAGS += $(PROD_DEPLIB_DIRS:%=-R%)
+
 RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(COMMANDLINE_LIBRARY))
 
 GNU_TARGET=sparc-sun-solaris2
@@ -36,6 +40,7 @@ GNU_TARGET=sparc-sun-solaris2
 OP_SYS_LDLIBS += -lsocket -lnsl
 OP_SYS_LDLIBS_8 += -lCrun -lc -lCstd
 OP_SYS_LDLIBS_9 += -lCrun -lc -lCstd
+OP_SYS_LDLIBS_10 += -lCrun -lc -lCstd
 OP_SYS_LDLIBS += $(OP_SYS_LDLIBS_$(SOLARIS_VERSION))
 
 #  Definitions used when COMMANDLINE_LIBRARY is READLINE

configure/os/CONFIG.Common.solaris-sparc64

@@ -10,6 +10,6 @@
 # Include definitions common to all solaris-sparc target archs
 include $(CONFIG)/os/CONFIG.Common.solaris-sparc
 
-ARCH_DEP_CFLAGS += -xtarget=ultra -xarch=v9
-ARCH_DEP_CXXFLAGS += -xtarget=ultra -xarch=v9
-ARCH_DEP_LDFLAGS += -xtarget=ultra -xarch=v9
+ARCH_DEP_CFLAGS +=   -xarch=generic64
+ARCH_DEP_CXXFLAGS += -xarch=generic64
+ARCH_DEP_LDFLAGS +=  -xarch=generic64

configure/os/CONFIG.Common.solaris-x86

@@ -29,7 +29,11 @@ OP_SYS_LDFLAGS +=  $(COMPILER_LDFLAGS)
 ARCH_DEP_CPPFLAGS = -D_X86_
 
 # Set runtime path for shared libraries
-RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_FULLPATHDIRS:%=-R%)
+SHRLIBDIR_LDFLAGS += $(SHRLIB_DEPLIB_DIRS:%=-R%)
+
+# Set runtime path for products
+PRODDIR_LDFLAGS += $(PROD_DEPLIB_DIRS:%=-R%)
+
 RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(COMMANDLINE_LIBRARY))
 
 GNU_TARGET=x86-sun-solaris2

configure/os/CONFIG.Common.vxWorks-mpc8540

@@ -0,0 +1,21 @@
+# $Id
+#
+# 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.
+#-------------------------------------------------------
+
+# 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 = -mcpu=8540 -msoft-float -mstrict-align -mlongcall
+
+GNU_TARGET = powerpc-wrs-vxworks

configure/os/CONFIG.Common.vxWorks-ppc603

@@ -1,10 +1,9 @@
-# CONFIG.Common.vxWorks-ppc603
-#
 # $Id$
-# This file is maintained by the build community.
 #
-# Definitions for vxWorks-ppc603 target archs
-# Sites may override these definitions in CONFIG_SITE.Common.vxWorks-ppc603
+# Definitions for vxWorks-ppc603 targets: PPC603 and PMC8240 CPUs
+# Site-specific overrides go in CONFIG_SITE.Common.vxWorks-ppc603
+#
+# This file is maintained by the EPICS build community.
 #-------------------------------------------------------
 
 # Include definitions common to all vxWorks target archs

configure/os/CONFIG.Common.vxWorks-ppc603_long

@@ -1,22 +1,13 @@
-# CONFIG.Common.vxWorks-ppc603_long
-#
 # $Id$
-# This file is maintained by the build community.
 #
-# Definitions for vxWorks-ppc603 target archs with at least 32MB
-# Sites may override these definitions in CONFIG_SITE.Common.vxWorks-ppc603_long
+# 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
+# Inherit the settings from vxWorks-ppc603
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc603
 
-# Vx GNU cross compiler suffix
-CMPLR_SUFFIX = ppc
- 
-ARCH_CLASS = ppc
-
-# Architecture specific build flags
-ARCH_DEP_CPPFLAGS = -DCPU=PPC603  
-ARCH_DEP_CFLAGS = -mcpu=603 -mstrict-align -mlongcall
-
-GNU_TARGET = powerpc-wrs-vxworks
+# Tell compiler to generate long branches
+ARCH_DEP_CFLAGS += -mlongcall

configure/os/CONFIG.Common.vxWorks-ppc604

@@ -1,10 +1,9 @@
-# CONFIG.Common.vxWorks-ppc604
-#
 # $Id$
-# This file is maintained by the build community.
 #
-# Definitions for vxWorks-ppc604 target archs
-# Sites may override these definitions in CONFIG_SITE.Common.vxWorks-ppc604
+# Definitions for vxWorks-ppc604 targets: PPC604, MPC7xx and MPC74xx CPUs
+# Site-specific overrides go in CONFIG_SITE.Common.vxWorks-ppc604
+#
+# This file is maintained by the EPICS build community.
 #-------------------------------------------------------
 
 # Include definitions common to all vxWorks target archs
@@ -12,11 +11,11 @@ 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=PPC604
-ARCH_DEP_CFLAGS = -mcpu=604 -mstrict-align
+ARCH_DEP_CFLAGS = -mcpu=604 -mstrict-align -mno-implicit-fp
 
 GNU_TARGET = powerpc-wrs-vxworks

configure/os/CONFIG.Common.vxWorks-ppc604_altivec

@@ -0,0 +1,22 @@
+# $Id$
+#
+# Definitions for vxWorks-ppc604 targets with an Altivec and >32MB of RAM.
+# Site-specific overrides go in CONFIG_SITE.Common.vxWorks-ppc604_altivec
+#
+# This file is maintained by the EPICS build community.
+#-------------------------------------------------------
+
+# Inherit the settings from vxWorks-ppc604_long
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+
+defval = $(if $(strip $(1),),$(1),$(2))
+
+# Tell compiler to include altivec support; not available in 5.4
+ALTIVEC_CFLAG_5.4 = THIS_VERSION_OF_VXWORKS DOES_NOT_SUPPORT_ALTIVEC
+ALTIVEC_CFLAG_5.5 = -fvec
+ALTIVEC_CFLAG_6.0 = -fvec
+
+# From 6.1 onwards the compiler option changed
+ALTIVEC_CFLAG = -maltivec
+
+ARCH_DEP_CFLAGS += $(call defval,$(ALTIVEC_CFLAG_$(VXWORKS_VERSION)),$(ALTIVEC_CFLAG))

configure/os/CONFIG.Common.vxWorks-ppc604_long

@@ -1,22 +1,13 @@
-# CONFIG.Common.vxWorks-ppc604_long
-#
 # $Id
-# This file is maintained by the build community.
 #
-# Definitions for vxWorks-ppc604 target archs with at least 32MB
-# Sites may override these definitions in CONFIG_SITE.Common.vxWorks-ppc604_long
+# Definitions for vxWorks-ppc604 targets with >32MB of RAM
+# Site-specific overrides go in CONFIG_SITE.Common.vxWorks-ppc604_long
+#
+# This file is maintained by the EPICS build community.
 #-------------------------------------------------------
 
-# Include definitions common to all vxWorks target archs
-include $(CONFIG)/os/CONFIG.Common.vxWorksCommon
+# Inherit the settings from vxWorks-ppc604
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604
 
-# Vx GNU cross compiler suffix
-CMPLR_SUFFIX = ppc
- 
-ARCH_CLASS = ppc
-
-# Architecture specific build flags
-ARCH_DEP_CPPFLAGS = -DCPU=PPC604
-ARCH_DEP_CFLAGS = -mcpu=604 -mstrict-align -mlongcall
-
-GNU_TARGET = powerpc-wrs-vxworks
+# Tell compiler to generate long branches
+ARCH_DEP_CFLAGS += -mlongcall

configure/os/CONFIG.Common.vxWorks6-mv2100

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

configure/os/CONFIG.Common.vxWorks6-mv5100

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

configure/os/CONFIG.Common.vxWorks6Common

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

configure/os/CONFIG.Common.vxWorksCommon

@@ -75,11 +75,47 @@ NMS += $(OBJLIBNAME:%$(OBJ)=%.nm)
 OBJLIB_LINK.cpp = $(LD) -o $@ $(OBJLIB_LD_OBJS)
 SRC_FILES += $(OBJLIB_SRCS)
 
+#--------------------------------------------------
+# vxWorks version numbers
+
+VXWORKS_MAJOR_VERSION = $(basename $(basename $(VXWORKS_VERSION)))
+
+# These are needed for vxWorks 6.x; the GNU toolset version number
+# is in the path to the compiler tools:
+VX_GNU_VERSION_6.0 = 3.3.2
+VX_GNU_VERSION_6.1 = 3.3.2
+VX_GNU_VERSION_6.2 = 3.3.2
+VX_GNU_VERSION_6.3 = 3.4.4
+VX_GNU_VERSION = $(VX_GNU_VERSION_$(VXWORKS_VERSION))
+
+#--------------------------------------------------
+# Fix WIND_BASE for vxWorks 6.x on linux
+# NB: We know the value of WIND_HOST_TYPE here, but not VXWORKS_VERSION
+ifeq ($(WIND_HOST_TYPE),x86-linux)
+  WIND_HOST_TYPE_5 = x86-linux
+  WIND_HOST_TYPE_6 = x86-linux2
+  WIND_HOST_TYPE = $(WIND_HOST_TYPE_$(VXWORKS_MAJOR_VERSION))
+endif
+
 #--------------------------------------------------
 # vxWorks directory definitions
-# Tornado directory definitions
-GNU_TARGET_INCLUDE_DIR = $(VX_DIR)/target/h
-GNU_DIR = $(VX_DIR)/host/$(WIND_HOST_TYPE)
+VX_DIR_5 = $(WIND_BASE)
+VX_DIR_6 = $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)
+VX_DIR = $(VX_DIR_$(VXWORKS_MAJOR_VERSION))
+
+VX_INCLUDE_DIRS_5 = $(VX_DIR)/target/h
+VX_INCLUDE_DIRS_6 = $(VX_DIR)/target/h $(VX_DIR)/target/h/wrn/coreip
+GNU_TARGET_INCLUDE_DIR = $(VX_INCLUDE_DIRS_$(VXWORKS_MAJOR_VERSION))
+
+#--------------------------------------------------
+# vxWorks GNU directories
+
+GNU_DIR_5 = $(WIND_BASE)/host/$(WIND_HOST_TYPE)
+GNU_DIR_6 = $(WIND_BASE)/gnu/$(VX_GNU_VERSION)-vxworks-$(VXWORKS_VERSION)/$(WIND_HOST_TYPE)
+GNU_DIR = $(GNU_DIR_$(VXWORKS_MAJOR_VERSION))
+
+# GCC_EXEC_PREFIX considered harmful since vxWorks 6 moved it
+unexport GCC_EXEC_PREFIX
 
 #--------------------------------------------------
 # C++ host processing
@@ -88,7 +124,7 @@ NM = $(GNU_BIN)/$(CMPLR_PREFIX)nm$(CMPLR_SUFFIX)$(HOSTEXE)
 #--------------------------------------------------
 # The follow 2 exports prevent gnu cross-compiler
 # from finding wrong assembler (as).
-export WIND_BASE = $(VX_DIR)
+export WIND_BASE
 export WIND_HOST_TYPE
 
 #--------------------------------------------------
@@ -100,31 +136,34 @@ export TOOL_FAMILY = GNU
 # Operating system flags
 OP_SYS_CPPFLAGS += -DvxWorks
 OP_SYS_CFLAGS += -fno-builtin
-#OP_SYS_CFLAGS += -fno-builtin -fdollars-in-identifiers
-OP_SYS_LDFLAGS +=
 
-# Fix for vxWorks headers using macros defined in
-# vxWorks.h but not including vxWorks.h 
-OP_SYS_INCLUDE_CPPFLAGS += -include $(GNU_TARGET_INCLUDE_DIR)/vxWorks.h
+# Fix for vxWorks headers that use macros defined in vxWorks.h but
+# which don't actually include vxWorks.h themselves, for example the
+# target/h/sys/stat.h file which uses ULONG
+OP_SYS_INCLUDE_CPPFLAGS_5 += -include $(VX_DIR)/target/h/vxWorks.h
+OP_SYS_INCLUDE_CPPFLAGS = $(OP_SYS_INCLUDE_CPPFLAGS_$(VXWORKS_MAJOR_VERSION))
+
+#--------------------------------------------------
+# Optimization: Officially vxWorks only supports -O2 or less.
+OPT_CFLAGS_YES = -O2
+OPT_CXXFLAGS_YES = -O2
 
 #--------------------------------------------------
 # code flags
 CODE_CFLAGS =
 #
-# WRS still uses an old gnu compiler with a broken -frepo and 
-# otherwise no automatic template instantiation mechanism as
-# is the defacto standard approach today. If we remove this 
-# flag certain ppc targets will not build. 
-CODE_CXXFLAGS = -fno-implicit-templates
-
-#--------------------------------------------------
-# posix c preprocessor flags
-POSIX_CPPFLAGS = -D_POSIX_SOURCE
+# For vxWorks versions before 6.3 we need this g++ compiler flag
+CODE_CXXFLAGS_5 = -fno-implicit-templates
+CODE_CXXFLAGS_6.0 = -fno-implicit-templates
+CODE_CXXFLAGS_6.1 = -fno-implicit-templates
+CODE_CXXFLAGS_6.2 = -fno-implicit-templates
+CODE_CXXFLAGS_6 = $(CODE_CXXFLAGS_$(VXWORKS_VERSION))
+CODE_CXXFLAGS = $(CODE_CXXFLAGS_$(VXWORKS_MAJOR_VERSION))
 
 #--------------------------------------------------
 # no shared libs for vxWorks
-SHRLIB_CFLAGS = 
-SHRLIB_LDFLAGS = 
+SHRLIB_CFLAGS =
+SHRLIB_LDFLAGS =
 
 #--------------------------------------------------
 # osithead use default stack, YES or NO override

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

@@ -18,7 +18,10 @@ EXE=.exe
 COMPILER_CPPFLAGS = -D_REENTRANT
 
 # Set runtime path for shared libraries
-RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_FULLPATHDIRS:%=-Wl,-rpath,%)
+SHRLIBDIR_LDFLAGS += $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath,%)
+
+# Set runtime path for products
+PRODDIR_LDFLAGS += $(PROD_DEPLIB_DIRS:%=-Wl,-rpath,%)
 
 #  Definitions used when COMMANDLINE_LIBRARY is READLINE
 INCLUDES_READLINE = -I$(GNU_DIR)/include
@@ -42,6 +45,8 @@ OP_SYS_CXXFLAGS += -D__cplusplus
 # Overrides -DUNIX from CONFIG.Common.UnixCommon
 OP_SYS_CPPFLAGS = -mno-cygwin
 
+LIBRARY_LD_RESS=
+
 OP_SYS_LDFLAGS += -mno-cygwin
 OP_SYS_LDLIBS = -lws2_32 -ladvapi32 -luser32 -lkernel32 -lwinmm
 

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

@@ -18,8 +18,13 @@ EXE=.exe
 # Library used when COMMANDLINE_LIBRARY is READLINE
 LDLIBS_READLINE = -lreadline
 
-STATIC_BUILD=YES
-STATIC_LDLIBS_YES=-lws2_32 -ladvapi32 -luser32 -lkernel32 -lwinmm
+
+# Set runtime path for shared libraries
+SHRLIBDIR_LDFLAGS += $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath,%)
+
+# Set runtime path for products
+PRODDIR_LDFLAGS += $(PROD_DEPLIB_DIRS:%=-Wl,-rpath,%)
+
 
 # Compiler defines _X86_ 1
 
@@ -37,3 +42,10 @@ STATIC_LDLIBS_YES=-lws2_32 -ladvapi32 -luser32 -lkernel32 -lwinmm
 # Override for -DUNIX from CONFIG.Common.UnixCommon
 OP_SYS_CPPFLAGS =
 
+OP_SYS_CXXFLAGS += -D__cplusplus
+
+LIBRARY_LD_RESS=
+
+OP_SYS_LDLIBS = -lws2_32 -ladvapi32 -luser32 -lkernel32 -lwinmm
+#STATIC_LDLIBS_YES=-lws2_32 -ladvapi32 -luser32 -lkernel32 -lwinmm
+

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

@@ -25,7 +25,7 @@ SHRLIB_CFLAGS =
 # -ansi eliminates strdup
 CONFORM_CFLAGS_ANSI = 
 CONFORM_CFLAGS_STRICT = -pedantic
-CONFORM_CXXFLAGS_ANSI = 
+CONFORM_CXXFLAGS_NORMAL = 
 CONFORM_CXXFLAGS_STRICT = -pedantic
 
 

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

@@ -1,46 +0,0 @@
-#  CONFIG.darwin-ppc.darwin-ppc
-#
-# $Id$
-#
-# Definitions for darwin-ppc host - darwin-ppc target builds
-# Sites may override these definitions in CONFIG_SITE.darwin-ppc.darwin-ppc
-#-------------------------------------------------------
-
-# Include common gnu compiler definitions
-include $(CONFIG)/CONFIG.gnuCommon
-
-GNU_DIR = /usr
-
-CC = $(GNU_BIN)/cc
-CCC = $(GNU_BIN)/c++
-
-#
-# Darwin shared libraries
-#
-SHRLIB_VERSION = $(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)
-SHRLIB_LDFLAGS = -dynamiclib -flat_namespace -undefined suppress \
-       -install_name $(firstword $(SHRLIB_SEARCH_FULLPATHDIRS))/$@ \
-       -compatibility_version $(EPICS_VERSION).$(EPICS_REVISION) \
-       -current_version $(SHRLIB_VERSION)
-SHRLIB_SUFFIX = .$(SHRLIB_VERSION).dylib
-
-LOADABLE_SHRLIB_LDFLAGS = -bundle -flat_namespace -undefined suppress
-
-#
-# Position-independent code is the default on Darwin.
-#
-CODE_CFLAGS = 
-CODE_CXXFLAGS = 
-
-#
-# Add support for Objective-C source
-#
-vpath %.m $(USR_VPATH) $(ALL_SRC_DIRS)
-%.o: %.m
-	$(COMPILE.c) -c $<
-
-#
-# Pedantic produces way too many unnecessary messages
-#
-CONFORM_CFLAGS_STRICT=-ansi
-CONFORM_CXXFLAGS_STRICT=-ansi

configure/os/CONFIG.darwin-ppcx86.Common

@@ -0,0 +1,11 @@
+# CONFIG.darwin-ppcx86.Common
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for Darwin 'universal' (PowerPC, Intel) host builds
+# Sites may override these definitions in CONFIG_SITE.darwin-ppcx86.Common
+#-------------------------------------------------------
+
+#Include definitions common to unix hosts
+include $(CONFIG)/os/CONFIG.UnixCommon.Common