epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Removed references to VxWorks 5.x

Browse Source
This commit is contained in:
Andrew Johnson
2015-06-09 15:36:28 -05:00
parent 961dc450c4
commit 155017bf09
12 changed files with 37 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
configure/os/CONFIG.Common.vxWorksCommon
View File

@@ -1,10 +1,9 @@
# CONFIG.Common.vxWorksCommon # CONFIG.Common.vxWorksCommon
# #
# $Revision-Id$ # $Revision-Id$
# This file is maintained by the build community.
# #
# Definitions for vxWorks target archs # Definitions for vxWorks target archs
# Sites may override these definitions in CONFIG_SITE.Common.vxWorksCommon # Override these definitions in CONFIG_SITE.Common.vxWorksCommon
# or CONFIG_SITE.<host>.vxWorksCommon # or CONFIG_SITE.<host>.vxWorksCommon
#------------------------------------------------------- #-------------------------------------------------------
@@ -66,8 +65,6 @@ VXWORKS_MAJOR_VERSION = $(basename $(basename $(VXWORKS_VERSION)))
# These are needed for vxWorks 6.x; the GNU toolset version number # These are needed for vxWorks 6.x; the GNU toolset version number
# is in the path to the compiler tools: # is in the path to the compiler tools:
VX_GNU_VERSION_5.4 = 2.95
VX_GNU_VERSION_5.5 = 2.96
VX_GNU_VERSION_6.0 = 3.3.2 VX_GNU_VERSION_6.0 = 3.3.2
VX_GNU_VERSION_6.1 = 3.3.2 VX_GNU_VERSION_6.1 = 3.3.2
VX_GNU_VERSION_6.2 = 3.3.2 VX_GNU_VERSION_6.2 = 3.3.2
@@ -83,30 +80,21 @@ VX_GNU_VERSION = $(VX_GNU_VERSION_$(VXWORKS_VERSION))
VX_GNU_MAJOR_VERSION = $(basename $(basename $(VX_GNU_VERSION))) VX_GNU_MAJOR_VERSION = $(basename $(basename $(VX_GNU_VERSION)))
#-------------------------------------------------- #--------------------------------------------------
# Fix WIND_BASE for vxWorks 6.x on linux # Fix old Linux WIND_HOST_TYPE
# NB: We know the value of WIND_HOST_TYPE here, but not VXWORKS_VERSION
ifeq ($(WIND_HOST_TYPE),x86-linux) ifeq ($(WIND_HOST_TYPE),x86-linux)
WIND_HOST_TYPE_5 = x86-linux WIND_HOST_TYPE = x86-linux2
WIND_HOST_TYPE_6 = x86-linux2
WIND_HOST_TYPE = $(WIND_HOST_TYPE_$(VXWORKS_MAJOR_VERSION))
endif endif
#-------------------------------------------------- #--------------------------------------------------
# vxWorks directory definitions # vxWorks directory definitions
VX_DIR_5 = $(WIND_BASE) VX_DIR = $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)
VX_DIR_6 = $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)
VX_DIR = $(VX_DIR_$(VXWORKS_MAJOR_VERSION))
VX_INCLUDE_DIRS_5 = $(VX_DIR)/target/h GNU_TARGET_INCLUDE_DIR = $(VX_DIR)/target/h $(VX_DIR)/target/h/wrn/coreip
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 # vxWorks GNU directories
GNU_DIR_5 = $(WIND_BASE)/host/$(WIND_HOST_TYPE) GNU_DIR = $(WIND_BASE)/gnu/$(VX_GNU_VERSION)-vxworks-$(VXWORKS_VERSION)/$(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))
#-------------------------------------------------- #--------------------------------------------------
# Wind River moved nm out of GNU_BIN in some versions # Wind River moved nm out of GNU_BIN in some versions
@@ -126,9 +114,7 @@ NM = $(NM_DIR)/$(CMPLR_PREFIX)nm$(CMPLR_SUFFIX)$(HOSTEXE)
#-------------------------------------------------- #--------------------------------------------------
# A linker script is essential for munching from vxWorks 6.6 onwards # A linker script is essential for munching from vxWorks 6.6 onwards
# (i.e. with versions that use gcc 4.1.2 or later). It can be used # (i.e. with versions that use gcc 4.1.2 or later).
# with any vxWorks 5 or 6 version, but apparently should not be used
# when compiling for 68K (which isn't supported in vxWorks 6 anyway)
MUNCH_LDFLAGS_6 = -T $(VX_DIR)/target/h/tool/gnu/ldscripts/link.OUT MUNCH_LDFLAGS_6 = -T $(VX_DIR)/target/h/tool/gnu/ldscripts/link.OUT
MUNCH_LDFLAGS = $(MUNCH_LDFLAGS_$(VXWORKS_MAJOR_VERSION)) MUNCH_LDFLAGS = $(MUNCH_LDFLAGS_$(VXWORKS_MAJOR_VERSION))
@@ -143,11 +129,10 @@ export TOOL_FAMILY = GNU
OP_SYS_CPPFLAGS += -DvxWorks=vxWorks OP_SYS_CPPFLAGS += -DvxWorks=vxWorks
OP_SYS_CFLAGS += -fno-builtin OP_SYS_CFLAGS += -fno-builtin
# Fix for vxWorks 5 headers that use macros defined in vxWorks.h but # Fix for vxWorks headers that use macros defined in vxWorks.h but
# which don't actually include vxWorks.h themselves, for example the # which don't actually include vxWorks.h themselves, for example the
# target/h/sys/stat.h file which uses ULONG. This also stops dbDefs.h # target/h/sys/stat.h file which uses ULONG. This also stops dbDefs.h
# from defining the OFFSET macro, which generates lots of warnings in # from defining the OFFSET macro, which generates lots of warnings.
# both vxWorks 5 and 6.
OP_SYS_INCLUDE_CPPFLAGS += -include $(VX_DIR)/target/h/vxWorks.h OP_SYS_INCLUDE_CPPFLAGS += -include $(VX_DIR)/target/h/vxWorks.h
#-------------------------------------------------- #--------------------------------------------------
@@ -160,7 +145,6 @@ OPT_CXXFLAGS_YES = -O2
CODE_CFLAGS = CODE_CFLAGS =
# #
# For vxWorks versions before 6.3 we need this g++ compiler flag # 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.0 = -fno-implicit-templates
CODE_CXXFLAGS_6.1 = -fno-implicit-templates CODE_CXXFLAGS_6.1 = -fno-implicit-templates
CODE_CXXFLAGS_6.2 = -fno-implicit-templates CODE_CXXFLAGS_6.2 = -fno-implicit-templates

