From 04d23354b99c4d2fa75ba60f7a965f896a530c30 Mon Sep 17 00:00:00 2001
From: Dirk Zimoch <dirk.zimoch@psi.ch>
Date: Thu, 19 Aug 2021 11:27:30 +0200
Subject: [PATCH] config files closer to upstream

---
 configure/os/CONFIG.Common.vxWorksCommon      |  7 ++++++
 configure/os/CONFIG_SITE.Common.vxWorksCommon | 23 +++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/configure/os/CONFIG.Common.vxWorksCommon b/configure/os/CONFIG.Common.vxWorksCommon
index de9624745..f28f0e327 100644
--- a/configure/os/CONFIG.Common.vxWorksCommon
+++ b/configure/os/CONFIG.Common.vxWorksCommon
@@ -132,6 +132,13 @@ OPT_CXXFLAGS_YES = -O2
 #--------------------------------------------------
 # code flags
 CODE_CFLAGS =
+#
+# For vxWorks versions before 6.3 we need this g++ compiler flag
+CODE_CXXFLAGS_6.0 = -fno-implicit-templates
+CODE_CXXFLAGS_6.1 = -fno-implicit-templates
+CODE_CXXFLAGS_6.2 = -fno-implicit-templates
+CODE_CXXFLAGS_6 = $(CODE_CXXFLAGS_$(VXWORKS_VERSION))
+CODE_CXXFLAGS = $(CODE_CXXFLAGS_$(VXWORKS_MAJOR_VERSION))
 
 #--------------------------------------------------
 # no shared libs for vxWorks
diff --git a/configure/os/CONFIG_SITE.Common.vxWorksCommon b/configure/os/CONFIG_SITE.Common.vxWorksCommon
index e512fa290..408888afa 100644
--- a/configure/os/CONFIG_SITE.Common.vxWorksCommon
+++ b/configure/os/CONFIG_SITE.Common.vxWorksCommon
@@ -2,6 +2,22 @@
 #
 # Site specific definitions for vxWorks target builds.
 
+# Compiler options can vary with the vxWorks version number, so we
+# need to know that.  Do not include any third-level digits.
+
+# 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 = 6.6
+#VXWORKS_VERSION = 6.7
+#VXWORKS_VERSION = 6.8
+VXWORKS_VERSION = 6.9
+
+
+# Sites may override the following path for a particular host
+# architecture by adding it to an appropriate
+# CONFIG_SITE.$(EPICS_HOST_ARCH).vxWorksCommon file.
+
 #### Fixes for CONFIG.Common.vxWorksCommon  #######
 
 VX_GNU_VERSION_7 = 4.8.1.11
@@ -63,7 +79,14 @@ OP_SYS_LDFLAGS += $(OP_SYS_LDFLAGS_$@)
 OP_SYS_LDFLAGS_softIoc = -whole-archive
 OP_SYS_LDFLAGS_softIocPVA = -whole-archive
 
+# code flags
+CODE_CXXFLAGS =
+
 # WIND_BASE is where you installed the Wind River software.
+
+#WIND_BASE = /usr/local/vw/tornado22-$(ARCH_CLASS)
+#WIND_BASE = /usr/local/vw/vxWorks-$(VXWORKS_VERSION)
+#WIND_BASE = /ade/vxWorks/$(VXWORKS_VERSION)
 WIND_BASE = /afs/psi.ch/project/vxworks/VxWorks$(VXWORKS_VERSION)
 
 #--------------------------------------------------