Integration Candidate: 2020-04-08 #153
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Addresses various compatibility/usability issues observed during testing - Correctly set/export the CMAKE_EXE_EXPORTS_C_FLAG - Incorporate the system specs directly into the COMPILE_OBJECT templates so these don't need to be specified by the toolchain or CMAKE_C_FLAGS - Similarly include the always-needed linker flags flags for entry point and relocation address into the linker command template
Do not use aux_source_directory to assemble a list of source files. Instead, put a proper CMakeLists.txt file in each implementation and build the implementation separately from the shared/common parts. In addition to avoiding the aux_source_directory this allows PSP-specific compile definitions to be set on a per-implementation basis because it is defined separately.
Instead of redefining the basic entry point symbols, use the OSAL BSP and its abstractions. The CFE PSP just becomes an extension to the OSAL BSP, and only needs to define the OS_Application_Startup symbol like any other OSAL application.
Fix #121, Unify CFE PSP with OSAL BSP
Fix #145, Update RTEMS CMake module
Fix #135, Add separate CMakeLists.txt for each implementation
astrogeco
changed the title
astrogeco
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
Fixes #145, #135, and #121
See Bundle IC at nasa/cFS#66
Testing performed
See PRs,
Bundle CI - https://travis-ci.com/github/nasa/cFS/builds/160607248
Expected behavior changes
PR #146 RTEMS builds successfully without errors
PR #148 Build script uses a proper CMakeLists.txt instead of the aux_source directory
PR #149 Code structure/linking change only.
System(s) tested on
See PRs
Bundle CI
Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.
Gerardo E. Cruz-Ortiz, NASA-GSFC