Build AArch32 base variants with strict alignment

vhscampos · vhscampos · commit 36a9e2450422 · 2024-12-17T16:14:40.000Z
This patch adds `-mno-unaligned-access` to the compile flags of the
AArch32 base variants.

Base variants are the set of libraries that provide the most compatible
functionality. As a consequence, they are built with strict alignment in
order to work nicely with client code that is compiled with or without
strict alignment.

The libraries for Armv7-a soft already had a variant with and without
strict alignment. Hence now just one remains, the one with strict
alignment.
diff --git a/arm-multilib/json/multilib.json b/arm-multilib/json/multilib.json
@@ -94,16 +94,6 @@
             "json": "armv7a_soft_nofp.json",
             "flags": "--target=armv7-unknown-none-eabi -mfpu=none -fno-exceptions -fno-rtti"
         },
-        {
-            "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_strictalign",
-            "json": "armv7a_soft_nofp_strictalign.json",
-            "flags": "--target=armv7-unknown-none-eabi -mfpu=none -mno-unaligned-access -fno-exceptions -fno-rtti"
-        },
         {
             "variant": "armv7a_hard_vfpv3_d16_exn_rtti",
             "json": "armv7a_hard_vfpv3_d16_exn_rtti.json",
diff --git a/arm-multilib/json/variants/armv6m_soft_nofp.json b/arm-multilib/json/variants/armv6m_soft_nofp.json
@@ -3,7 +3,7 @@
         "common": {
             "TARGET_ARCH": "armv6m",
             "VARIANT": "armv6m_soft_nofp",
-            "COMPILE_FLAGS": "-mfloat-abi=soft -march=armv6m -mfpu=none",
+            "COMPILE_FLAGS": "-mfloat-abi=soft -march=armv6m -mfpu=none -mno-unaligned-access",
             "ENABLE_EXCEPTIONS": "OFF",
             "ENABLE_RTTI": "OFF",
             "TEST_EXECUTOR": "qemu",
diff --git a/arm-multilib/json/variants/armv6m_soft_nofp_exn_rtti.json b/arm-multilib/json/variants/armv6m_soft_nofp_exn_rtti.json
@@ -3,7 +3,7 @@
         "common": {
             "TARGET_ARCH": "armv6m",
             "VARIANT": "armv6m_soft_nofp_exn_rtti",
-            "COMPILE_FLAGS": "-mfloat-abi=soft -march=armv6m -mfpu=none",
+            "COMPILE_FLAGS": "-mfloat-abi=soft -march=armv6m -mfpu=none -mno-unaligned-access",
             "ENABLE_EXCEPTIONS": "ON",
             "ENABLE_RTTI": "ON",
             "TEST_EXECUTOR": "qemu",
diff --git a/arm-multilib/json/variants/armv7a_hard_vfpv3_d16.json b/arm-multilib/json/variants/armv7a_hard_vfpv3_d16.json
@@ -3,7 +3,7 @@
         "common": {
             "TARGET_ARCH": "armv7a",
             "VARIANT": "armv7a_hard_vfpv3_d16",
-            "COMPILE_FLAGS": "-mfloat-abi=hard -march=armv7a -mfpu=vfpv3-d16",
+            "COMPILE_FLAGS": "-mfloat-abi=hard -march=armv7a -mfpu=vfpv3-d16 -mno-unaligned-access",
             "ENABLE_EXCEPTIONS": "OFF",
             "ENABLE_RTTI": "OFF",
             "TEST_EXECUTOR": "qemu",
@@ -38,4 +38,4 @@
             "ENABLE_LIBCXX_TESTS": "OFF"
         }
     }
-}
+}
diff --git a/arm-multilib/json/variants/armv7a_hard_vfpv3_d16_exn_rtti.json b/arm-multilib/json/variants/armv7a_hard_vfpv3_d16_exn_rtti.json
@@ -3,7 +3,7 @@
         "common": {
             "TARGET_ARCH": "armv7a",
             "VARIANT": "armv7a_hard_vfpv3_d16_exn_rtti",
-            "COMPILE_FLAGS": "-mfloat-abi=hard -march=armv7a -mfpu=vfpv3-d16",
+            "COMPILE_FLAGS": "-mfloat-abi=hard -march=armv7a -mfpu=vfpv3-d16 -mno-unaligned-access",
             "ENABLE_EXCEPTIONS": "ON",
             "ENABLE_RTTI": "ON",
             "TEST_EXECUTOR": "qemu",
@@ -38,4 +38,4 @@
             "ENABLE_LIBCXX_TESTS": "OFF"
         }
     }
