From c7089179834a706b72505a442da70a884f42f609 Mon Sep 17 00:00:00 2001 From: zimoch Date: Wed, 27 Nov 2013 09:49:00 +0000 Subject: [PATCH] merge with 3.14.12.4-pre1 --- configure/os/CONFIG.Common.UnixCommon | 11 ++--- configure/os/CONFIG.Common.cygwin-x86 | 13 +++--- configure/os/CONFIG.Common.iosCommon | 40 +++++++++++-------- configure/os/CONFIG.Common.linux-arm | 3 -- configure/os/CONFIG.Common.linux-xscale_be | 16 +++++--- configure/os/CONFIG.Common.win32-x86-cygwin | 11 ++--- configure/os/CONFIG.Common.win32-x86-mingw | 11 ++--- configure/os/CONFIG.darwinCommon.darwinCommon | 32 ++++----------- configure/os/CONFIG.win32-x86-borland.Common | 2 +- ...CONFIG.win32-x86-borland.win32-x86-borland | 5 ++- configure/os/CONFIG.win32-x86-mingw.Common | 2 +- .../os/CONFIG.win32-x86-mingw.win32-x86-mingw | 21 +++++----- configure/os/CONFIG.win32-x86.Common | 2 +- configure/os/CONFIG.win32-x86.win32-x86 | 5 ++- configure/os/CONFIG_SITE.Common.RTEMS | 13 +++--- configure/os/CONFIG_SITE.Common.cygwin-x86 | 7 +++- configure/os/CONFIG_SITE.Common.darwin-x86 | 32 ++++++++++----- configure/os/CONFIG_SITE.Common.ios-arm | 37 +++++++++-------- configure/os/CONFIG_SITE.Common.iosCommon | 29 ++++++++++---- configure/os/CONFIG_SITE.Common.linux-x86 | 3 +- configure/os/CONFIG_SITE.Common.linux-x86_64 | 3 +- configure/os/CONFIG_SITE.Common.vxWorksCommon | 2 + configure/os/CONFIG_SITE.cygwin-x86.Common | 4 +- configure/os/CONFIG_SITE.linux-x86.linux-arm | 10 +++-- 24 files changed, 179 insertions(+), 135 deletions(-) diff --git a/configure/os/CONFIG.Common.UnixCommon b/configure/os/CONFIG.Common.UnixCommon index c929e08e0..0b3474d59 100644 --- a/configure/os/CONFIG.Common.UnixCommon +++ b/configure/os/CONFIG.Common.UnixCommon @@ -1,6 +1,6 @@ # CONFIG.Common.UnixCommon # -# Revision-Id: anj@aps.anl.gov-20101005192737-disfz3vs0f3fiixd +# Revision-Id: anj@aps.anl.gov-20130710190751-ogbyoj47fych51ep # # Contains definitions common to all Unix target archs # @@ -19,8 +19,9 @@ OBJ = .o #Library prefix and suffixes LIB_PREFIX = lib LIB_SUFFIX = .a -SHRLIB_SUFFIX = .so$(addprefix .,$(SHRLIB_VERSION)) -LOADABLE_SHRLIB_SUFFIX = .so$(addprefix .,$(LOADABLE_SHRLIB_VERSION)) +SHRLIB_SUFFIX_BASE = .so +SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)$(addprefix .,$(SHRLIB_VERSION)) +LOADABLE_SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)$(addprefix .,$(LOADABLE_SHRLIB_VERSION)) LOADABLE_SHRLIB_PREFIX = lib #------------------------------------------------------- @@ -49,7 +50,7 @@ SHRLIB_LDLIBS = $(addprefix -l, $($*_LDLIBS) $(LIB_LIBS) $(USR_LIBS))\ $(LDLIBS) SHRLIB_DEPLIB_DIRS = $(foreach word,$(sort $(dir $($*_DEPLIBS) $(SHRLIB_DEPLIBS))), \ - $(shell $(PERL) $(TOOLS)/fullPathName.pl $(word))) + $(shell $(FULLPATHNAME) $(word))) SHRLIBDIR_LDFLAGS += $(SHRLIB_DEPLIB_DIRS:%=-L%) @@ -72,7 +73,7 @@ PROD_LDLIBS += $($(firstword $(LDLIBS_STATIC_$(STATIC_BUILD)) \ $(LDLIBS_SHARED_$(SHARED_LIBRARIES)))) PROD_DEPLIB_DIRS = $(foreach word,$(sort $(dir $($*_DEPLIBS) $(PROD_DEPLIBS))), \ - $(shell $(PERL) $(TOOLS)/fullPathName.pl $(word))) + $(shell $(FULLPATHNAME) $(word))) PRODDIR_LDFLAGS += $(PROD_DEPLIB_DIRS:%=-L%) diff --git a/configure/os/CONFIG.Common.cygwin-x86 b/configure/os/CONFIG.Common.cygwin-x86 index 4c2598620..15abd4986 100644 --- a/configure/os/CONFIG.Common.cygwin-x86 +++ b/configure/os/CONFIG.Common.cygwin-x86 @@ -1,6 +1,6 @@ # CONFIG.Common.cygwin-x86 # -# Revision-Id: jba@aps.anl.gov-20101022143344-u0445dydxhg80mru +# Revision-Id: jba@aps.anl.gov-20121205210226-0i3d06gcoe1pt39x # This file is maintained by the build community. # # Definitions for cygwin-x86 target builds @@ -14,7 +14,7 @@ OS_CLASS = cygwin32 ARCH_CLASS = x86 # Definitions used when COMMANDLINE_LIBRARY is READLINE -LDLIBS_READLINE = -lreadline -lcurses +LDLIBS_READLINE = -lreadline POSIX_CPPFLAGS = -D_POSIX_THREADS -D_POSIX_TIMERS #POSIX_CPPFLAGS += -D_POSIX_SOURCE @@ -48,11 +48,12 @@ STATIC_CXXFLAGS_NO= $(VISC_DLL) -D_DLL # But: if there are no objects LIBRARY_LD_OBJS to include # in this library (may be for e.g. base/src/libCompat # on some archs), don't define (and build) any library! -SHRLIB_PREFIX= -SHRLIB_SUFFIX=.dll +SHRLIB_PREFIX = +SHRLIB_SUFFIX_BASE = .dll +SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE) SHRLIBNAME_YES = $(BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX)) -LOADABLE_SHRLIB_PREFIX= -LOADABLE_SHRLIB_SUFFIX=.dll +LOADABLE_SHRLIB_PREFIX = +LOADABLE_SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE) LOADABLE_SHRLIBNAME = $(LOADABLE_BUILD_LIBRARY:%=%$(LOADABLE_SHRLIB_SUFFIX)) # diff --git a/configure/os/CONFIG.Common.iosCommon b/configure/os/CONFIG.Common.iosCommon index 693db8d3a..6a61c6bbc 100644 --- a/configure/os/CONFIG.Common.iosCommon +++ b/configure/os/CONFIG.Common.iosCommon @@ -1,6 +1,6 @@ # CONFIG.Common.iosCommon # -# Revision-Id: anj@aps.anl.gov-20111202164243-clxybuefflizbyvr +# Revision-Id: anj@aps.anl.gov-20130710190751-ogbyoj47fych51ep # This file is maintained by the build community. # # Definitions for all Apple iOS builds @@ -41,10 +41,7 @@ ARCH_DEP_LDFLAGS += $(ARCH_DEP_FLAGS) #-------------------------------------------------- # Operating system flags OP_SYS_CFLAGS += -isysroot $(SDK_DIR) -D__IPHONE_OS_VERSION_MIN_REQUIRED=30200 - -#-------------------------------------------------- -# Don't try to use precompiled headers when converting sequencer files -CPPSNCFLAGS += -no-cpp-precomp +OP_SYS_LDFLAGS += -isysroot $(SDK_DIR) #-------------------------------------------------- # Always compile in debugging symbol table information @@ -54,23 +51,33 @@ OPT_CXXFLAGS_YES += -g #------------------------------------------------------- # Compiler definitions: -# Use clang instead of gcc -CC = $(GNU_BIN)/clang -CCC = $(GNU_BIN)/clang++ -GNU_LDLIBS_YES = + +CC_GNU = gcc +CCC_GNU = g++ + +CC_LLVM_GNU = llvm-gcc +CCC_LLVM_GNU = llvm-g++ + +CC_CLANG = clang +CCC_CLANG = clang++ + +# Convert the iOS platform to lowercase for passing to xcrun's sdk parameter +XCRUN_SDK_BASE = $(shell echo $(IOS_PLATFORM) | tr A-Z a-z) #------------------------------------------------------- # Linker flags +GNU_LDLIBS_YES = OP_SYS_LDFLAGS += -dynamic -Z -L$(SDK_DIR)/usr/lib -L$(SDK_DIR)/usr/lib/system #------------------------------------------------------- # Shared libraries SHRLIB_VERSION = $(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION) SHRLIB_LDFLAGS = -dynamiclib -flat_namespace -undefined suppress \ - -install_name $(shell perl $(TOOLS)/fullPathName.pl $(INSTALL_LIB))/$@ \ + -install_name $(shell $(FULLPATHNAME) $(INSTALL_LIB))/$@ \ -compatibility_version $(EPICS_VERSION).$(EPICS_REVISION) \ -current_version $(SHRLIB_VERSION) -SHRLIB_SUFFIX = .$(SHRLIB_VERSION).dylib +SHRLIB_SUFFIX_BASE = .dylib +SHRLIB_SUFFIX = .$(SHRLIB_VERSION)$(SHRLIB_SUFFIX_BASE) LOADABLE_SHRLIB_LDFLAGS = -bundle -flat_namespace -undefined suppress @@ -89,13 +96,14 @@ vpath %.m $(USR_VPATH) $(ALL_SRC_DIRS) #-------------------------------------------------- # Header dependency file generation # -# Use compiler when ARCH_CLASS is a single arch value -# otherwise use perl script command -SINGLE_ARCH=$(filter 1,$(words $(ARCH_CLASS))) -HDEPENDS_CFLAGS = $(if $(SINGLE_ARCH),$(HDEPENDS_CFLAGS_$(HDEPENDS))) -HDEPENDS_METHOD = $(if $(SINGLE_ARCH),CFLAGS,CMD) +HDEPENDS_METHOD = CMD #-------------------------------------------------- # Allow site overrides -include $(CONFIG)/os/CONFIG_SITE.Common.iosCommon -include $(CONFIG)/os/CONFIG_SITE.$(EPICS_HOST_ARCH).iosCommon + +#-------------------------------------------------- +# Find the Xcode compilers for the specified SDK just once +CC := $(shell xcrun -sdk $(XCRUN_SDK_BASE) -find $(CC_$(COMPILER))) +CCC := $(shell xcrun -sdk $(XCRUN_SDK_BASE) -find $(CCC_$(COMPILER))) diff --git a/configure/os/CONFIG.Common.linux-arm b/configure/os/CONFIG.Common.linux-arm index 8b0a8c2a4..15dad9e9e 100644 --- a/configure/os/CONFIG.Common.linux-arm +++ b/configure/os/CONFIG.Common.linux-arm @@ -11,9 +11,6 @@ include $(CONFIG)/os/CONFIG.Common.linuxCommon ARCH_CLASS = arm -# Set a special definition for network order of Netwinder ARM floating point -ARCH_DEP_CPPFLAGS += -D_ARM_NWFP_ - ifeq ($(BUILD_CLASS),CROSS) VALID_BUILDS = Ioc GNU_TARGET = arm-linux diff --git a/configure/os/CONFIG.Common.linux-xscale_be b/configure/os/CONFIG.Common.linux-xscale_be index 56b14ecde..f5c9ea8ee 100644 --- a/configure/os/CONFIG.Common.linux-xscale_be +++ b/configure/os/CONFIG.Common.linux-xscale_be @@ -1,13 +1,19 @@ +# CONFIG.Common.linux-xscale_be +# +# This file is maintained by the build community. +# +# Definitions for linux-xscale_be (big-endian) target builds. +# This target has been tested with the MOXA UC-7408-LX Plus. + +# Site-specific overrides of these definitions should be made in the file +# CONFIG_SITE.Common.linux-xscale_be +#------------------------------------------------------- + # Include definitions common to all Linux targets include $(CONFIG)/os/CONFIG.Common.linuxCommon ARCH_CLASS = xscale -# -# The vendor's tool chain needs to be located here -# -GNU_DIR=/usr/local/xscale_be - ifeq ($(BUILD_CLASS),CROSS) VALID_BUILDS = Ioc GNU_TARGET = xscale_be diff --git a/configure/os/CONFIG.Common.win32-x86-cygwin b/configure/os/CONFIG.Common.win32-x86-cygwin index e5f1757af..f4bfbb665 100644 --- a/configure/os/CONFIG.Common.win32-x86-cygwin +++ b/configure/os/CONFIG.Common.win32-x86-cygwin @@ -1,6 +1,6 @@ # CONFIG.Common.win32-x86-cygwin # -# Revision-Id: anj@aps.anl.gov-20101005192737-disfz3vs0f3fiixd +# Revision-Id: anj@aps.anl.gov-20120330194058-if1zwps4ful5rxsr # This file is maintained by the build community. # # Definitions for cygwin-x86 target builds @@ -55,11 +55,12 @@ STATIC_CXXFLAGS_NO= $(VISC_DLL) -D_DLL # But: if there are no objects LIBRARY_LD_OBJS to include # in this library (may be for e.g. base/src/libCompat # on some archs), don't define (and build) any library! -SHRLIB_PREFIX= -SHRLIB_SUFFIX=.dll +SHRLIB_PREFIX = +SHRLIB_SUFFIX_BASE = .dll +SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE) SHRLIBNAME_YES = $(BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX)) -LOADABLE_SHRLIB_PREFIX= -LOADABLE_SHRLIB_SUFFIX=.dll +LOADABLE_SHRLIB_PREFIX = +LOADABLE_SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE) LOADABLE_SHRLIBNAME = $(LOADABLE_BUILD_LIBRARY:%=%$(LOADABLE_SHRLIB_SUFFIX)) # diff --git a/configure/os/CONFIG.Common.win32-x86-mingw b/configure/os/CONFIG.Common.win32-x86-mingw index ed93626d5..754a36e08 100644 --- a/configure/os/CONFIG.Common.win32-x86-mingw +++ b/configure/os/CONFIG.Common.win32-x86-mingw @@ -1,6 +1,6 @@ # CONFIG.Common.win32-x86-mingw # -# Revision-Id: anj@aps.anl.gov-20101005192737-disfz3vs0f3fiixd +# Revision-Id: anj@aps.anl.gov-20120330194058-if1zwps4ful5rxsr # This file is maintained by the build community. # # Definitions for win32-x86-mingw target builds @@ -49,11 +49,12 @@ STATIC_CXXFLAGS_NO= $(VISC_DLL) -D_DLL # But: if there are no objects LIBRARY_LD_OBJS to include # in this library (may be for e.g. base/src/libCompat # on some archs), don't define (and build) any library! -SHRLIB_PREFIX= -SHRLIB_SUFFIX=.dll +SHRLIB_PREFIX = +SHRLIB_SUFFIX_BASE = .dll +SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE) SHRLIBNAME_YES = $(BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX)) -LOADABLE_SHRLIB_PREFIX= -LOADABLE_SHRLIB_SUFFIX=.dll +LOADABLE_SHRLIB_PREFIX = +LOADABLE_SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE) LOADABLE_SHRLIBNAME = $(LOADABLE_BUILD_LIBRARY:%=%$(LOADABLE_SHRLIB_SUFFIX)) # diff --git a/configure/os/CONFIG.darwinCommon.darwinCommon b/configure/os/CONFIG.darwinCommon.darwinCommon index 165a15080..1d4a2616a 100644 --- a/configure/os/CONFIG.darwinCommon.darwinCommon +++ b/configure/os/CONFIG.darwinCommon.darwinCommon @@ -1,6 +1,6 @@ # CONFIG.darwinCommon.darwinCommon # -# Revision-Id: anj@aps.anl.gov-20101005192737-disfz3vs0f3fiixd +# Revision-Id: anj@aps.anl.gov-20130830165151-hoewuuc078dr2pcz # This file is maintained by the build community. # # Common definitions for darwin builds @@ -36,11 +36,6 @@ ARCH_DEP_LDFLAGS += $(ARCH_DEP_FLAGS) # OP_SYS_CFLAGS += -fno-common -# -# Don't try to use precompiled headers when converting sequencer files -# -CPPSNCFLAGS += -no-cpp-precomp - # # Darwin os definition # @@ -52,20 +47,6 @@ OP_SYS_CPPFLAGS += -Ddarwin OPT_CFLAGS_YES += -g OPT_CXXFLAGS_YES += -g -# -# The following two definitions enable the use of DarwinPorts packages. -# -OP_SYS_INCLUDES += -I/opt/local/include -# dir/firstword/wildcard used to avoid warning -L: directory name (...) does not exist -OP_SYS_LDFLAGS += $(addprefix -L,$(dir $(firstword $(wildcard /opt/local/lib/*)))) - -# -# The following two definitions enable the use of Fink packages. -# -OP_SYS_INCLUDES += -I/sw/include -# dir/firstword/wildcard used to avoid warning -L: directory name (...) does not exist -OP_SYS_LDFLAGS += $(addprefix -L,$(dir $(firstword $(wildcard /sw/lib/*)))) - # # Libraries for command-line editing. # @@ -78,18 +59,21 @@ COMMANDLINE_LIBRARY=READLINE GNU_DIR = /usr -CC = $(GNU_BIN)/cc -CCC = $(GNU_BIN)/c++ +# Apple soft-links these compilers to clang/clang++ +CC = cc +CCC = c++ +GNU = NO # # Darwin shared libraries # SHRLIB_VERSION = $(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION) SHRLIB_LDFLAGS = -dynamiclib -flat_namespace -undefined suppress \ - -install_name $(shell perl $(TOOLS)/fullPathName.pl $(INSTALL_LIB))/$@ \ + -install_name $(shell $(FULLPATHNAME) $(INSTALL_LIB))/$@ \ -compatibility_version $(EPICS_VERSION).$(EPICS_REVISION) \ -current_version $(SHRLIB_VERSION) -SHRLIB_SUFFIX = .$(SHRLIB_VERSION).dylib +SHRLIB_SUFFIX_BASE = .dylib +SHRLIB_SUFFIX = .$(SHRLIB_VERSION)$(SHRLIB_SUFFIX_BASE) LOADABLE_SHRLIB_LDFLAGS = -bundle -flat_namespace -undefined suppress diff --git a/configure/os/CONFIG.win32-x86-borland.Common b/configure/os/CONFIG.win32-x86-borland.Common index bf0d8648d..a24fd3bc0 100644 --- a/configure/os/CONFIG.win32-x86-borland.Common +++ b/configure/os/CONFIG.win32-x86-borland.Common @@ -1,6 +1,6 @@ # CONFIG.win32-x86-borland.Common # -# Revision-Id: anj@aps.anl.gov-20110606145131-rpql3fdjvli0113i +# Revision-Id: anj@aps.anl.gov-20120501151545-qvg2fxajclez3k4r # This file is maintained by the build community. # # Definitions for win32-x86-borland host archs diff --git a/configure/os/CONFIG.win32-x86-borland.win32-x86-borland b/configure/os/CONFIG.win32-x86-borland.win32-x86-borland index 700f0f076..e51f96db8 100644 --- a/configure/os/CONFIG.win32-x86-borland.win32-x86-borland +++ b/configure/os/CONFIG.win32-x86-borland.win32-x86-borland @@ -1,6 +1,6 @@ # CONFIG.win32-x86-borland.win32-x86-borland # -# Revision-Id: anj@aps.anl.gov-20101005192737-disfz3vs0f3fiixd +# Revision-Id: anj@aps.anl.gov-20120330194058-if1zwps4ful5rxsr # This file is maintained by the build community. # # Definitions for win32-x86-borland target arch when host arch is win32-x86-borland @@ -176,7 +176,8 @@ LINK.shrlib+= $(DLL_DEF_FLAG),$(LIBRARY_LD_RESS) # But: if there are no objects LIBRARY_LD_OBJS to include # in this library (may be for e.g. base/src/libCompat # on some archs), don't define (and build) any library! -SHRLIB_SUFFIX=.dll +SHRLIB_SUFFIX_BASE = .dll +SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE) SHRLIBNAME_YES = $(BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX)) LOADABLE_SHRLIBNAME = $(LOADABLE_BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX)) diff --git a/configure/os/CONFIG.win32-x86-mingw.Common b/configure/os/CONFIG.win32-x86-mingw.Common index 79ec08171..f3b7f0309 100644 --- a/configure/os/CONFIG.win32-x86-mingw.Common +++ b/configure/os/CONFIG.win32-x86-mingw.Common @@ -1,6 +1,6 @@ # CONFIG.win32-x86-mingw.Common # -# Revision-Id: anj@aps.anl.gov-20110606145131-rpql3fdjvli0113i +# Revision-Id: anj@aps.anl.gov-20120501151545-qvg2fxajclez3k4r # This file is maintained by the build community. # # Definitions for win32-x86-cygwin host archs diff --git a/configure/os/CONFIG.win32-x86-mingw.win32-x86-mingw b/configure/os/CONFIG.win32-x86-mingw.win32-x86-mingw index cfef76c9e..b96af5752 100644 --- a/configure/os/CONFIG.win32-x86-mingw.win32-x86-mingw +++ b/configure/os/CONFIG.win32-x86-mingw.win32-x86-mingw @@ -1,6 +1,6 @@ # CONFIG.win32-x86-mingw.win32-x86-mingw # -# Revision-Id: jba@aps.anl.gov-20101108141612-a8fp39dp7wnk5hu5 +# Revision-Id: anj@aps.anl.gov-20131120005049-xcx9o8ohtimzbib1 # # Definitions for win32-x86-mingw host - win32-x86-mingw target builds # Sites may override these definitions in CONFIG_SITE.win32-x86-mingw.win32-x86-mingw @@ -9,14 +9,15 @@ # Include common gnu compiler definitions include $(CONFIG)/CONFIG.gnuCommon -# gcc, g++, ar, ld, and ranlib must be in user's path -CC = gcc -CCC = g++ -AR = ar -rc -LD = ld -r -RANLIB = ranlib -RES=.coff -RCCMD = windres $(INCLUDES) $< $@ +CMPLR_PREFIX = + +CC = $(CMPLR_PREFIX)gcc +CCC = $(CMPLR_PREFIX)g++ +AR = $(CMPLR_PREFIX)ar -rc +LD = $(CMPLR_PREFIX)ld -r +RANLIB = $(CMPLR_PREFIX)ranlib +RES = .coff +RCCMD = $(CMPLR_PREFIX)windres $(INCLUDES) $< $@ # No -fPIC avoids "-fPIC ignored for target (all code is position independent)" SHRLIB_CFLAGS = @@ -26,4 +27,4 @@ LOADABLE_SHRLIB_LDFLAGS = -shared -Wl,--out-implib,$(LIB_PREFIX)$*$(LIB_SUFFIX) # Override linking with gcc library from CONFIG.gnuCommon GNU_LDLIBS_YES = -OP_SYS_LDLIBS = -lws2_32 +OP_SYS_LDLIBS = -lws2_32 diff --git a/configure/os/CONFIG.win32-x86.Common b/configure/os/CONFIG.win32-x86.Common index 31de6fac5..ee64ad3fa 100644 --- a/configure/os/CONFIG.win32-x86.Common +++ b/configure/os/CONFIG.win32-x86.Common @@ -1,6 +1,6 @@ # CONFIG.win32-x86.Common # -# Revision-Id: anj@aps.anl.gov-20110606145131-rpql3fdjvli0113i +# Revision-Id: anj@aps.anl.gov-20120501151545-qvg2fxajclez3k4r # This file is maintained by the build community. # # Definitions for win32-x86 host archs diff --git a/configure/os/CONFIG.win32-x86.win32-x86 b/configure/os/CONFIG.win32-x86.win32-x86 index 478a72733..9c9b8c2ce 100644 --- a/configure/os/CONFIG.win32-x86.win32-x86 +++ b/configure/os/CONFIG.win32-x86.win32-x86 @@ -1,6 +1,6 @@ # CONFIG.win32-x86.win32-x86 # -# Revision-Id: jba@aps.anl.gov-20110805170230-c0yd86k1a0ujy7fu +# Revision-Id: anj@aps.anl.gov-20120330194058-if1zwps4ful5rxsr # This file is maintained by the build community. # # Definitions for win32-x86 target archs when host arch is win32-x86 @@ -212,7 +212,8 @@ MUNCH_CMD = $(CCC) /Fo $@ $^ # But: if there are no objects LIBRARY_LD_OBJS to include # in this library (may be for e.g. base/src/libCompat # on some archs), don't define (and build) any library! -SHRLIB_SUFFIX=.dll +SHRLIB_SUFFIX_BASE = .dll +SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE) SHRLIBNAME_YES = $(BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX)) LOADABLE_SHRLIBNAME = $(LOADABLE_BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX)) diff --git a/configure/os/CONFIG_SITE.Common.RTEMS b/configure/os/CONFIG_SITE.Common.RTEMS index bf6195bcf..d8b700b8c 100644 --- a/configure/os/CONFIG_SITE.Common.RTEMS +++ b/configure/os/CONFIG_SITE.Common.RTEMS @@ -5,21 +5,22 @@ # Where to find RTEMS # -RTEMS_VERSION=4.9.2 -RTEMS_BASE=/usr/local/rtems/rtems-$(RTEMS_VERSION) +RTEMS_VERSION = 4.10.2 +RTEMS_BASE = /usr/local/rtems/rtems-$(RTEMS_VERSION) # Cross-compile toolchain in $(RTEMS_TOOLS)/bin # -RTEMS_TOOLS=$(RTEMS_BASE) +RTEMS_TOOLS = $(RTEMS_BASE) # If you're using neither BOOTP/DHCP nor FLASH to pick up your IOC -# network configuration you must uncomment and specify your Internet +# network configuration you must uncomment and specify your Internet # Domain Name here # #OP_SYS_CFLAGS += -DRTEMS_NETWORK_CONFIG_DNS_DOMAINNAME= -# -# Specify your desired command-line-input library +# Select the command-line-input library to use # COMMANDLINE_LIBRARY = EPICS +#COMMANDLINE_LIBRARY = LIBTECLA +#COMMANDLINE_LIBRARY = READLINE diff --git a/configure/os/CONFIG_SITE.Common.cygwin-x86 b/configure/os/CONFIG_SITE.Common.cygwin-x86 index e0eb585ec..77879b6d7 100644 --- a/configure/os/CONFIG_SITE.Common.cygwin-x86 +++ b/configure/os/CONFIG_SITE.Common.cygwin-x86 @@ -1,10 +1,13 @@ # CONFIG_SITE.Common.cygwin-x86 # -# Revision-Id: anj@aps.anl.gov-20101005192737-disfz3vs0f3fiixd +# Revision-Id: jba@aps.anl.gov-20121205210226-0i3d06gcoe1pt39x # # Site Specific definitions for cygwin-x86 target # Only the local epics system manager should modify this file # If readline is installed uncomment the following line # to add command-line editing and history support -COMMANDLINE_LIBRARY = READLINE +#COMMANDLINE_LIBRARY = READLINE + +# Uncomment the following line if readline has problems +#LDLIBS_READLINE= -lreadline -lcurses diff --git a/configure/os/CONFIG_SITE.Common.darwin-x86 b/configure/os/CONFIG_SITE.Common.darwin-x86 index 3bdde8710..07aa57370 100644 --- a/configure/os/CONFIG_SITE.Common.darwin-x86 +++ b/configure/os/CONFIG_SITE.Common.darwin-x86 @@ -1,23 +1,37 @@ # CONFIG_SITE.Common.darwin-x86 # -# Revision-Id: jba@aps.anl.gov-20110727210802-dy8pljbg3tx9i9fs +# Revision-Id: anj@aps.anl.gov-20130830165151-hoewuuc078dr2pcz # This file is maintained by the build community. # # Site override definitions for darwin-x86 target builds #------------------------------------------------------- # Select which CPU architecture(s) to include in your MacOS binaries: -# i386 -# x86_64 - Needs MacOS 10.4 with the Universal SDK, or 10.5 and later +# i386, x86_64, or both (fat binaries). -ARCH_CLASS = i386 -#ARCH_CLASS = x86_64 +#ARCH_CLASS = i386 +ARCH_CLASS = x86_64 #ARCH_CLASS = i386 x86_64 # -# Uncomment the followings lines to build with CLANG instead of GCC. +# Uncomment the following 3 lines to build with Apple's GCC instead of CLANG. # -#CC = clang -#CCC = clang++ -#GNU_LDLIBS_YES = +#CC = gcc +#CCC = g++ +#GNU = YES + + +# To use MacPorts GCC uncomment (and modify if necessary) the following: + +#GNU_DIR = /opt/local +#CC = $(GNU_BIN)/gcc -m64 +#CCC = $(GNU_BIN)/g++ -m64 +#GNU = YES + +# If you see this or similar errors while building in the src/cap5 directory +# gcc: error: unrecognized option '-no-cpp-precomp' +# the problem is due to the ccflags configuration that your version of Perl +# was built with. You can replace the Cap5_CFLAGS setting in the Makefile +# with a hand-edited set of flags for building that Perl library, or ignore +# this problem if you don't need to use Channel Access from Perl. diff --git a/configure/os/CONFIG_SITE.Common.ios-arm b/configure/os/CONFIG_SITE.Common.ios-arm index 89daf1cf9..a6773b829 100644 --- a/configure/os/CONFIG_SITE.Common.ios-arm +++ b/configure/os/CONFIG_SITE.Common.ios-arm @@ -1,28 +1,31 @@ # CONFIG_SITE.Common.ios-arm # -# Revision-Id: anj@aps.anl.gov-20111202164243-clxybuefflizbyvr -# This file is maintained by the build community. +# Revision-Id: anj@aps.anl.gov-20130924203026-ds44hcsnrh82licl # # Site-specific settings for ios-arm target builds #------------------------------------------------------- # Which ARM instruction set(s) to generate code for: -# Most iOS devices can run programs compiled for both the -# ARMv6 and ARMv7 instruction sets. ARMv7 code is usually -# more efficient, but the older devices listed below can only -# use the ARMv6 instruction set. Including both architectures -# generates a Universal binary, which is larger and takes -# longer to compile but runs efficiently on all devices. +# Most iOS devices can run programs compiled for older +# instruction sets, although the newer instructions are +# more efficient. # -# ARMv6-only devices: iPhone 1 or 3G, iPod Touch Gen 1 or 2 +# Apple's compilers can build for multiple architectures, +# generating a Universal binary. This is larger and takes +# longer to compile, but runs efficiently on all devices. # -ARCH_CLASS = armv7 +# Xcode 4.5 dropped support for the ARMv6. +# +# ARMv8 (arm64) devices: iPhone 5S +# ARMv7s devices: iPhone 5 and 5C, iPad Gen 4 +# ARMv7 devices: iPhone 3GS, 4 and 4S, iPod Touch Gen 3 to 5 +# iPad Gen 1 to 3, iPad Mini, Apple TV Gen 2 and 3 +# ARMv6 devices: iPhone 1 and 3G, iPod Touch Gen 1 and 2 + +#ARCH_CLASS = arm64 +#ARCH_CLASS = armv7s arm64 +ARCH_CLASS = armv7 armv7s arm64 +#ARCH_CLASS = armv7 armv7s +#ARCH_CLASS = armv7 #ARCH_CLASS = armv6 armv7 #ARCH_CLASS = armv6 - - -# Uncomment these two definitions to use g++ instead of clang++ -# which may be needed in some circumstances: -# -#CCC = $(GNU_BIN)/c++ -#GNU_LDLIBS_YES = -lgcc diff --git a/configure/os/CONFIG_SITE.Common.iosCommon b/configure/os/CONFIG_SITE.Common.iosCommon index c490445fa..b20e851e1 100644 --- a/configure/os/CONFIG_SITE.Common.iosCommon +++ b/configure/os/CONFIG_SITE.Common.iosCommon @@ -1,7 +1,6 @@ # CONFIG_SITE.Common.iosCommon # -# Revision-Id: anj@aps.anl.gov-20111202164243-clxybuefflizbyvr -# This file is maintained by the build community. +# Revision-Id: anj@aps.anl.gov-20130924203026-ds44hcsnrh82licl # # Site-specific settings for Apple iOS builds #------------------------------------------------------- @@ -10,17 +9,33 @@ #IOS_VERSION = 3.2 #IOS_VERSION = 4.1 +#IOS_VERSION = 4.2 #IOS_VERSION = 4.3 -IOS_VERSION = 5.0 +#IOS_VERSION = 5.0 +#IOS_VERSION = 5.1 +#IOS_VERSION = 6.0 +#IOS_VERSION = 6.1 +IOS_VERSION = 7.0 -# Most sites will want shared libraries +# Which compiler to use: +# CLANG is required for Xcode 5.0 and later +# LLVM_GNU uses the llvm-gcc and llvm-g++ compilers +# GNU is needed for older versions of Xcode -STATIC_BUILD=NO -SHARED_LIBRARIES=YES +COMPILER = CLANG +#COMPILER = LLVM_GNU +#COMPILER = GNU -# Platform path, this is probably correct +# Most sites will want to build shared libraries (which is the +# default), but if you get an error from ld while building libCom, +# try uncommenting this, which is needed for some compiler versions: + +#SHARED_LIBRARIES = NO + + +# Get platform path from OS, these are usually correct: XCODE_PATH := $(shell xcode-select -print-path) PLATFORM_DIR = $(XCODE_PATH)/Platforms/$(IOS_PLATFORM).platform diff --git a/configure/os/CONFIG_SITE.Common.linux-x86 b/configure/os/CONFIG_SITE.Common.linux-x86 index cb57b0d4a..cc0cab724 100644 --- a/configure/os/CONFIG_SITE.Common.linux-x86 +++ b/configure/os/CONFIG_SITE.Common.linux-x86 @@ -1,6 +1,6 @@ # CONFIG_SITE.Common.linux-x86 # -# Revision-Id: anj@aps.anl.gov-20111207195604-heciohzgvyhhpgrb +# Revision-Id: jba@aps.anl.gov-20130725154926-szg53grbkd982szq # # Site Specific definitions for linux-x86 target # Only the local epics system manager should modify this file @@ -38,3 +38,4 @@ COMMANDLINE_LIBRARY = READLINE # This does cost disk space, but not memory as debug symbols are not # loaded into RAM when the binary is loaded. OPT_CFLAGS_YES += -g +OPT_CXXFLAGS_YES += -g diff --git a/configure/os/CONFIG_SITE.Common.linux-x86_64 b/configure/os/CONFIG_SITE.Common.linux-x86_64 index a69b4a7a2..c2f4325f3 100644 --- a/configure/os/CONFIG_SITE.Common.linux-x86_64 +++ b/configure/os/CONFIG_SITE.Common.linux-x86_64 @@ -1,6 +1,6 @@ # CONFIG_SITE.Common.linux-x86_64 # -# Revision-Id: anj@aps.anl.gov-20111207195604-heciohzgvyhhpgrb +# Revision-Id: jba@aps.anl.gov-20130725154926-szg53grbkd982szq # # Site Specific definitions for linux-x86_64 target # Only the local epics system manager should modify this file @@ -38,3 +38,4 @@ COMMANDLINE_LIBRARY = READLINE # This does cost disk space, but not memory as debug symbols are not # loaded into RAM when the binary is loaded. OPT_CFLAGS_YES += -g +OPT_CXXFLAGS_YES += -g diff --git a/configure/os/CONFIG_SITE.Common.vxWorksCommon b/configure/os/CONFIG_SITE.Common.vxWorksCommon index 3fdc22ef9..17696fd36 100644 --- a/configure/os/CONFIG_SITE.Common.vxWorksCommon +++ b/configure/os/CONFIG_SITE.Common.vxWorksCommon @@ -20,6 +20,7 @@ VXWORKS_VERSION = 5.5 #VXWORKS_VERSION = 6.6 #VXWORKS_VERSION = 6.7 #VXWORKS_VERSION = 6.8 +#VXWORKS_VERSION = 6.9 # Sites may override the following path for a particular host @@ -40,6 +41,7 @@ WIND_BASE = /usr/local/vw/tornado22-$(ARCH_CLASS) #WORKBENCH_VERSION = 2.6 #WORKBENCH_VERSION = 3.0 #WORKBENCH_VERSION = 3.2 +#WORKBENCH_VERSION = 3.3 # Utilities Version number, required from vxWorks 6.8 and later diff --git a/configure/os/CONFIG_SITE.cygwin-x86.Common b/configure/os/CONFIG_SITE.cygwin-x86.Common index fc2df9f67..c77fb3430 100644 --- a/configure/os/CONFIG_SITE.cygwin-x86.Common +++ b/configure/os/CONFIG_SITE.cygwin-x86.Common @@ -1,10 +1,10 @@ # CONFIG_SITE.cygwin-x86.Common # -# Revision-Id: anj@aps.anl.gov-20101005192737-disfz3vs0f3fiixd +# Revision-Id: anj@aps.anl.gov-20120621170904-2txmg0i9dqhhgnwt # This file is maintained by the build community. # # Site override definitions for cygwin-x86 host builds #------------------------------------------------------- -CROSS_COMPILER_TARGET_ARCHS = +#CROSS_COMPILER_TARGET_ARCHS = diff --git a/configure/os/CONFIG_SITE.linux-x86.linux-arm b/configure/os/CONFIG_SITE.linux-x86.linux-arm index 34d3d8aa1..bdc48995b 100644 --- a/configure/os/CONFIG_SITE.linux-x86.linux-arm +++ b/configure/os/CONFIG_SITE.linux-x86.linux-arm @@ -1,12 +1,14 @@ # CONFIG_SITE.linux-x86.linux-arm # -# Revision-Id: anj@aps.anl.gov-20101005192737-disfz3vs0f3fiixd +# Revision-Id: anj@aps.anl.gov-20120730225030-kxdpux061bt13ng1 # # Site specific definitions for linux-x86 host - linux-arm target builds #------------------------------------------------------- -# Diamond: +# Tools install path #GNU_DIR = /home/targetOS/linux-arm/host/x86-linux/gcc_3.3.3 -# anj@aps: -#GNU_DIR = /local/anj/cross-arm/gcc-3.4.5-glibc-2.3.6/arm-linux +GNU_DIR = /net/phoebus/vw/zynq-2011.09 + +# GNU crosscompiler target name +GNU_TARGET = arm-xilinx-linux-gnueabi