Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Solaris: make pre-main code work #3570

Merged
merged 1 commit into from
May 5, 2024
Merged

Conversation

devnexen
Copy link
Contributor

@devnexen devnexen commented May 5, 2024

Fixes #3566

src/machine.rs Outdated Show resolved Hide resolved
@RalfJung RalfJung changed the title Solaris build fix Solaris: make pre-main code work May 5, 2024
src/shims/unix/mem.rs Outdated Show resolved Hide resolved
@RalfJung
Copy link
Member

RalfJung commented May 5, 2024

You lost the changes in ci.sh so currently this won't be tested.

@RalfJung
Copy link
Member

RalfJung commented May 5, 2024

Also your commits are still coming from the future. ;)

image

This seems to confuse github as well (when I post a comment, often it doesn't appear until I reload the page), so it would be good if you could fix your system clock.

@devnexen devnexen marked this pull request as ready for review May 5, 2024 17:18
src/shims/unix/mem.rs Outdated Show resolved Hide resolved
src/shims/unix/mem.rs Outdated Show resolved Hide resolved
@RalfJung
Copy link
Member

RalfJung commented May 5, 2024

Okay looks like just leaving it at 0 doesn't work.^^ It triggers an underflow here. Most tests work though, only spawning new threads fails -- nice!

So stack_getbounds will have to actually store the stack address and size in the appropriate fields of the struct. You can use this shim as a template. This is the struct that the pointer should point to.

@devnexen devnexen force-pushed the solaris_build_fix branch 2 times, most recently from ab7bb63 to db147b8 Compare May 5, 2024 18:57
@RalfJung
Copy link
Member

RalfJung commented May 5, 2024

Looks good, thanks!

Please squash the commits.

@RalfJung
Copy link
Member

RalfJung commented May 5, 2024

Awesome. :)
@bors r+

@bors
Copy link
Collaborator

bors commented May 5, 2024

📌 Commit f47926c has been approved by RalfJung

It is now in the queue for this repository.

@bors
Copy link
Collaborator

bors commented May 5, 2024

⌛ Testing commit f47926c with merge 193aafe...

@bors
Copy link
Collaborator

bors commented May 5, 2024

☀️ Test successful - checks-actions
Approved by: RalfJung
Pushing 193aafe to master...

@bors bors merged commit 193aafe into rust-lang:master May 5, 2024
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Solaris: add stub shims so that pre-main code works
3 participants