From 31a1e53595ea7f3b4a45e7e42ec501210ec9fe1f Mon Sep 17 00:00:00 2001 From: zimoch Date: Wed, 27 Nov 2013 09:53:36 +0000 Subject: [PATCH] merge with 3.14.12.4-pre1 keep our -fno-strict-aliasing flags --- configure/os/CONFIG.Common.vxWorksCommon | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configure/os/CONFIG.Common.vxWorksCommon b/configure/os/CONFIG.Common.vxWorksCommon index da4f76731..0a5d885a6 100644 --- a/configure/os/CONFIG.Common.vxWorksCommon +++ b/configure/os/CONFIG.Common.vxWorksCommon @@ -1,6 +1,6 @@ # CONFIG.Common.vxWorksCommon # -# Revision-Id: anj@aps.anl.gov-20110610151440-534gadgi98sgedyd +# Revision-Id: anj@aps.anl.gov-20130329161709-tpe2r5nie1xw5k9f # This file is maintained by the build community. # # Definitions for vxWorks target archs @@ -93,6 +93,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))) @@ -134,6 +135,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) @@ -190,6 +192,7 @@ CODE_CXXFLAGS_6.2 = -fno-implicit-templates CODE_CXXFLAGS_6 = $(CODE_CXXFLAGS_$(VXWORKS_VERSION)) CODE_CXXFLAGS = $(CODE_CXXFLAGS_$(VXWORKS_MAJOR_VERSION)) $(CODE_CFLAGS_$(VX_GNU_MAJOR_VERSION)) + #-------------------------------------------------- # no shared libs for vxWorks SHRLIB_CFLAGS =