Skip to content

[Clang][ARM]Ensure both -mno-unaligned-access and -munaligned-access are passed to multilib selection logic #134099

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 3, 2025
Merged

[Clang][ARM]Ensure both -mno-unaligned-access and -munaligned-access are passed to multilib selection logic #134099

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7f63020
Refine multilib selection to handle alignment based on architecture f…
simpal01 Apr 2, 2025
0242cea
fixup! Test that test -mstrict-align/-mno-strict-align too passed to …
simpal01 Apr 2, 2025
6fd1608
fixup! Address review comments by canonicalizing to -mno-unaligned-ac…
simpal01 Apr 3, 2025
7484160
fixup! Remove braces on single statement if else to align with LLVM c…
simpal01 Apr 3, 2025
24597d0
fixup! Remove braces on single statement if else to align with LLVM c…
simpal01 Apr 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions clang/lib/Driver/ToolChain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,12 +239,12 @@ 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 (FeatureSet.contains("+strict-align")) {
Result.push_back("-mno-unaligned-access");
Result.push_back("-mstrict-align");
} else {
Result.push_back("-munaligned-access");
Result.push_back("-mno-strict-align");
}

if (Arg *Endian = Args.getLastArg(options::OPT_mbig_endian,
Expand Down Expand Up @@ -313,12 +313,12 @@ static void getARMMultilibFlags(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 (FeatureSet.contains("+strict-align")) {
Result.push_back("-mno-unaligned-access");
Result.push_back("-mstrict-align");
} else {
Result.push_back("-munaligned-access");
Result.push_back("-mno-strict-align");
}

if (Arg *Endian = Args.getLastArg(options::OPT_mbig_endian,
Expand Down
12 changes: 12 additions & 0 deletions clang/test/Driver/print-multi-selection-flags.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,20 @@
// 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=arm-none-eabi -mstrict-align | FileCheck --check-prefix=CHECK-NO-UNALIGNED-ACCESS %s
// RUN: %clang -multi-lib-config=%S/Inputs/multilib/empty.yaml -print-multi-flags-experimental --target=arm-none-eabi | 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
// RUN: %clang -multi-lib-config=%S/Inputs/multilib/empty.yaml -print-multi-flags-experimental --target=aarch64-none-elf -mstrict-align | FileCheck --check-prefix=CHECK-NO-UNALIGNED-ACCESS %s
// CHECK-NO-UNALIGNED-ACCESS: -mno-unaligned-access
// CHECK-NO-UNALIGNED-ACCESS: -mstrict-align

// RUN: %clang -multi-lib-config=%S/Inputs/multilib/empty.yaml -print-multi-flags-experimental --target=arm-none-eabi -mno-strict-align | FileCheck --check-prefix=CHECK-UNALIGNED-ACCESS %s
// RUN: %clang -multi-lib-config=%S/Inputs/multilib/empty.yaml -print-multi-flags-experimental --target=arm-none-eabi -munaligned-access | FileCheck --check-prefix=CHECK-UNALIGNED-ACCESS %s
// RUN: %clang -multi-lib-config=%S/Inputs/multilib/empty.yaml -print-multi-flags-experimental --target=aarch64-none-elf | FileCheck --check-prefix=CHECK-UNALIGNED-ACCESS %s
// RUN: %clang -multi-lib-config=%S/Inputs/multilib/empty.yaml -print-multi-flags-experimental --target=aarch64-none-elf -mno-strict-align | FileCheck --check-prefix=CHECK-UNALIGNED-ACCESS %s
// RUN: %clang -multi-lib-config=%S/Inputs/multilib/empty.yaml -print-multi-flags-experimental --target=aarch64-none-elf -munaligned-access | FileCheck --check-prefix=CHECK-UNALIGNED-ACCESS %s
// CHECK-UNALIGNED-ACCESS: -mno-strict-align
// CHECK-UNALIGNED-ACCESS: -munaligned-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
Expand Down