Fix SITL compilation on macosx #9012
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
Still need some CMake work to write the final binary. Has lots of warning, probably fixable by forcing C_STANDARD to 11 for everyone, but that is probably a change for 7.0
|
Agree that forcing C11 should be fine everywhere (SITL 6.1.0, all 7.0). SITL GCC 12 linux is happy with that. |
Remove some of unsupported -W flags
|
GCC, on linux (and freebsd), this now dumps out the map to STDOUT rather than a file. Undesirable. |
What do you mean by dumping the map to stdout? I did not notice anything wrong on wsl. |
|
The c. 14600 lines of it. |
|
I have not tried building with ninja!My cmake was generating old school Makeriles. I will remove the cref. Should make the cmake simpler as well. []s,Marcelo Bezerra ***@***.***>On 26 Apr 2023, at 08:22, Jonathan Hudson ***@***.***> wrote:
The cref map, e.g:
$ ninja
[0/1] Re-running CMake...
-- toolchain: host, WARNINGS_AS_ERRORS: OFF
-- DEBUG_HARDFAULTS: OFF, SEMIHOSTING: OFF
-- DEBUG_HARDFAULTS: OFF, SEMIHOSTING: OFF
-- 1 targets (1 for release) found for toolchain host
-- Build type: RelWithDebInfo
-- Configuring done (0.3s)
-- Generating done (0.0s)
-- Build files have been written to: /t/tmp/inav-makefile/_sitl
[1/290] Removing intermediate files for SITL
[1/1] Cleaning all built files...
Cleaning... 289 files.
[289/290] Linking C executable bin/SITL.elf
/usr/bin/ld: warning: bin/SITL.elf has a LOAD segment with RWX permissions
Cross Reference Table
Symbol File
GForce.lto_priv.0 /tmp/ccsvhMwX.ltrans3.ltrans.o
/tmp/ccsvhMwX.ltrans6.ltrans.o
GForceAxis.lto_priv.0 /tmp/ccsvhMwX.ltrans3.ltrans.o
/tmp/ccsvhMwX.ltrans6.ltrans.o
GLIBC_2.10 /usr/lib/libc.so.6
GLIBC_2.11 /usr/lib/libc.so.6
GLIBC_2.12 /usr/lib/libc.so.6
GLIBC_2.13 /usr/lib/libc.so.6
GLIBC_2.14 /usr/lib/libc.so.6
GLIBC_2.15 /usr/lib/libm.so.6
/usr/lib/libc.so.6
...*** (about 14600 lines removed ***...
src/main/target/SITL/CMakeFiles/SITL.elf.dir/__/__/blackbox/blackbox_encoding.c.o (symbol from plugin)
[290/290] cd /t/tmp/inav-makefile/_sit...mp/inav-makefile/_sitl/inav_6.1.0_SITL
c. 14600 lines of it.
I can look at it a bit later. but I'd hazard a guess that if we no longer use generate_map_file target for SITL, then we should also unconditionally remove --cref from the link stage; we don't need a cref for SITL.
—Reply to this email directly, view it on GitHub, or unsubscribe.You are receiving this because you authored the thread.Message ID: ***@***.***>
|
|
Turns out I was in the wrong branch in wsl. (facepalm) |
stronnag
approved these changes
Apr 26, 2023
sensei-hacker
pushed a commit
to sensei-hacker/inav_unofficial_targets
that referenced
this pull request
Oct 4, 2023
Clean up cmake files for SITL and fix the compilation issues caused by tooling differences between gcc and clang (used in MacOSX). SITL on MacOSX still has lots of compile time warnings that need to be addressed and some known issues that prevent it from working with simulators, but those will be addressed in 7.0. At this point, I don't think MacOSX SITL is ready to be added to the configurator. That should be targeted for 7.0.
sensei-hacker
pushed a commit
to sensei-hacker/inav_unofficial_targets
that referenced
this pull request
Oct 4, 2023
Clean up cmake files for SITL and fix the compilation issues caused by tooling differences between gcc and clang (used in MacOSX). SITL on MacOSX still has lots of compile time warnings that need to be addressed and some known issues that prevent it from working with simulators, but those will be addressed in 7.0. At this point, I don't think MacOSX SITL is ready to be added to the configurator. That should be targeted for 7.0.
sensei-hacker
pushed a commit
to sensei-hacker/inav_unofficial_targets
that referenced
this pull request
Oct 4, 2023
Clean up cmake files for SITL and fix the compilation issues caused by tooling differences between gcc and clang (used in MacOSX). SITL on MacOSX still has lots of compile time warnings that need to be addressed and some known issues that prevent it from working with simulators, but those will be addressed in 7.0. At this point, I don't think MacOSX SITL is ready to be added to the configurator. That should be targeted for 7.0.
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.
Clean up cmake files for SITL and fix the compilation issues caused by tooling differences between gcc and clang (used in MacOSX).
SITL on MacOSX still has lots of compile time warnings that need to be addressed and some known issues that prevent it from working with simulators, but those will be addressed in 7.0.
At this point, I don't think MacOSX SITL is ready to be added to the configurator. That should be targeted for 7.0.