@@ -260,35 +260,29 @@ pub unsafe fn create_module<'ll>(
260260 }
261261
262262 if let Some ( BranchProtection { bti, pac_ret } ) = sess. opts . unstable_opts . branch_protection {
263- let behavior = if llvm_version >= ( 15 , 0 , 0 ) {
264- llvm:: LLVMModFlagBehavior :: Min
265- } else {
266- llvm:: LLVMModFlagBehavior :: Error
267- } ;
268-
269263 if sess. target . arch == "aarch64" {
270264 llvm:: LLVMRustAddModuleFlag (
271265 llmod,
272- behavior ,
266+ llvm :: LLVMModFlagBehavior :: Min ,
273267 c"branch-target-enforcement" . as_ptr ( ) . cast ( ) ,
274268 bti. into ( ) ,
275269 ) ;
276270 llvm:: LLVMRustAddModuleFlag (
277271 llmod,
278- behavior ,
272+ llvm :: LLVMModFlagBehavior :: Min ,
279273 c"sign-return-address" . as_ptr ( ) . cast ( ) ,
280274 pac_ret. is_some ( ) . into ( ) ,
281275 ) ;
282276 let pac_opts = pac_ret. unwrap_or ( PacRet { leaf : false , key : PAuthKey :: A } ) ;
283277 llvm:: LLVMRustAddModuleFlag (
284278 llmod,
285- behavior ,
279+ llvm :: LLVMModFlagBehavior :: Min ,
286280 c"sign-return-address-all" . as_ptr ( ) . cast ( ) ,
287281 pac_opts. leaf . into ( ) ,
288282 ) ;
289283 llvm:: LLVMRustAddModuleFlag (
290284 llmod,
291- behavior ,
285+ llvm :: LLVMModFlagBehavior :: Min ,
292286 c"sign-return-address-with-bkey" . as_ptr ( ) . cast ( ) ,
293287 u32:: from ( pac_opts. key == PAuthKey :: B ) ,
294288 ) ;
0 commit comments