diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2023-01-30 10:58:12 +0000 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2023-02-01 12:31:58 -0500 |
| commit | 0cc16aaf89d7dc3963764b7193ceac73e4e3329b (patch) | |
| tree | adc3703557a03a8f47ff897449a62319bd1f2000 | |
| parent | 955a99ea28a0d06de67f0595d366450281aab0c0 (diff) | |
| download | haskell-0cc16aaf89d7dc3963764b7193ceac73e4e3329b.tar.gz | |
Bump supported LLVM range from 10 through 15 to 11 through 16
LLVM 15 turns on the new pass manager by default, which we have yet to
migrate to so for new we pass the `-enable-new-pm-0` flag in our
llvm-passes flag.
LLVM 11 was the first version to support the `-enable-new-pm` flag so we
bump the lowest supported version to 11.
Our CI jobs are using LLVM 12 so they should continue to work despite
this bump to the lower bound.
Fixes #21936
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | llvm-passes | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 7ebdcad7ab..dbd91685b0 100644 --- a/configure.ac +++ b/configure.ac @@ -554,8 +554,8 @@ AC_SUBST(InstallNameToolCmd) # tools we are looking for. In the past, GHC supported a number of # versions of LLVM simultaneously, but that stopped working around # 3.5/3.6 release of LLVM. -LlvmMinVersion=10 # inclusive -LlvmMaxVersion=15 # not inclusive +LlvmMinVersion=11 # inclusive +LlvmMaxVersion=16 # not inclusive AC_SUBST([LlvmMinVersion]) AC_SUBST([LlvmMaxVersion]) sUPPORTED_LLVM_VERSION_MIN=$(echo \($LlvmMinVersion\) | sed 's/\./,/') diff --git a/llvm-passes b/llvm-passes index 14eb62d87c..52d203e745 100644 --- a/llvm-passes +++ b/llvm-passes @@ -1,5 +1,5 @@ [ -(0, "-mem2reg -globalopt -lower-expect"), -(1, "-O1 -globalopt"), -(2, "-O2") +(0, "-enable-new-pm=0 -mem2reg -globalopt -lower-expect"), +(1, "-enable-new-pm=0 -O1 -globalopt"), +(2, "-enable-new-pm=0 -O2") ] |