2
configure/os/CONFIG.linux-386.Common
View File

@@ -10,4 +10,4 @@
#Include definitions common to unix hosts #Include definitions common to unix hosts
include $(CONFIG)/os/CONFIG.UnixCommon.Common include $(CONFIG)/os/CONFIG.UnixCommon.Common
WIND_HOST_TYPE = x86-linux WIND_HOST_TYPE = x86-linux2

2
configure/os/CONFIG.linux-486.Common
View File

@@ -10,4 +10,4 @@
#Include definitions common to unix hosts #Include definitions common to unix hosts
include $(CONFIG)/os/CONFIG.UnixCommon.Common include $(CONFIG)/os/CONFIG.UnixCommon.Common
WIND_HOST_TYPE = x86-linux WIND_HOST_TYPE = x86-linux2

2
configure/os/CONFIG.linux-586.Common
View File

@@ -10,4 +10,4 @@
#Include definitions common to unix hosts #Include definitions common to unix hosts
include $(CONFIG)/os/CONFIG.UnixCommon.Common include $(CONFIG)/os/CONFIG.UnixCommon.Common
WIND_HOST_TYPE = x86-linux WIND_HOST_TYPE = x86-linux2

2
configure/os/CONFIG.linux-686.Common
View File

@@ -10,4 +10,4 @@
#Include definitions common to unix hosts #Include definitions common to unix hosts
include $(CONFIG)/os/CONFIG.UnixCommon.Common include $(CONFIG)/os/CONFIG.UnixCommon.Common
WIND_HOST_TYPE = x86-linux WIND_HOST_TYPE = x86-linux2

