@@ -1044,17 +1044,14 @@ void CodeGenModule::Release() {
10441044 llvm::MDString::get (VMContext, " ascii" ));
10451045 }
10461046
1047- llvm::Triple::ArchType Arch = Context.getTargetInfo ().getTriple ().getArch ();
1048- if ( Arch == llvm::Triple::arm
1049- || Arch == llvm::Triple::armeb
1050- || Arch == llvm::Triple::thumb
1051- || Arch == llvm::Triple::thumbeb) {
1047+ llvm::Triple T = Context.getTargetInfo ().getTriple ();
1048+ if (T.isARM () || T.isThumb ()) {
10521049 // The minimum width of an enum in bytes
10531050 uint64_t EnumWidth = Context.getLangOpts ().ShortEnums ? 1 : 4 ;
10541051 getModule ().addModuleFlag (llvm::Module::Error, " min_enum_size" , EnumWidth);
10551052 }
10561053
1057- if (Arch == llvm::Triple::riscv32 || Arch == llvm::Triple::riscv64 ) {
1054+ if (T. isRISCV () ) {
10581055 StringRef ABIStr = Target.getABI ();
10591056 llvm::LLVMContext &Ctx = TheModule.getContext ();
10601057 getModule ().addModuleFlag (llvm::Module::Error, " target-abi" ,
@@ -1127,10 +1124,7 @@ void CodeGenModule::Release() {
11271124 getModule ().addModuleFlag (llvm::Module::Override,
11281125 " tag-stack-memory-buildattr" , 1 );
11291126
1130- if (Arch == llvm::Triple::thumb || Arch == llvm::Triple::thumbeb ||
1131- Arch == llvm::Triple::arm || Arch == llvm::Triple::armeb ||
1132- Arch == llvm::Triple::aarch64 || Arch == llvm::Triple::aarch64_32 ||
1133- Arch == llvm::Triple::aarch64_be) {
1127+ if (T.isARM () || T.isThumb () || T.isAArch64 ()) {
11341128 if (LangOpts.BranchTargetEnforcement )
11351129 getModule ().addModuleFlag (llvm::Module::Min, " branch-target-enforcement" ,
11361130 1 );
0 commit comments