From 30694951430f25f8b02deadc557e689f3e93cc07 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Wed, 14 Sep 2022 16:59:18 -0400 Subject: llvmGen: Adapt to allow LLVM 15 We now must use `-passes` in place of `-O` due to #21936. Closes #21936. --- compiler/GHC/Driver/Pipeline/Execute.hs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'compiler/GHC/Driver/Pipeline') diff --git a/compiler/GHC/Driver/Pipeline/Execute.hs b/compiler/GHC/Driver/Pipeline/Execute.hs index 30bd0531a0..1c21648210 100644 --- a/compiler/GHC/Driver/Pipeline/Execute.hs +++ b/compiler/GHC/Driver/Pipeline/Execute.hs @@ -977,8 +977,7 @@ llvmOptions :: LlvmConfig -> DynFlags -> [(String, String)] -- ^ pairs of (opt, llc) arguments llvmOptions llvm_config dflags = - [("-enable-tbaa -tbaa", "-enable-tbaa") | gopt Opt_LlvmTBAA dflags ] - ++ [("-relocation-model=" ++ rmodel + [("-relocation-model=" ++ rmodel ,"-relocation-model=" ++ rmodel) | not (null rmodel)] ++ [("-stack-alignment=" ++ (show align) ,"-stack-alignment=" ++ (show align)) | align > 0 ] -- cgit v1.2.1