2
configure/os/CONFIG.linux-x86.Common
View File

@@ -10,4 +10,4 @@
#Include definitions common to unix hosts #Include definitions common to unix hosts
include $(CONFIG)/os/CONFIG.UnixCommon.Common include $(CONFIG)/os/CONFIG.UnixCommon.Common
WIND_HOST_TYPE = x86-linux WIND_HOST_TYPE = x86-linux2

2
configure/os/CONFIG.linux-x86_64.Common
View File

@@ -10,4 +10,4 @@
#Include definitions common to unix hosts #Include definitions common to unix hosts
include $(CONFIG)/os/CONFIG.UnixCommon.Common include $(CONFIG)/os/CONFIG.UnixCommon.Common
WIND_HOST_TYPE = x86-linux WIND_HOST_TYPE = x86-linux2

24
configure/os/CONFIG_SITE.Common.vxWorksCommon
View File

@@ -1,25 +1,17 @@
# CONFIG_SITE.Common.vxWorksCommon # CONFIG_SITE.Common.vxWorksCommon
# #
# Site specific definitions for vxWorks target builds. # Site specific definitions for vxWorks target builds.
# Only the local epics system manager should modify this file
# Compiler options can vary with the vxWorks version number, so we # Compiler options can vary with the vxWorks version number, so we
# need to know that. However don't include any third-level digits # need to know that. Do not include any third-level digits.
# (e.g. the .2 in 5.5.2) because we don't need them.
# Note: vxWorks 5.4.x (Tornado 2.0.x) is not supported # Note: vxWorks 5.4.x and 5.5.x (Tornado 2.x) are not supported.
# VxWorks 6.0 through 6.5 use older, untested versions of GCC.
VXWORKS_VERSION = 5.5
#VXWORKS_VERSION = 6.0
#VXWORKS_VERSION = 6.1
#VXWORKS_VERSION = 6.2
#VXWORKS_VERSION = 6.3
#VXWORKS_VERSION = 6.4
#VXWORKS_VERSION = 6.5
#VXWORKS_VERSION = 6.6 #VXWORKS_VERSION = 6.6
#VXWORKS_VERSION = 6.7 #VXWORKS_VERSION = 6.7
#VXWORKS_VERSION = 6.8 #VXWORKS_VERSION = 6.8
#VXWORKS_VERSION = 6.9 VXWORKS_VERSION = 6.9
# Sites may override the following path for a particular host # Sites may override the following path for a particular host
@@ -27,10 +19,8 @@ VXWORKS_VERSION = 5.5
# CONFIG_SITE.$(EPICS_HOST_ARCH).vxWorksCommon file. # CONFIG_SITE.$(EPICS_HOST_ARCH).vxWorksCommon file.
# WIND_BASE is where you installed the Wind River software. # WIND_BASE is where you installed the Wind River software.
# Under vxWorks 6.x this is *not* the same as the old VX_DIR setting
WIND_BASE = /usr/local/vw/tornado22-$(ARCH_CLASS) WIND_BASE = /usr/local/vw/vxWorks-$(VXWORKS_VERSION)
#WIND_BASE = /usr/local/vw/vxWorks-$(VXWORKS_VERSION)
#WIND_BASE = /ade/vxWorks/$(VXWORKS_VERSION) #WIND_BASE = /ade/vxWorks/$(VXWORKS_VERSION)
@@ -39,9 +29,9 @@ WIND_BASE = /usr/local/vw/tornado22-$(ARCH_CLASS)
#WORKBENCH_VERSION = 2.6 #WORKBENCH_VERSION = 2.6
#WORKBENCH_VERSION = 3.0 #WORKBENCH_VERSION = 3.0
#WORKBENCH_VERSION = 3.2 #WORKBENCH_VERSION = 3.2
#WORKBENCH_VERSION = 3.3 WORKBENCH_VERSION = 3.3
# Utilities Version number, required from vxWorks 6.8 and later # Utilities Version number, required from vxWorks 6.8 and later
#UTILITIES_VERSION = 1.0 UTILITIES_VERSION = 1.0

