Skip to content

Use linker capability detection to improve linker use (backport #9443) #9716

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

Closed
wants to merge 3 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 16, 2024

This is an automatic backport of pull request #9443 done by Mergify.
Cherry-pick of fb14e4e has failed:

On branch mergify/bp/3.10/pr-9443
Your branch is up to date with 'origin/3.10'.

You are currently cherry-picking commit fb14e4e29.
  (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 <file>..." to mark resolution)
	both modified:   Cabal/src/Distribution/Simple/Program/Builtin.hs

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

Cherry-pick of 4336f4c has failed:

On branch mergify/bp/3.10/pr-9443
Your branch is ahead of 'origin/3.10' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 4336f4c48.
  (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 <file>..." to mark resolution)
	both modified:   Cabal/src/Distribution/Simple/GHC/Internal.hs

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

Cherry-pick of 53fc3d3 has failed:

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

You are currently cherry-picking commit 53fc3d36f.
  (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:
	new file:   changelog.d/pr-9443

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cabal/src/Distribution/Simple/Configure.hs
	both modified:   Cabal/src/Distribution/Simple/Program/Db.hs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/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

Standard GNU `ld` ues `--relocatable` while `ld.gold` uses a `-relocatable`
flag (with a single `-`). Code will now detect both versions.

(cherry picked from commit fb14e4e)

# Conflicts:
#	Cabal/src/Distribution/Simple/Program/Builtin.hs
`ldProgram` gets configured in two places, a seemingly default and
a GHC specific version. The later needs to be updated so that it
first calls the default configuration and then the new GHC version.

(cherry picked from commit 4336f4c)

# Conflicts:
#	Cabal/src/Distribution/Simple/GHC/Internal.hs
The function `comperSupportsGhciLibs` has been renamed to
`linkerSupportsGhciLibs` because its about the linker not the compiler.

The function `comperSupportsGhciLibs` was using the compiler version
as a proxy for whether the linker supports relocatable objects. Now
support for relocatable objects is detected by running the linker.

(cherry picked from commit 53fc3d3)

# Conflicts:
#	Cabal/src/Distribution/Simple/Configure.hs
#	Cabal/src/Distribution/Simple/Program/Db.hs
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.

2 participants