Link crtbegin/crtend on musl to terminate .eh_frame #82534
Conversation
rust-highfive
added
the
S-waiting-on-review
| @@ -74,7 +74,7 @@ pub(super) fn pre_musl_fallback() -> CrtObjects { | |||
| } | |||
|
|
|||
| pub(super) fn post_musl_fallback() -> CrtObjects { | |||
| all("crtn.o") | |||
| all(&["crtn.o", "rsend.o"]) | |||
There was a problem hiding this comment.
I probably would be significantly more comfortable with distributing and linking crtend.o.
I'm not sure we want to take care of maintaining rsend.rs to undo whatever crt{1,i}.o do. For instance it looks like crtend.o is also responsible for terminating the .ctors and .dtors sections – which is not something rsend.o appears to handle currently.
There was a problem hiding this comment.
Feel free to r=me if you think this concern is unwarranted.
There was a problem hiding this comment.
I think you're right, it's safer to link the normal crtbegin/crtend objects, rather than reimplementing them. I've adjusted things to copy the object files and link them according to the table at the top of the file.
There was a problem hiding this comment.
This is exactly what I was going to suggest.
(The comment higher in this file says that we are not linking crtbegin/crtend, but it can probably be kept as is because we are still not linking them on other targets supporting self-contained mode.)
For some targets, rustc uses a "CRT fallback", where it links CRT object files it ships instead of letting the host compiler link them. On musl, rustc currently links crt1, crti and crtn (provided by libc), but does not link crtbegin and crtend (provided by libgcc). In particular, crtend is responsible for terminating the .eh_frame section. Lack of terminator may result in segfaults during unwinding, as reported in rust-lang#47551 and encountered by the LLVM 12 update in rust-lang#81451. This patch links crtbegin and crtend for musl as well, following the table at the top of crt_objects.rs.
nikic
changed the title
|
@bors r+ |
|
📌 Commit c7091f5 has been approved by |
bors
added
S-waiting-on-bors
Link crtbegin/crtend on musl to terminate .eh_frame For some targets, rustc uses a "CRT fallback", where it links CRT object files it ships instead of letting the host compiler link them. On musl, rustc currently links crt1, crti and crtn (provided by libc), but does not link crtbegin and crtend (provided by libgcc). In particular, crtend is responsible for terminating the .eh_frame section. Lack of terminator may result in segfaults during unwinding, as reported in rust-lang#47551 and encountered by the LLVM 12 update in rust-lang#81451. This patch links crtbegin and crtend for musl as well, following the table at the top of crt_objects.rs. r? `@nagisa`
Rollup of 11 pull requests Successful merges: - rust-lang#81856 (Suggest character encoding is incorrect when encountering random null bytes) - rust-lang#82395 (Add missing "see its documentation for more" stdio) - rust-lang#82401 (Remove a redundant macro) - rust-lang#82498 (Use log level to control partitioning debug output) - rust-lang#82534 (Link crtbegin/crtend on musl to terminate .eh_frame) - rust-lang#82537 (Update measureme dependency to the latest version) - rust-lang#82561 (doc: cube root, not cubic root) - rust-lang#82563 (Fix intra-doc handling of `Self` in enum) - rust-lang#82584 (Add ARIA role to sidebar toggle in Rustdoc) - rust-lang#82596 (clarify RW lock's priority gotcha) - rust-lang#82607 (Add a getter for Frame.loc) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
For some targets, rustc uses a "CRT fallback", where it links CRT
object files it ships instead of letting the host compiler link
them.
On musl, rustc currently links crt1, crti and crtn (provided by
libc), but does not link crtbegin and crtend (provided by libgcc).
In particular, crtend is responsible for terminating the .eh_frame
section. Lack of terminator may result in segfaults during
unwinding, as reported in #47551 and encountered by the LLVM 12
update in #81451.
This patch links crtbegin and crtend for musl as well, following
the table at the top of crt_objects.rs.
r? @nagisa