From b4377af729850cfda7b59d4349428af2f0bf8cdb Mon Sep 17 00:00:00 2001 From: Matthieu Longo Date: Thu, 28 Nov 2024 15:36:51 +0000 Subject: aarch64: simplify condition in elfNN_aarch64_merge_gnu_properties The current condition used to check if a GNU feature property is set on an input object before the merge is a bit confusing. (aprop && !) || !aprop It seems easier to understand if it is changed as follows: (!aprop || !) --- bfd/elfnn-aarch64.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c index 0350325..ba58349 100644 --- a/bfd/elfnn-aarch64.c +++ b/bfd/elfnn-aarch64.c @@ -10651,11 +10651,9 @@ elfNN_aarch64_merge_gnu_properties (struct bfd_link_info *info, if ((prop & GNU_PROPERTY_AARCH64_FEATURE_1_BTI) && (bti_report != MARKING_NONE)) { - if ((aprop && !(aprop->u.number & GNU_PROPERTY_AARCH64_FEATURE_1_BTI)) - || !aprop) + if (!aprop || !(aprop->u.number & GNU_PROPERTY_AARCH64_FEATURE_1_BTI)) _bfd_aarch64_elf_check_bti_report (bti_report, abfd); - if ((bprop && !(bprop->u.number & GNU_PROPERTY_AARCH64_FEATURE_1_BTI)) - || !bprop) + if (!bprop || !(bprop->u.number & GNU_PROPERTY_AARCH64_FEATURE_1_BTI)) _bfd_aarch64_elf_check_bti_report (bti_report, bbfd); } } -- cgit v1.1