Merge IC:Caelum-rc4+dev14, osal v6.0.0-rc4+dev97

- Ensure address alignment of TCB for VxWorks 7
- See <nasa/cFS#532>

README.md

@@ -11,6 +11,10 @@ The autogenerated OSAL user's guide can be viewed at <https://github.com/nasa/cF
 
 ## Changelog
 
+### Development Build: v6.0.0-rc4+dev97
+- Ensure address alignment of TCB for VxWorks 7
+- See <https://github.com/nasa/osal/pull/1272>
+
 ### Development Build: v6.0.0-rc4+dev93
 - Update cmake mimimum required to something more recent (or remove)
 - Set OSAL Loader unit test number of modules to OSAL_CONFIG_MAX_MODULES

src/os/inc/osapi-version.h

@@ -34,7 +34,7 @@
 /*
  * Development Build Macro Definitions
  */
-#define OS_BUILD_NUMBER   93
+#define OS_BUILD_NUMBER   97
 #define OS_BUILD_BASELINE "v6.0.0-rc4"
 
 /*

src/os/vxworks/inc/os-impl-tasks.h

@@ -30,8 +30,12 @@
 #include <taskLib.h>
 
 #if defined(VX_WIND_TCB_SIZE)
-/* vxworks >= 7.0 should provide this symbol via taskLib.h. WIND_TCB is an opaque type */
-typedef char OS_VxWorks_TCB_t[VX_WIND_TCB_SIZE];
+/**
+ * vxworks >= 7.0 should provide this symbol via taskLib.h. WIND_TCB is an opaque type
+ * NOTE: uint64 used to ensure sufficient alignment, and + 1 means it's at least big enough
+ *       but might be slightly bigger than necessary if VX_WIND_TCB_SIZE mod 8 is zero
+ */
+typedef uint64 OS_VxWorks_TCB_t[(VX_WIND_TCB_SIZE / 8) + 1];
 #else
 /* older vxworks expose the definition of VX_WIND_TCB_SIZE */
 typedef WIND_TCB OS_VxWorks_TCB_t;