Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC
Commits:
-
c635f164
by Ben Gamari at 2025-07-15T14:05:54-04:00
-
637bb538
by Ben Gamari at 2025-07-15T14:05:55-04:00
3 changed files:
- m4/find_ld.m4
- testsuite/tests/driver/recomp015/all.T
- utils/ghc-toolchain/src/GHC/Toolchain/Tools/Link.hs
Changes:
| ... | ... | @@ -21,14 +21,7 @@ AC_DEFUN([FIND_LD],[ |
| 21 | 21 | return
|
| 22 | 22 | fi
|
| 23 | 23 | |
| 24 | - case $CPU in
|
|
| 25 | - i386)
|
|
| 26 | - # We refuse to use ld.gold on i386 due to #23579, which we don't
|
|
| 27 | - # have a good autoconf check for.
|
|
| 28 | - linkers="ld.lld ld" ;;
|
|
| 29 | - *)
|
|
| 30 | - linkers="ld.lld ld.gold ld" ;;
|
|
| 31 | - esac
|
|
| 24 | + linkers="ld.lld ld"
|
|
| 32 | 25 | |
| 33 | 26 | # Manually iterate over possible names since we want to ensure that, e.g.,
|
| 34 | 27 | # if ld.lld is installed but gcc doesn't support -fuse-ld=lld, that we
|
| ... | ... | @@ -5,7 +5,11 @@ test('recomp015', |
| 5 | 5 | # See ticket:11022#comment:7
|
| 6 | 6 | unless(opsys('linux') or opsys('solaris2') or opsys('openbsd'), skip),
|
| 7 | 7 | when(arch('arm'), skip),
|
| 8 | - js_skip # JS backend doesn't support .s assembly files
|
|
| 8 | + js_skip, # JS backend doesn't support .s assembly files
|
|
| 9 | + |
|
| 10 | + # the linker sometimes throws warnings since we don't
|
|
| 11 | + # generate a .note.GNU-stack section
|
|
| 12 | + ignore_stderr,
|
|
| 9 | 13 | ],
|
| 10 | 14 | makefile_test, [])
|
| 11 | 15 |
| ... | ... | @@ -91,7 +91,7 @@ findLinkFlags enableOverride cc ccLink |
| 91 | 91 | -- executable exists before trying cc.
|
| 92 | 92 | do _ <- findProgram (linker ++ " linker") emptyProgOpt ["ld."++linker]
|
| 93 | 93 | prog <$ checkLinkWorks cc prog
|
| 94 | - | linker <- ["lld", "gold", "bfd"]
|
|
| 94 | + | linker <- ["lld", "bfd"]
|
|
| 95 | 95 | , let prog = over _prgFlags (++["-fuse-ld="++linker]) ccLink
|
| 96 | 96 | ]
|
| 97 | 97 | <|> (ccLink <$ checkLinkWorks cc ccLink)
|