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

Enable ghc mmap crash workaround for every ghc compiled binary (copy #2572) #2576

Open
wants to merge 2 commits into
base: 1.6
Choose a base branch
from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 7, 2023

This is an automatic copy of pull request #2572 done by Mergify.
Cherry-pick of 9914030 has failed:

On branch mergify/copy/1.6/pr-2572
Your branch is up to date with 'origin/1.6'.

You are currently cherry-picking commit 991403012.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .ci/setup.sh
	modified:   .github/workflows/ci.yml
	modified:   .gitlab-ci.yml
	modified:   benchmark/profiling/prepare/clash-profiling-prepare.cabal
	modified:   benchmark/profiling/run/clash-profiling.cabal
	modified:   clash-cosim/clash-cosim.cabal
	modified:   clash-ghc/clash-ghc.cabal
	modified:   clash-prelude/clash-prelude.cabal
	modified:   clash-term/clash-term.cabal
	modified:   tests/clash-testsuite.cabal

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   .ci/cabal.project.local
	both modified:   .ci/gitlab/common.yml
	both modified:   .ci/gitlab/test.yml
	both modified:   clash-cores/clash-cores.cabal
	deleted by us:   clash-ffi/clash-ffi.cabal
	both modified:   clash-lib/clash-lib.cabal
	deleted by us:   nix/overlay.nix
	both modified:   tests/src/Test/Tasty/Clash.hs

Cherry-pick of 9b62e21 has failed:

On branch mergify/copy/1.6/pr-2572
Your branch is ahead of 'origin/1.6' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 9b62e2193.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   flake.nix

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot added the conflicts label Sep 7, 2023
In PRs #2444 we added the workaround-ghc-mmap-crash flag on
some of our packages.
That flag added `-with-rtsopts=-xm20000000` to some of our binaries.

But other binaries would occasionally still trigger the mmap bug,
most importantly ghc itself.

This commit undoes the previous way of applying the workaround and
applies the same `-xm20000000` RTS option everywhere
via the GHCRTS environment variable.

But for this to work we have to link all binaries with the `-rtsopts`
flag, otherwise they'll error out that the GHCRTS contains
unsupported options.
They use custom setups and it is seemingly impossible to get them to link with
anything other than the default -rtsopts=some
Making them always throw an error when GHCRTS="-xm..."
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant