From f9e0bb022f0ed0b65a7a6f7b2dc40edc931b9903 Mon Sep 17 00:00:00 2001 From: Simi Pallipurath Date: Tue, 26 Nov 2024 16:41:17 +0000 Subject: [PATCH] Rename the variant name from strictly_aligned to strictalign. This is to match with the corresponding aarch64 variant for -mno-unaligned-access. --- arm-multilib/json/multilib.json | 10 +++++----- ..._aligned.json => armv7a_soft_nofp_strictalign.json} | 4 ++-- ...json => armv7a_soft_nofp_strictalign_exn_rtti.json} | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) rename arm-multilib/json/variants/{armv7a_soft_nofp_strictly_aligned.json => armv7a_soft_nofp_strictalign.json} (95%) rename arm-multilib/json/variants/{armv7a_soft_nofp_strictly_aligned_exn_rtti.json => armv7a_soft_nofp_strictalign_exn_rtti.json} (94%) diff --git a/arm-multilib/json/multilib.json b/arm-multilib/json/multilib.json index 73d1bc95..6b532ed9 100644 --- a/arm-multilib/json/multilib.json +++ b/arm-multilib/json/multilib.json @@ -71,13 +71,13 @@ "flags": "--target=armv7-unknown-none-eabi -mfpu=none -fno-exceptions -fno-rtti" }, { - "variant": "armv7a_soft_nofp_strictly_aligned_exn_rtti", - "json": "armv7a_soft_nofp_strictly_aligned_exn_rtti.json", + "variant": "armv7a_soft_nofp_strictalign_exn_rtti", + "json": "armv7a_soft_nofp_strictalign_exn_rtti.json", "flags": "--target=armv7-unknown-none-eabi -mfpu=none -mno-unaligned-access" }, { - "variant": "armv7a_soft_nofp_strictly_aligned", - "json": "armv7a_soft_nofp_strictly_aligned.json", + "variant": "armv7a_soft_nofp_strictalign", + "json": "armv7a_soft_nofp_strictalign.json", "flags": "--target=armv7-unknown-none-eabi -mfpu=none -mno-unaligned-access -fno-exceptions -fno-rtti" }, { @@ -286,4 +286,4 @@ "flags": "--target=thumbv8.1m.main-unknown-none-eabihf -march=thumbv8.1m.main+mve -mfpu=none -mbranch-protection=pac-ret+bti -fno-exceptions -fno-rtti" } ] -} \ No newline at end of file +} diff --git a/arm-multilib/json/variants/armv7a_soft_nofp_strictly_aligned.json b/arm-multilib/json/variants/armv7a_soft_nofp_strictalign.json similarity index 95% rename from arm-multilib/json/variants/armv7a_soft_nofp_strictly_aligned.json rename to arm-multilib/json/variants/armv7a_soft_nofp_strictalign.json index aea94f10..3312efe3 100644 --- a/arm-multilib/json/variants/armv7a_soft_nofp_strictly_aligned.json +++ b/arm-multilib/json/variants/armv7a_soft_nofp_strictalign.json @@ -2,7 +2,7 @@ "args": { "common": { "TARGET_ARCH": "armv7a", - "VARIANT": "armv7a_soft_nofp_strictly_aligned", + "VARIANT": "armv7a_soft_nofp_strictalign", "COMPILE_FLAGS": "-mfloat-abi=soft -march=armv7a -mfpu=none -mno-unaligned-access", "ENABLE_EXCEPTIONS": "OFF", "ENABLE_RTTI": "OFF", @@ -38,4 +38,4 @@ "ENABLE_LIBCXX_TESTS": "OFF" } } -} \ No newline at end of file +} diff --git a/arm-multilib/json/variants/armv7a_soft_nofp_strictly_aligned_exn_rtti.json b/arm-multilib/json/variants/armv7a_soft_nofp_strictalign_exn_rtti.json similarity index 94% rename from arm-multilib/json/variants/armv7a_soft_nofp_strictly_aligned_exn_rtti.json rename to arm-multilib/json/variants/armv7a_soft_nofp_strictalign_exn_rtti.json index cc285a0c..bb436482 100644 --- a/arm-multilib/json/variants/armv7a_soft_nofp_strictly_aligned_exn_rtti.json +++ b/arm-multilib/json/variants/armv7a_soft_nofp_strictalign_exn_rtti.json @@ -2,7 +2,7 @@ "args": { "common": { "TARGET_ARCH": "armv7a", - "VARIANT": "armv7a_soft_nofp_strictly_aligned_exn_rtti", + "VARIANT": "armv7a_soft_nofp_strictalign_exn_rtti", "COMPILE_FLAGS": "-mfloat-abi=soft -march=armv7a -mfpu=none -mno-unaligned-access", "ENABLE_EXCEPTIONS": "ON", "ENABLE_RTTI": "ON", @@ -38,4 +38,4 @@ "ENABLE_LIBCXX_TESTS": "OFF" } } -} \ No newline at end of file +}