-}
+}
diff --git a/arm-multilib/json/variants/armv7a_soft_nofp.json b/arm-multilib/json/variants/armv7a_soft_nofp.json
@@ -3,7 +3,7 @@
         "common": {
             "TARGET_ARCH": "armv7a",
             "VARIANT": "armv7a_soft_nofp",
-            "COMPILE_FLAGS": "-mfloat-abi=soft -march=armv7a -mfpu=none",
+            "COMPILE_FLAGS": "-mfloat-abi=soft -march=armv7a -mfpu=none -mno-unaligned-access",
             "ENABLE_EXCEPTIONS": "OFF",
             "ENABLE_RTTI": "OFF",
             "TEST_EXECUTOR": "qemu",
@@ -38,4 +38,4 @@
             "ENABLE_LIBCXX_TESTS": "OFF"
         }
     }
-}
+}
diff --git a/arm-multilib/json/variants/armv7a_soft_nofp_exn_rtti.json b/arm-multilib/json/variants/armv7a_soft_nofp_exn_rtti.json
@@ -3,7 +3,7 @@
         "common": {
             "TARGET_ARCH": "armv7a",
             "VARIANT": "armv7a_soft_nofp_exn_rtti",
-            "COMPILE_FLAGS": "-mfloat-abi=soft -march=armv7a -mfpu=none",
+            "COMPILE_FLAGS": "-mfloat-abi=soft -march=armv7a -mfpu=none -mno-unaligned-access",
             "ENABLE_EXCEPTIONS": "ON",
             "ENABLE_RTTI": "ON",
             "TEST_EXECUTOR": "qemu",
@@ -38,4 +38,4 @@
             "ENABLE_LIBCXX_TESTS": "OFF"
         }
     }
-}
+}
diff --git a/arm-multilib/json/variants/armv7a_soft_nofp_strictalign.json b/arm-multilib/json/variants/armv7a_soft_nofp_strictalign.json
diff --git a/arm-multilib/json/variants/armv7a_soft_nofp_strictalign_exn_rtti.json b/arm-multilib/json/variants/armv7a_soft_nofp_strictalign_exn_rtti.json
diff --git a/arm-multilib/json/variants/armv7a_soft_vfpv3_d16.json b/arm-multilib/json/variants/armv7a_soft_vfpv3_d16.json
@@ -3,7 +3,7 @@
         "common": {
             "TARGET_ARCH": "armv7a",
             "VARIANT": "armv7a_soft_vfpv3_d16",
-            "COMPILE_FLAGS": "-mfloat-abi=softfp -march=armv7a -mfpu=vfpv3-d16",
+            "COMPILE_FLAGS": "-mfloat-abi=softfp -march=armv7a -mfpu=vfpv3-d16 -mno-unaligned-access",
             "ENABLE_EXCEPTIONS": "OFF",
             "ENABLE_RTTI": "OFF",
             "TEST_EXECUTOR": "qemu",
diff --git a/arm-multilib/json/variants/armv7a_soft_vfpv3_d16_exn_rtti.json b/arm-multilib/json/variants/armv7a_soft_vfpv3_d16_exn_rtti.json
@@ -3,7 +3,7 @@
         "common": {
             "TARGET_ARCH": "armv7a",
             "VARIANT": "armv7a_soft_vfpv3_d16_exn_rtti",
-            "COMPILE_FLAGS": "-mfloat-abi=softfp -march=armv7a -mfpu=vfpv3-d16",
+            "COMPILE_FLAGS": "-mfloat-abi=softfp -march=armv7a -mfpu=vfpv3-d16 -mno-unaligned-access",
             "ENABLE_EXCEPTIONS": "ON",
             "ENABLE_RTTI": "ON",
             "TEST_EXECUTOR": "qemu",
@@ -38,4 +38,4 @@
             "ENABLE_LIBCXX_TESTS": "OFF"
         }
     }
