Add "objects" support to Rust targets #14031
Open
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
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| @@ -27,7 +27,7 @@ | |||
|
|
|||
| if T.TYPE_CHECKING: | |||
| from .. import coredata | |||
| from ..build import BuildTarget, DFeatures | |||
| from ..build import BuildTarget, BuildTargetTypes, DFeatures | |||
Check failure
Code scanning / CodeQL
Module-level cyclic import
| @@ -27,7 +27,7 @@ | |||
|
|
|||
| if T.TYPE_CHECKING: | |||
| from .. import coredata | |||
| from ..build import BuildTarget, DFeatures | |||
| from ..build import BuildTarget, BuildTargetTypes, DFeatures | |||
Check failure
Code scanning / CodeQL
Module-level cyclic import
| @@ -27,7 +27,7 @@ | |||
|
|
|||
| if T.TYPE_CHECKING: | |||
| from .. import coredata | |||
| from ..build import BuildTarget, DFeatures | |||
| from ..build import BuildTarget, BuildTargetTypes, DFeatures | |||
Check failure
Code scanning / CodeQL
Module-level cyclic import
| @@ -27,6 +28,7 @@ | |||
| ) | |||
|
|
|||
| if T.TYPE_CHECKING: | |||
| from ..build import BuildTarget, BuildTargetTypes | |||
Check failure
Code scanning / CodeQL
Module-level cyclic import
| @@ -27,6 +28,7 @@ | |||
| ) | |||
|
|
|||
| if T.TYPE_CHECKING: | |||
| from ..build import BuildTarget, BuildTargetTypes | |||
Check failure
Code scanning / CodeQL
Module-level cyclic import
bonzini
changed the title
bonzini
force-pushed
the
rust-objects-kwarg
branch
from
8f3f485 to
20dcac3
Compare
bonzini
force-pushed
the
rust-objects-kwarg
branch
2 times, most recently
from
f7a3ed7 to
8ad3774
Compare
bonzini
force-pushed
the
rust-objects-kwarg
branch
from
8ad3774 to
b29f0c9
Compare
bonzini
force-pushed
the
rust-objects-kwarg
branch
from
b29f0c9 to
2607998
Compare
bonzini
force-pushed
the
rust-objects-kwarg
branch
from
2607998 to
7f48312
Compare
Allow reusing the code for doctests. In particular, the sources are shared between the two cases. Signed-off-by: Paolo Bonzini <[email protected]>
All Fortran-specific handling of "objects:" is for now in generate_target(); parts of it can be reused for Rust. Even though Rust is only supported by the ninja backend, move the Fortran handling entirely outside ninjabackend.py: it's not specific to Ninja, it can be implemented easily using inheritance, and it also gets better typing this way. Signed-off-by: Paolo Bonzini <[email protected]>
Because rustc does not support extract_objects, QEMU creates a static library with all the C objects. It then passes this static library as link_whole, together with another static library containing general purpose utility functions which is passed as link_with. However, this is brittle because the two have a circular dependency and they cannot be merged because of the link_whole/link_with difference. While lld seems to have the --start-group/--end-group semantics automatically, ld.bfd can fail if these options are needed. This can cause difference between distros depending on how Rust is packaged (e.g. Ubuntu 22.04 and Debian bookworm seem to use ld.bfd). The simplest solution is for Meson to implement "objects:" properly for Rust. Then QEMU can use the same internal dependency objects that it already has in place for C programs. Signed-off-by: Paolo Bonzini <[email protected]>
Signed-off-by: Paolo Bonzini <[email protected]>
bonzini
force-pushed
the
rust-objects-kwarg
branch
from
7f48312 to
cd9e8af
Compare
Closed
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.
Because rustc does not support extract_objects, QEMU creates a static library
with all the C objects. It then passes this static library as link_whole,
together with another static library containing general purpose utility
functions which is passed as link_with.
However, this is brittle because the two have a circular dependency and
they cannot be merged because of the link_whole/link_with difference.
While lld seems to have the --start-group/--end-group semantics
automatically, ld.bfd can fail if these options are needed. This can
cause difference between distros depending on how Rust is packaged
(e.g. Ubuntu 22.04 and Debian bookworm seem to use ld.bfd).
The simplest solution is for Meson to implement "objects:" properly
for Rust. Then QEMU can use the same internal dependency objects that it
already has in place for C programs.
To limit conflicts, this PR includes part of #13933.