Fix #632, Infer OSAL_SYSTEM_BSPTYPE from CFE_SYSTEM_PSP_NAME #634
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Describe the contribution
Normally the CFE PSP uses/links with an OSAL BSP of the same name. This removes the need to explicitly specify OSAL_SYSTEM_BSPTYPE in the toolchain file, as it can be reliably inferred.
Fixes #632
This is also another alternative way to fix #629
Testing performed
Build with defaults (as in README, e.g. a simple
make prep
), as well asSIMULATION=native
, and for i686-rtems4.11 platform. Confirm successful build.Also "forced" a mismatch by hacking the i686-rtems4.11 toolchain to request bad combinations, and confirm that the build system warns of the mismatch now:
If
OSAL_SYSTEM_BSPTYPE
is set topc-linux
, the following warning happens inmake prep
Likewise if the
OSAL_SYSTEM_OSTYPE
is set toposix
, the follow is seen (from OSAL):Finally removed settings of OSAL_SYSTEM_OSTYPE and OSAL_SYSTEM_BSPTYPE from the toolchain and confirmed that code correctly builds without issue, using the pc-rtems BSP and rtems OS layers, as expected for this toolchain.
Expected behavior changes
System(s) tested on
Ubuntu 18.04 LTS 64 bit, with i686-rtems4.11 cross target
Additional context
The related change to infer OSAL_SYSTEM_OSTYPE from OSAL_SYSTEM_BSPTYPE is in nasa/osal#432 and pull request nasa/osal#427. If it is desired to merge separately this can still be merged but it will have to continue setting OSAL_SYSTEM_OSTYPE.
Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.