@@ -260,35 +260,29 @@ pub unsafe fn create_module<'ll>(
260
260
}
261
261
262
262
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
-
269
263
if sess. target . arch == "aarch64" {
270
264
llvm:: LLVMRustAddModuleFlag (
271
265
llmod,
272
- behavior ,
266
+ llvm :: LLVMModFlagBehavior :: Min ,
273
267
c"branch-target-enforcement" . as_ptr ( ) . cast ( ) ,
274
268
bti. into ( ) ,
275
269
) ;
276
270
llvm:: LLVMRustAddModuleFlag (
277
271
llmod,
278
- behavior ,
272
+ llvm :: LLVMModFlagBehavior :: Min ,
279
273
c"sign-return-address" . as_ptr ( ) . cast ( ) ,
280
274
pac_ret. is_some ( ) . into ( ) ,
281
275
) ;
282
276
let pac_opts = pac_ret. unwrap_or ( PacRet { leaf : false , key : PAuthKey :: A } ) ;
283
277
llvm:: LLVMRustAddModuleFlag (
284
278
llmod,
285
- behavior ,
279
+ llvm :: LLVMModFlagBehavior :: Min ,
286
280
c"sign-return-address-all" . as_ptr ( ) . cast ( ) ,
287
281
pac_opts. leaf . into ( ) ,
288
282
) ;
289
283
llvm:: LLVMRustAddModuleFlag (
290
284
llmod,
291
- behavior ,
285
+ llvm :: LLVMModFlagBehavior :: Min ,
292
286
c"sign-return-address-with-bkey" . as_ptr ( ) . cast ( ) ,
293
287
u32:: from ( pac_opts. key == PAuthKey :: B ) ,
294
288
) ;
0 commit comments