diff --git a/configure/os/CONFIG.Common.vxWorksCommon b/configure/os/CONFIG.Common.vxWorksCommon index 832a44d55..0723c1531 100644 --- a/configure/os/CONFIG.Common.vxWorksCommon +++ b/configure/os/CONFIG.Common.vxWorksCommon @@ -94,6 +94,7 @@ VX_GNU_VERSION_6.5 = 3.4.4 VX_GNU_VERSION_6.6 = 4.1.2 VX_GNU_VERSION_6.7 = 4.1.2 VX_GNU_VERSION_6.8 = 4.1.2 +VX_GNU_VERSION_6.9 = 4.3.3 VX_GNU_VERSION = $(VX_GNU_VERSION_$(VXWORKS_VERSION)) VX_GNU_MAJOR_VERSION = $(basename $(basename $(VX_GNU_VERSION))) @@ -135,6 +136,7 @@ NM_DIR_6.5 = $(WORKBENCH_BIN) NM_DIR_6.6 = $(WORKBENCH_BIN) NM_DIR_6.7 = $(GNU_BIN) NM_DIR_6.8 = $(UTILITIES_BIN) +NM_DIR_6.9 = $(UTILITIES_BIN) NM_DIR = $(firstword $(NM_DIR_$(VXWORKS_VERSION)) $(GNU_BIN)) NM = $(NM_DIR)/$(CMPLR_PREFIX)nm$(CMPLR_SUFFIX)$(HOSTEXE) @@ -148,14 +150,9 @@ MUNCH_LDFLAGS_6 = -T $(VX_DIR)/target/h/tool/gnu/ldscripts/link.OUT MUNCH_LDFLAGS = $(MUNCH_LDFLAGS_$(VXWORKS_MAJOR_VERSION)) #-------------------------------------------------- -# The follow 2 exports prevent gnu cross-compiler -# from finding wrong assembler (as). +# These are required by some of the Wind River tools export WIND_BASE export WIND_HOST_TYPE - -#-------------------------------------------------- -# Tornado2.2 -# The follow export allows vxWorks.h to include gnu header files export TOOL_FAMILY = GNU #-------------------------------------------------- diff --git a/configure/os/CONFIG_SITE.Common.vxWorksCommon b/configure/os/CONFIG_SITE.Common.vxWorksCommon index 3fdc22ef9..993694350 100644 --- a/configure/os/CONFIG_SITE.Common.vxWorksCommon +++ b/configure/os/CONFIG_SITE.Common.vxWorksCommon @@ -5,11 +5,10 @@ # Compiler options can vary with the vxWorks version number, so we # need to know that. However don't include any third-level digits -# (the .2 in 5.4.2) because we don't currently need them. +# (e.g. the .2 in 5.5.2) because we don't need them. -# Note: vxWorks 5.3 (Tornado 1.x) is not supported +# Note: vxWorks 5.4.x (Tornado 2.0.x) is not supported -#VXWORKS_VERSION = 5.4 VXWORKS_VERSION = 5.5 #VXWORKS_VERSION = 6.0 #VXWORKS_VERSION = 6.1 @@ -20,6 +19,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 @@ -29,17 +29,17 @@ VXWORKS_VERSION = 5.5 # 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/tornado202p1 WIND_BASE = /usr/local/vw/tornado22-$(ARCH_CLASS) #WIND_BASE = /usr/local/vw/vxWorks-$(VXWORKS_VERSION) #WIND_BASE = /ade/vxWorks/$(VXWORKS_VERSION) -# WorkBench Version number, required for vxWorks 6.x +# WorkBench Version number, if you're using vxWorks 6.x #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