haskell.compiler.*: don't unnecessarily include LLVM for GHC >= 9.2#246045
Merged
sternenseemann merged 1 commit intoNixOS:haskell-updatesfrom Oct 4, 2023
Merged
Conversation
When 9.2.1 was [released], I apparently was confused by the wording. The NCG (-fasm) codegen backend for aarch64 not only works on aarch64-darwin, but also aarch64-linux. `useLLVM` being enabled on aarch64-linux had no adverse effect, as GHC used -fasm anyways, but it did inflate closure size unnecessarily which we can rectify now. [released]: https://www.haskell.org/ghc/blog/20211029-ghc-9.2.1-released.html
1519c13 to
e39b050
Compare
cdepillabout
approved these changes
Oct 4, 2023
12 tasks
sternenseemann
added a commit
that referenced
this pull request
Oct 22, 2023
The original change missed that we used to erroneously provide LLVM on aarch64-linux, but not on aarch64-darwin which was later fixed in #246045. Since the change was tested on aarch64-linux prior to this, tls ended up being broken on both aarch64-linux and aarch64-darwin. This commit resolves the situation by introducing a helper function to achieve the effect of passing -fllvm while ensuring LLVM is provided. Resolves #260013.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
When 9.2.1 was released, I apparently was confused by the wording. The NCG (-fasm) codegen backend for aarch64 not only works on aarch64-darwin, but also aarch64-linux.
useLLVMbeing enabled on aarch64-linux had no adverse effect, as GHC used -fasm anyways, but it did inflate closure size unnecessarily which we can rectify now.Description of changes
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)