Index: CONFIG.Common.vxWorksCommon =================================================================== RCS file: /usr/local/epicsmgr/cvsroot/epics/base/configure/os/CONFIG.Common.vxWorksCommon,v retrieving revision 1.35.2.20 retrieving revision 1.35.2.22 diff -d -u -b -B -p -r1.35.2.20 -r1.35.2.22 --- CONFIG.Common.vxWorksCommon 18 Aug 2008 18:54:26 -0000 1.35.2.20 +++ CONFIG.Common.vxWorksCommon 1 Dec 2009 19:31:37 -0000 1.35.2.22 @@ -91,6 +91,7 @@ VX_GNU_VERSION_6.3 = 3.4.4 VX_GNU_VERSION_6.4 = 3.4.4 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 = $(VX_GNU_VERSION_$(VXWORKS_VERSION)) VX_GNU_MAJOR_VERSION = $(basename $(basename $(VX_GNU_VERSION))) @@ -131,6 +132,7 @@ NM_DIR_6.3 = $(GNU_BIN) NM_DIR_6.4 = $(GNU_BIN) NM_DIR_6.5 = $(GNU_BIN) NM_DIR_6.6 = $(WIND_BASE)/workbench-$(WORKBENCH_VERSION)/$(WIND_HOST_TYPE)/bin +NM_DIR_6.7 = $(WIND_BASE)/workbench-$(WORKBENCH_VERSION)/$(WIND_HOST_TYPE)/bin NM_DIR_6 = $(NM_DIR_$(VXWORKS_VERSION)) NM_DIR = $(NM_DIR_$(VXWORKS_MAJOR_VERSION)) @@ -149,8 +151,10 @@ export TOOL_FAMILY = GNU #-------------------------------------------------- # Operating system flags -OP_SYS_CPPFLAGS += -DvxWorks -OP_SYS_CFLAGS += -fno-builtin +BSD_DEFINE_VERSION_6.7 = -DBSD=44 +OP_BSD_DEFINE = $(BSD_DEFINE_VERSION_$(VXWORKS_VERSION)) +OP_SYS_CPPFLAGS += -DvxWorks $(OP_BSD_DEFINE) +OP_SYS_CFLAGS += -fno-builtin $(OP_BSD_DEFINE) # Fix for vxWorks headers that use macros defined in vxWorks.h but # which don't actually include vxWorks.h themselves, for example the