diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2022-05-30 08:47:41 +0100 |
|---|---|---|
| committer | Matthew Pickering <matthewtpickering@gmail.com> | 2022-05-30 16:56:05 +0000 |
| commit | 5025a7003271e8eca137d6394c1b4f30ada68665 (patch) | |
| tree | 16d5516588f3e6bd7b2ecb15afbca79d03b5f960 | |
| parent | f2e707077bfef6ca5f9cb1a1b2bfaa14c0637c40 (diff) | |
| download | haskell-wip/revert-split-sections.tar.gz | |
Revert "packaging: Build perf builds with -split-sections"wip/revert-split-sections
This reverts commit 699f593532a3cd5ca1c2fab6e6e4ce9d53be2c1f.
Split sections causes segfaults in profiling way with old toolchains
(deb9) and on windows (#21670)
Fixes #21670
| -rw-r--r-- | hadrian/doc/flavours.md | 13 | ||||
| -rw-r--r-- | hadrian/src/Settings/Flavours/Performance.hs | 2 |
2 files changed, 1 insertions, 14 deletions
diff --git a/hadrian/doc/flavours.md b/hadrian/doc/flavours.md index 609be65e3e..713b945255 100644 --- a/hadrian/doc/flavours.md +++ b/hadrian/doc/flavours.md @@ -15,7 +15,6 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <table> <tr> <th rowspan="3">Flavour</th> - <th rowspan="3">Split Sections</th> <th colspan="8">Extra arguments</th> </tr> <tr> @@ -36,7 +35,6 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH </tr> <tr> <th>default<br></td> - <td> </td> <td>-O<br>-H32m<br></td> <td>-O2<br>-H32m</td> <td></td> @@ -48,7 +46,6 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH </tr> <tr> <th>quick</td> - <td> </td> <td>-O0<br>-H64m</td> <td>-O0<br>-H64m</td> <td></td> @@ -60,7 +57,6 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH </tr> <tr> <th>quick-validate</td> - <td></td> <td>-O0<br>-H64m<br>-Werror</td> <td>-O0<br>-H64m<br>-Werror</td> <td></td> @@ -72,7 +68,6 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH </tr> <tr> <th>quick-debug</td> - <td></td> <td>-O0<br>-H64m</td> <td>-O0<br>-H64m</td> <td></td> @@ -84,7 +79,6 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH </tr> <tr> <th>quickest</td> - <td></td> <td>-O0<br>-H64m</td> <td>-O0<br>-H64m</td> <td></td> @@ -96,7 +90,6 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH </tr> <tr> <th>perf</td> - <td> Yes (on supported platforms) </td> <td>-O<br>-H64m</td> <td>-O<br>-H64m</td> <td></td> @@ -120,7 +113,6 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH </tr> <tr> <th>bench</td> - <td></td> <td>-O<br>-H64m</td> <td>-O<br>-H64m</td> <td></td> @@ -132,7 +124,6 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH </tr> <tr> <th>devel1</td> - <td></td> <td>-O<br>-H64m</td> <td>-O<br>-H64m</td> <td></td> @@ -144,7 +135,6 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH </tr> <tr> <th>devel2</td> - <td></td> <td>-O<br>-H64m</td> <td>-O<br>-H64m</td> <td></td> @@ -156,7 +146,6 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH </tr> <tr> <th>validate</td> - <td></td> <td>-O0<br>-H64m</td> <td>-fllvm-fill-undef-with-garbage</td> <td></td> @@ -168,7 +157,6 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH </tr> <tr> <th>slow-validate</td> - <td></td> <td>-O0<br>-H64m</td> <td>-fllvm-fill-undef-with-garbage</td> <td></td> @@ -180,7 +168,6 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH </tr> <tr> <th>static</td> - <td></td> <td>-O<br>-H64m<br>-fPIC -static</td> <td>-O<br>-H64m<br>-fPIC -static</td> <td></td> diff --git a/hadrian/src/Settings/Flavours/Performance.hs b/hadrian/src/Settings/Flavours/Performance.hs index 17fb22b6ec..fc46920703 100644 --- a/hadrian/src/Settings/Flavours/Performance.hs +++ b/hadrian/src/Settings/Flavours/Performance.hs @@ -6,7 +6,7 @@ import {-# SOURCE #-} Settings.Default -- Please update doc/flavours.md when changing this file. performanceFlavour :: Flavour -performanceFlavour = splitSections $ defaultFlavour +performanceFlavour = defaultFlavour { name = "perf" , args = defaultBuilderArgs <> performanceArgs <> defaultPackageArgs } |