16
documentation/README.1st
View File

@@ -85,17 +85,17 @@
as processes on the host platform. as processes on the host platform.
vxWorks vxWorks
You must have vxWorks 5.5.x or 6.x installed if any of your target You must have vxWorks 6 installed if any of your target systems are
systems are vxWorks systems; the C++ compiler for vxWorks 5.4 is now too vxWorks systems; the C++ compilers for vxWorks 5.x are now too old to
old to support. The vxWorks installation provides the cross-compiler and support. The vxWorks installation provides the cross-compiler and header
header files needed to build for these targets. The absolute path to and files needed to build for these targets. The absolute path to and the
the version number of the vxWorks installation must be set in the version number of the vxWorks installation must be set in the
base/configure/os/CONFIG_SITE.Common.vxWorksCommon file or in one of its base/configure/os/CONFIG_SITE.Common.vxWorksCommon file or in one of its
target-specific overrides. target-specific overrides.
Consult the vxWorks 5.x or vxWorks 6.x EPICS web pages about and the Consult the vxWorks 6.x EPICS web pages and the vxWorks documentation
vxWorks documentation for information about configuring your vxWorks for information about configuring your vxWorks operating system for use
operating system for use with EPICS. with EPICS.
RTEMS RTEMS
For RTEMS targets, you need RTEMS core and toolset version 4.9.2 or For RTEMS targets, you need RTEMS core and toolset version 4.9.2 or

11
documentation/README.html
View File

@@ -90,17 +90,16 @@
as processes on the host platform.</P> as processes on the host platform.</P>
<P><B>vxWorks</B><BR> <P><B>vxWorks</B><BR>
You must have vxWorks 5.5.x or 6.x installed if any of your target systems are You must have vxWorks 6 installed if any of your target systems are vxWorks
vxWorks systems; the C++ compiler for vxWorks 5.4 is now too old to support. systems; the C++ compilers for vxWorks 5.x are now too old to support. The
The vxWorks installation provides the cross-compiler and header files needed to vxWorks installation provides the cross-compiler and header files needed to
build for these targets. The absolute path to and the version number of the build for these targets. The absolute path to and the version number of the
vxWorks installation must be set in the vxWorks installation must be set in the
base/configure/os/CONFIG_SITE.Common.vxWorksCommon file or in one of its base/configure/os/CONFIG_SITE.Common.vxWorksCommon file or in one of its
target-specific overrides.</P> target-specific overrides.</P>
<P>Consult the <a href="http://www.aps.anl.gov/epics/base/tornado.php">vxWorks <P>Consult the <a href="http://www.aps.anl.gov/epics/base/vxWorks6.php">vxWorks
5.x</a> or <a href="http://www.aps.anl.gov/epics/base/vxWorks6.php">vxWorks 6.x</a> EPICS web pages and the vxWorks documentation for information
6.x</a> EPICS web pages about and the vxWorks documentation for information
about configuring your vxWorks operating system for use with EPICS.</P> about configuring your vxWorks operating system for use with EPICS.</P>
<P><B>RTEMS</B><BR> <P><B>RTEMS</B><BR>

1
src/libCom/osi/os/vxWorks/osdStdio.c
View File

@@ -9,6 +9,7 @@
\*************************************************************************/ \*************************************************************************/
#include <string.h> #include <string.h>
#include <vxWorks.h>
#include <fioLib.h> #include <fioLib.h>
#include "epicsStdio.h" #include "epicsStdio.h"
#include "dbDefs.h" #include "dbDefs.h"

1
src/libCom/osi/os/vxWorks/osdWireConfig.h
View File

@@ -9,6 +9,7 @@
#ifndef osdWireConfig_h #ifndef osdWireConfig_h
#define osdWireConfig_h #define osdWireConfig_h
#include <vxWorks.h>
#include <types/vxArch.h> #include <types/vxArch.h>
#if _BYTE_ORDER == _LITTLE_ENDIAN #if _BYTE_ORDER == _LITTLE_ENDIAN