Fix #2096 update rtems toolchain files

[ghost]

Checklist (Please check before submitting)

• I reviewed the Contributing Guide.
• I signed and emailed the appropriate Contributor License Agreement to [email protected] and copied [email protected].

Describe the contribution

• Fix Update RTEMS toolchain files for RTEMS 4.11, 5, and 6 #2096

Modifies the existing RTEMS 4.11 and RTEMS 5 toolchain files to:

• Change the OS define to avoid using a reserved identifier (RTEMS(x)_)
• Change the RTEMS 4.11 define to indicate it is deprecated
• Add a BSP_SPECS_FLAGS flag to allow for RTEMS version variations in the specs flags
• Add a dynamic load Cmake variable to allow for two types of CMAKE executable types in the platform file

Added a RTEMS 6 i686 toolchain file

Testing performed

• Rebuilt and ran RTEMS 4.11 and RTEMS 5 tests
• Tested RTEMS 6 build and ran tests (using local OSAL mods and CI docker image with RTEMS 6)

Expected behavior changes

• No impact or behavior changes on RTEMS 4.11 and RTEMS 5

System(s) tested on

• RTEMS 4.11, RTEMS 5 Docker images used in CI workflows

Additional context

• The changes in the toolchain files for RTEMS 4.11 and RTEMS 5 are to accommodate the RTEMS 6 port and allow for additional RTEMS builds to use the same CMake Platform file for RTEMS.

Contributor Info - All information REQUIRED for consideration of pull request
Alan Cudmore, NASA/GSFC Code 582.0

[astrogeco]

CCB:2022-04-27

• Edit commits to follow standard
• Does this have dependencies in other repos?
• Consider a consolidating into a common #include and add the differences
• Should end up moving to always building as a dynamic module
  • @jphickey check if we have an open issue

[ghost]

Addressing the CCB comments:
Edit commits to follow standard:
I left the # off of the 2nd commit message. Is that the problem with the commit?
Dependencies on other repos?
No - this does not depend on any other commits that I am making
Consider consolidating into a common CMake include for RTEMS toolchain files:
I took a look at this and there are only a handful of common lines in the files. I re-arranged the toolchain files in my latest commit so the common statements are at the bottom. Please let me know if you think it's worth factoring out those statements and I can make another commit. If not, these should work - I have built RTEMS 4.11, 5, and 6

[astrogeco]

Just a nit, an you amend the commit to switch uppercase "FIX" to regular "Fix"?

[astrogeco]

CCB:2022-05-04, APPROVED with CHANGES

[ghost]

CCB suggestion:
Remove: OSAL_SYSTEM_BSPTYPE and OSAL_SYSTEM_OSTYPE from toolchain files, because these are now setup in the PSP.

Question:
A couple of PSPs have the following line in the build_options.cmake file:
set(CFE_PSP_EXPECTED_OSAL_BSPTYPE "generic-vxworks")
But the pc-rtems file does not. Is this needed before removing the OSAL_SYSTEM_BSPTYPE in the toolchain file?
(Edit: I removed the OSAL_SYSTEM_BSPTYPE and OSAL_SYSTEM_OSTYPE and the CFE_PSP_EXPECTED_OSAL_BSPTYPE did not seem to be required)

[ghost]

• I removed OSAL_SYSTEM_BSPTYPE and OSAL_SYSTEM_OSTYPE as they are not needed any more.
• Rebased/Squashed to 1 commit.
• Tested build of i686-rtems5 (built and ran bundle then all CI tests)
• Tested build of i686-rtems4.11 (built and ran bundle then all CI tests)

I believe this is ready to merge

[astrogeco]

Merged in 41cadde