From 9f97b4bce0c5370c8bb96b29bc70ba4831106a05 Mon Sep 17 00:00:00 2001
From: Dirk Zimoch <dirk.zimoch@psi.ch>
Date: Mon, 20 Jul 2020 15:28:19 +0200
Subject: [PATCH] add vxWorks 6.9

---
 configure/os/CONFIG.Common.V69-ppc32      |  3 +++
 configure/os/CONFIG.Common.V69-ppc604     |  3 +++
 configure/os/CONFIG.Common.vxWorks-ppc604 | 10 ++++++----
 configure/os/CONFIG_SITE.linux-x86.Common | 17 +++++++++--------
 4 files changed, 21 insertions(+), 12 deletions(-)
 create mode 100644 configure/os/CONFIG.Common.V69-ppc32
 create mode 100644 configure/os/CONFIG.Common.V69-ppc604

diff --git a/configure/os/CONFIG.Common.V69-ppc32 b/configure/os/CONFIG.Common.V69-ppc32
new file mode 100644
index 000000000..07f984dab
--- /dev/null
+++ b/configure/os/CONFIG.Common.V69-ppc32
@@ -0,0 +1,3 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc32
+VXWORKS_VERSION = 6.9
+export LD_LIBRARY_PATH=$(WIND_BASE)/lmapi-5.0/$(WIND_HOST_TYPE)/lib
diff --git a/configure/os/CONFIG.Common.V69-ppc604 b/configure/os/CONFIG.Common.V69-ppc604
new file mode 100644
index 000000000..6ca620ccf
--- /dev/null
+++ b/configure/os/CONFIG.Common.V69-ppc604
@@ -0,0 +1,3 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 6.9
+export LD_LIBRARY_PATH=$(WIND_BASE)/lmapi-5.0/$(WIND_HOST_TYPE)/lib
diff --git a/configure/os/CONFIG.Common.vxWorks-ppc604 b/configure/os/CONFIG.Common.vxWorks-ppc604
index 45115a876..6e6d3e1ee 100644
--- a/configure/os/CONFIG.Common.vxWorks-ppc604
+++ b/configure/os/CONFIG.Common.vxWorks-ppc604
@@ -14,9 +14,11 @@ ARCH_CLASS = ppc
 
 # Architecture specific build flags
 ARCH_DEP_CPPFLAGS = -DCPU=PPC604
-ARCH_DEP_CFLAGS_2 = -mcpu=604 -mstrict-align -mno-implicit-fp
-ARCH_DEP_CFLAGS_3 = -mcpu=604 -mstrict-align -mno-implicit-fp
-ARCH_DEP_CFLAGS_4 = -mcpu=604 -mstrict-align -fno-implicit-fp
-ARCH_DEP_CFLAGS = $(ARCH_DEP_CFLAGS_$(VX_GNU_MAJOR_VERSION))
+ARCH_DEP_CFLAGS   = -mcpu=604 -mstrict-align
+
+CODE_CFLAGS_2 = -mno-implicit-fp
+CODE_CFLAGS_3 = -mno-implicit-fp
+CODE_CFLAGS_4 = -fno-implicit-fp
+CODE_CFLAGS += $(CODE_CFLAGS_$(VX_GNU_MAJOR_VERSION))
 
 GNU_TARGET = powerpc-wrs-vxworks
diff --git a/configure/os/CONFIG_SITE.linux-x86.Common b/configure/os/CONFIG_SITE.linux-x86.Common
index 4baf36444..3fe72128a 100644
--- a/configure/os/CONFIG_SITE.linux-x86.Common
+++ b/configure/os/CONFIG_SITE.linux-x86.Common
@@ -3,21 +3,22 @@
 # Site override definitions for linux-x86 host builds
 #-------------------------------------------------------
 
-# JBA test override values
-#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040 solaris-sparc
-#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040
-#CROSS_COMPILER_TARGET_ARCHS = RTEMS-mvme2100 RTEMS-pc386 # RTEMS-mvme5500 RTEMS-mvme167
-
 GNU_HOST_ARCH=i686
 GNU_HOST_OS=linux
+
+# LD_LIBRARY_PATH may cause problems for eldk53-ppc4xxFP
 LD_LIBRARY_PATH=
 
-# vxWorks 5 for MVxxxx boards
+# vxWorks 5.5 for MVxxxx boards
 CROSS_COMPILER_TARGET_ARCHS += T2-ppc604
 
 # vxWorks 6.7 for MVxxxx boards
 CROSS_COMPILER_TARGET_ARCHS += V67-ppc604
 
+# vxWorks 6.9 for MVxxxx boards
+CROSS_COMPILER_TARGET_ARCHS += V69-ppc604
+CROSS_COMPILER_TARGET_ARCHS += V69-ppc32
+
 # NI compact RIO
 CROSS_COMPILER_TARGET_ARCHS += V63-ppc603
 
@@ -38,9 +39,9 @@ CROSS_COMPILER_TARGET_ARCHS += eldk42-ppc4xxFP
 CROSS_COMPILER_TARGET_ARCHS += eldk53-ppc4xxFP
 
 # Test other vxWorks versions
-CROSS_COMPILER_TARGET_ARCHS += V66-ppc603
+#CROSS_COMPILER_TARGET_ARCHS += V66-ppc603
 CROSS_COMPILER_TARGET_ARCHS += V66-ppc604
-CROSS_COMPILER_TARGET_ARCHS += V63-ppc604
+#CROSS_COMPILER_TARGET_ARCHS += V63-ppc604
 CROSS_COMPILER_TARGET_ARCHS += V62-ppc604
 
 # Raspberry Pi