Author: simpal01 Date: 2024-11-07T09:54:41Z New Revision: f9fecab1fd4e2aec74b864b1ee81679b14f13f5c
URL: https://github.com/llvm/llvm-project/commit/f9fecab1fd4e2aec74b864b1ee81679b14f13f5c DIFF: https://github.com/llvm/llvm-project/commit/f9fecab1fd4e2aec74b864b1ee81679b14f13f5c.diff LOG: Add -mno-unaligned-access and -mbig-endian to ARM and AArch64 multilib flags (#114782) This adds -mno-unaligned-access and -mbig-endian command line options to the set of flags used by the multilib selection for ARM and AArch64 targets. Added: Modified: clang/lib/Driver/ToolChain.cpp clang/test/Driver/print-multi-selection-flags.c Removed: ################################################################################ diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp index 9774d3fab741cb..646dbc0faf5a9f 100644 --- a/clang/lib/Driver/ToolChain.cpp +++ b/clang/lib/Driver/ToolChain.cpp @@ -230,6 +230,20 @@ static void getAArch64MultilibFlags(const Driver &D, Result.push_back(BranchProtectionArg->getAsString(Args)); } + if (Arg *AlignArg = Args.getLastArg( + options::OPT_mstrict_align, options::OPT_mno_strict_align, + options::OPT_mno_unaligned_access, options::OPT_munaligned_access)) { + if (AlignArg->getOption().matches(options::OPT_mstrict_align) || + AlignArg->getOption().matches(options::OPT_mno_unaligned_access)) + Result.push_back(AlignArg->getAsString(Args)); + } + + if (Arg *Endian = Args.getLastArg(options::OPT_mbig_endian, + options::OPT_mlittle_endian)) { + if (Endian->getOption().matches(options::OPT_mbig_endian)) + Result.push_back(Endian->getAsString(Args)); + } + const Arg *ABIArg = Args.getLastArgNoClaim(options::OPT_mabi_EQ); if (ABIArg) { Result.push_back(ABIArg->getAsString(Args)); @@ -287,6 +301,20 @@ static void getARMMultilibFlags(const Driver &D, if (BranchProtectionArg) { Result.push_back(BranchProtectionArg->getAsString(Args)); } + + if (Arg *AlignArg = Args.getLastArg( + options::OPT_mstrict_align, options::OPT_mno_strict_align, + options::OPT_mno_unaligned_access, options::OPT_munaligned_access)) { + if (AlignArg->getOption().matches(options::OPT_mstrict_align) || + AlignArg->getOption().matches(options::OPT_mno_unaligned_access)) + Result.push_back(AlignArg->getAsString(Args)); + } + + if (Arg *Endian = Args.getLastArg(options::OPT_mbig_endian, + options::OPT_mlittle_endian)) { + if (Endian->getOption().matches(options::OPT_mbig_endian)) + Result.push_back(Endian->getAsString(Args)); + } } static void getRISCVMultilibFlags(const Driver &D, const llvm::Triple &Triple, diff --git a/clang/test/Driver/print-multi-selection-flags.c b/clang/test/Driver/print-multi-selection-flags.c index 4bb62665ad8981..5bf6dca5096a73 100644 --- a/clang/test/Driver/print-multi-selection-flags.c +++ b/clang/test/Driver/print-multi-selection-flags.c @@ -68,6 +68,14 @@ // RUN: %clang -multi-lib-config=%S/Inputs/multilib/empty.yaml -print-multi-flags-experimental --target=aarch64-none-elf -mbranch-protection=standard | FileCheck --check-prefix=CHECK-BRANCH-PROTECTION %s // CHECK-BRANCH-PROTECTION: -mbranch-protection=standard +// RUN: %clang -multi-lib-config=%S/Inputs/multilib/empty.yaml -print-multi-flags-experimental --target=arm-none-eabi -mno-unaligned-access | FileCheck --check-prefix=CHECK-NO-UNALIGNED-ACCESS %s +// RUN: %clang -multi-lib-config=%S/Inputs/multilib/empty.yaml -print-multi-flags-experimental --target=aarch64-none-elf -mno-unaligned-access | FileCheck --check-prefix=CHECK-NO-UNALIGNED-ACCESS %s +// CHECK-NO-UNALIGNED-ACCESS: -mno-unaligned-access + +// RUN: %clang -multi-lib-config=%S/Inputs/multilib/empty.yaml -print-multi-flags-experimental --target=arm-none-eabi -mbig-endian | FileCheck --check-prefix=CHECK-BIG-ENDIAN %s +// RUN: %clang -multi-lib-config=%S/Inputs/multilib/empty.yaml -print-multi-flags-experimental --target=aarch64-none-elf -mbig-endian | FileCheck --check-prefix=CHECK-BIG-ENDIAN %s +// CHECK-BIG-ENDIAN: -mbig-endian + // RUN: %clang -multi-lib-config=%S/Inputs/multilib/empty.yaml -print-multi-flags-experimental --target=riscv32-none-elf -march=rv32g | FileCheck --check-prefix=CHECK-RV32 %s // CHECK-RV32: --target=riscv32-unknown-none-elf // CHECK-RV32: -mabi=ilp32d _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