-}
+}
diff --git a/arm-multilib/json/variants/armv7m_hard_fpv4_sp_d16.json b/arm-multilib/json/variants/armv7m_hard_fpv4_sp_d16.json
@@ -3,7 +3,7 @@
         "common": {
             "TARGET_ARCH": "armv7m",
             "VARIANT": "armv7m_hard_fpv4_sp_d16",
-            "COMPILE_FLAGS": "-mfloat-abi=hard -march=armv7m -mfpu=fpv4-sp-d16",
+            "COMPILE_FLAGS": "-mfloat-abi=hard -march=armv7m -mfpu=fpv4-sp-d16 -mno-unaligned-access",
             "ENABLE_EXCEPTIONS": "OFF",
             "ENABLE_RTTI": "OFF",
             "TEST_EXECUTOR": "qemu",
diff --git a/arm-multilib/json/variants/armv7m_hard_fpv4_sp_d16_exn_rtti.json b/arm-multilib/json/variants/armv7m_hard_fpv4_sp_d16_exn_rtti.json
@@ -3,7 +3,7 @@
         "common": {
             "TARGET_ARCH": "armv7m",
             "VARIANT": "armv7m_hard_fpv4_sp_d16_exn_rtti",
-            "COMPILE_FLAGS": "-mfloat-abi=hard -march=armv7m -mfpu=fpv4-sp-d16",
+            "COMPILE_FLAGS": "-mfloat-abi=hard -march=armv7m -mfpu=fpv4-sp-d16 -mno-unaligned-access",
             "ENABLE_EXCEPTIONS": "ON",
             "ENABLE_RTTI": "ON",
             "TEST_EXECUTOR": "qemu",
diff --git a/arm-multilib/json/variants/armv7m_soft_fpv4_sp_d16.json b/arm-multilib/json/variants/armv7m_soft_fpv4_sp_d16.json
@@ -3,7 +3,7 @@
         "common": {
             "TARGET_ARCH": "armv7m",
             "VARIANT": "armv7m_soft_fpv4_sp_d16",
-            "COMPILE_FLAGS": "-mfloat-abi=softfp -march=armv7m -mfpu=fpv4-sp-d16",
+            "COMPILE_FLAGS": "-mfloat-abi=softfp -march=armv7m -mfpu=fpv4-sp-d16 -mno-unaligned-access",
             "ENABLE_EXCEPTIONS": "OFF",
             "ENABLE_RTTI": "OFF",
             "TEST_EXECUTOR": "qemu",
diff --git a/arm-multilib/json/variants/armv7m_soft_fpv4_sp_d16_exn_rtti.json b/arm-multilib/json/variants/armv7m_soft_fpv4_sp_d16_exn_rtti.json
@@ -3,7 +3,7 @@
         "common": {
             "TARGET_ARCH": "armv7m",
             "VARIANT": "armv7m_soft_fpv4_sp_d16_exn_rtti",
-            "COMPILE_FLAGS": "-mfloat-abi=softfp -march=armv7m -mfpu=fpv4-sp-d16",
+            "COMPILE_FLAGS": "-mfloat-abi=softfp -march=armv7m -mfpu=fpv4-sp-d16 -mno-unaligned-access",
             "ENABLE_EXCEPTIONS": "ON",
             "ENABLE_RTTI": "ON",
             "TEST_EXECUTOR": "qemu",
diff --git a/arm-multilib/json/variants/armv7m_soft_nofp.json b/arm-multilib/json/variants/armv7m_soft_nofp.json
@@ -3,7 +3,7 @@
         "common": {
             "TARGET_ARCH": "armv7m",
             "VARIANT": "armv7m_soft_nofp",
-            "COMPILE_FLAGS": "-mfloat-abi=soft -march=armv7m -mfpu=none",
+            "COMPILE_FLAGS": "-mfloat-abi=soft -march=armv7m -mfpu=none -mno-unaligned-access",
             "ENABLE_EXCEPTIONS": "OFF",
             "ENABLE_RTTI": "OFF",
             "TEST_EXECUTOR": "qemu",
diff --git a/arm-multilib/json/variants/armv7m_soft_nofp_exn_rtti.json b/arm-multilib/json/variants/armv7m_soft_nofp_exn_rtti.json
@@ -3,7 +3,7 @@
         "common": {
             "TARGET_ARCH": "armv7m",
             "VARIANT": "armv7m_soft_nofp_exn_rtti",
-            "COMPILE_FLAGS": "-mfloat-abi=soft -march=armv7m -mfpu=none",
+            "COMPILE_FLAGS": "-mfloat-abi=soft -march=armv7m -mfpu=none -mno-unaligned-access",
             "ENABLE_EXCEPTIONS": "ON",
             "ENABLE_RTTI": "ON",
             "TEST_EXECUTOR": "qemu",
diff --git a/arm-multilib/json/variants/armv7r_hard_vfpv3_d16.json b/arm-multilib/json/variants/armv7r_hard_vfpv3_d16.json
@@ -3,7 +3,7 @@
         "common": {
             "TARGET_ARCH": "armv7r",
             "VARIANT": "armv7r_hard_vfpv3_d16",
-            "COMPILE_FLAGS": "-mfloat-abi=hard -march=armv7r -mfpu=vfpv3-d16",
+            "COMPILE_FLAGS": "-mfloat-abi=hard -march=armv7r -mfpu=vfpv3-d16 -mno-unaligned-access",
             "ENABLE_EXCEPTIONS": "OFF",
             "ENABLE_RTTI": "OFF",
             "TEST_EXECUTOR": "qemu",
diff --git a/arm-multilib/json/variants/armv7r_hard_vfpv3_d16_exn_rtti.json b/arm-multilib/json/variants/armv7r_hard_vfpv3_d16_exn_rtti.json
@@ -3,7 +3,7 @@
         "common": {
             "TARGET_ARCH": "armv7r",
             "VARIANT": "armv7r_hard_vfpv3_d16_exn_rtti",
-            "COMPILE_FLAGS": "-mfloat-abi=hard -march=armv7r -mfpu=vfpv3-d16",
+            "COMPILE_FLAGS": "-mfloat-abi=hard -march=armv7r -mfpu=vfpv3-d16 -mno-unaligned-access",
             "ENABLE_EXCEPTIONS": "ON",
             "ENABLE_RTTI": "ON",
             "TEST_EXECUTOR": "qemu",
diff --git a/arm-multilib/json/variants/armv7r_hard_vfpv3xd.json b/arm-multilib/json/variants/armv7r_hard_vfpv3xd.json
@@ -3,7 +3,7 @@
         "common": {
             "TARGET_ARCH": "armv7r",
             "VARIANT": "armv7r_hard_vfpv3xd",
-            "COMPILE_FLAGS": "-mfloat-abi=hard -march=armv7r -mfpu=vfpv3xd",
+            "COMPILE_FLAGS": "-mfloat-abi=hard -march=armv7r -mfpu=vfpv3xd -mno-unaligned-access",
             "ENABLE_EXCEPTIONS": "OFF",
             "ENABLE_RTTI": "OFF",
             "TEST_EXECUTOR": "qemu",
diff --git a/arm-multilib/json/variants/armv7r_hard_vfpv3xd_exn_rtti.json b/arm-multilib/json/variants/armv7r_hard_vfpv3xd_exn_rtti.json
@@ -3,7 +3,7 @@
         "common": {
             "TARGET_ARCH": "armv7r",
             "VARIANT": "armv7r_hard_vfpv3xd_exn_rtti",
-            "COMPILE_FLAGS": "-mfloat-abi=hard -march=armv7r -mfpu=vfpv3xd",
+            "COMPILE_FLAGS": "-mfloat-abi=hard -march=armv7r -mfpu=vfpv3xd -mno-unaligned-access",
             "ENABLE_EXCEPTIONS": "ON",
             "ENABLE_RTTI": "ON",
             "TEST_EXECUTOR": "qemu",
diff --git a/arm-multilib/json/variants/armv7r_soft_nofp.json b/arm-multilib/json/variants/armv7r_soft_nofp.json
@@ -3,7 +3,7 @@
         "common": {
             "TARGET_ARCH": "armv7r",
             "VARIANT": "armv7r_soft_nofp",
-            "COMPILE_FLAGS": "-mfloat-abi=soft -march=armv7r -mfpu=none",
+            "COMPILE_FLAGS": "-mfloat-abi=soft -march=armv7r -mfpu=none -mno-unaligned-access",
             "ENABLE_EXCEPTIONS": "OFF",
             "ENABLE_RTTI": "OFF",
             "TEST_EXECUTOR": "qemu",
@@ -38,4 +38,4 @@
             "ENABLE_LIBCXX_TESTS": "OFF"
         }
     }
-}
+}
diff --git a/arm-multilib/json/variants/armv7r_soft_nofp_exn_rtti.json b/arm-multilib/json/variants/armv7r_soft_nofp_exn_rtti.json
@@ -3,7 +3,7 @@
         "common": {
             "TARGET_ARCH": "armv7r",
             "VARIANT": "armv7r_soft_nofp_exn_rtti",
-            "COMPILE_FLAGS": "-mfloat-abi=soft -march=armv7r -mfpu=none",
+            "COMPILE_FLAGS": "-mfloat-abi=soft -march=armv7r -mfpu=none -mno-unaligned-access",
             "ENABLE_EXCEPTIONS": "ON",
             "ENABLE_RTTI": "ON",
             "TEST_EXECUTOR": "qemu",
@@ -38,4 +38,4 @@
             "ENABLE_LIBCXX_TESTS": "OFF"
         }
     }
-}
+}
diff --git a/arm-multilib/json/variants/armv7r_soft_vfpv3xd.json b/arm-multilib/json/variants/armv7r_soft_vfpv3xd.json
@@ -3,7 +3,7 @@
         "common": {
             "TARGET_ARCH": "armv7r",
             "VARIANT": "armv7r_soft_vfpv3xd",
-            "COMPILE_FLAGS": "-mfloat-abi=softfp -march=armv7r -mfpu=vfpv3xd",
+            "COMPILE_FLAGS": "-mfloat-abi=softfp -march=armv7r -mfpu=vfpv3xd -mno-unaligned-access",
             "ENABLE_EXCEPTIONS": "OFF",
             "ENABLE_RTTI": "OFF",
             "TEST_EXECUTOR": "qemu",
diff --git a/arm-multilib/json/variants/armv7r_soft_vfpv3xd_exn_rtti.json b/arm-multilib/json/variants/armv7r_soft_vfpv3xd_exn_rtti.json
@@ -3,7 +3,7 @@
         "common": {
             "TARGET_ARCH": "armv7r",
             "VARIANT": "armv7r_soft_vfpv3xd_exn_rtti",
-            "COMPILE_FLAGS": "-mfloat-abi=softfp -march=armv7r -mfpu=vfpv3xd",
+            "COMPILE_FLAGS": "-mfloat-abi=softfp -march=armv7r -mfpu=vfpv3xd -mno-unaligned-access",
             "ENABLE_EXCEPTIONS": "ON",
             "ENABLE_RTTI": "ON",
             "TEST_EXECUTOR": "qemu",
diff --git a/test/multilib/armv7a.test b/test/multilib/armv7a.test
@@ -13,7 +13,7 @@
 # RUN: %clang -print-multi-directory --target=armv7ve-none-eabi -mfpu=none -mno-unaligned-access | FileCheck --check-prefix=CHECK-NOUNALIGNED %s
 # RUN: %clang -print-multi-directory --target=armv7ve-none-eabi -mfpu=none -mno-unaligned-access -marm  | FileCheck --check-prefix=CHECK-NOUNALIGNED %s
 # RUN: %clang -print-multi-directory --target=armv7ve-none-eabi -mfpu=none -mno-unaligned-access -mthumb| FileCheck --check-prefix=CHECK-NOUNALIGNED %s
-# CHECK-NOUNALIGNED: arm-none-eabi/armv7a_soft_nofp_strictalign_exn_rtti{{$}}
+# CHECK-NOUNALIGNED: arm-none-eabi/armv7a_soft_nofp_exn_rtti{{$}}
 # CHECK-NOUNALIGNED-EMPTY:
 
 # RUN: %clang -print-multi-directory --target=armv7a-none-eabihf -mfpu=vfpv3-d16 | FileCheck --check-prefix=VFPV3 %s

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`"common": {`
`4`	`4`	`"TARGET_ARCH": "armv7a",`
`5`	`5`	`"VARIANT": "armv7a_hard_vfpv3_d16",`
`6`		`- "COMPILE_FLAGS": "-mfloat-abi=hard -march=armv7a -mfpu=vfpv3-d16",`
	`6`	`+ "COMPILE_FLAGS": "-mfloat-abi=hard -march=armv7a -mfpu=vfpv3-d16 -mno-unaligned-access",`
`7`	`7`	`"ENABLE_EXCEPTIONS": "OFF",`
`8`	`8`	`"ENABLE_RTTI": "OFF",`
`9`	`9`	`"TEST_EXECUTOR": "qemu",`
`@@ -38,4 +38,4 @@`
`38`	`38`	`"ENABLE_LIBCXX_TESTS": "OFF"`
`39`	`39`	`}`
`40`	`40`	`}`
`41`		`-}`
	`41`	`+}`