diff options
author | Ben Gamari <ben@smart-cactus.org> | 2022-09-14 16:59:18 -0400 |
---|---|---|
committer | Ben Gamari <ben@smart-cactus.org> | 2022-10-11 14:14:21 -0400 |
commit | 249c4d6dff45e1d9746de424b7c9becc7974adf4 (patch) | |
tree | 65a9905d7b19cdadabf84435b6d2642f0f4ea542 | |
parent | dce9f320ce7275fa97f49abef604abbc3b0f9a9c (diff) | |
download | haskell-wip/T21936.tar.gz |
llvmGen: Adapt to allow LLVM 15wip/T21936
We now must use `-passes` in place of `-O<n>` due to #21936.
Closes #21936.
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | llvm-passes | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 28f954a9a3..cc02ea8af0 100644 --- a/configure.ac +++ b/configure.ac @@ -554,7 +554,7 @@ AC_SUBST(InstallNameToolCmd) # versions of LLVM simultaneously, but that stopped working around # 3.5/3.6 release of LLVM. LlvmMinVersion=10 # inclusive -LlvmMaxVersion=14 # not 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..bfc846e812 100644 --- a/llvm-passes +++ b/llvm-passes @@ -1,5 +1,5 @@ [ -(0, "-mem2reg -globalopt -lower-expect"), -(1, "-O1 -globalopt"), -(2, "-O2") +(0, "-passes=mem2reg,globalopt,lower-expect"), +(1, "-passes=default1,-globalopt"), +(2, "-passes=default2") ] |