Skip to content

Commit 6489f3e

Browse files
committed
toolchain/gcc: prevent the use of LDRD/STRD on ARMv5TE
These instructions are for 64-bit load/store. On ARMv5TE, the CPU requires addresses to be aligned to 64-bit. When misaligned, behavior is undefined (effectively either loads the same word twice on LDRD, or corrupts surrounding memory on STRD). On ARMv6 and newer, unaligned access is safe. Removing these instructions for ARMv5TE is necessary, because GCC ignores alignment information in pointers and does unsafe optimizations that have shown up as bugs in various places. This patch was originally added more than 11 years ago in commit b050f87, but got lost 6 years ago, when gcc 9.1 was added in 88c07c6. This primarily affects the kirkwood and ixp4xx targets Signed-off-by: Felix Fietkau <[email protected]> (cherry picked from commit c1c1112)
1 parent 150f181 commit 6489f3e

File tree

4 files changed

+44
-0
lines changed

4 files changed

+44
-0
lines changed
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- a/gcc/config/arm/arm.h
2+
+++ b/gcc/config/arm/arm.h
3+
@@ -165,7 +165,7 @@ emission of floating point pcs attribute
4+
/* Thumb-1 only. */
5+
#define TARGET_THUMB1_ONLY (TARGET_THUMB1 && !arm_arch_notm)
6+
7+
-#define TARGET_LDRD (arm_arch5te && ARM_DOUBLEWORD_ALIGN \
8+
+#define TARGET_LDRD (arm_arch6 && ARM_DOUBLEWORD_ALIGN \
9+
&& !TARGET_THUMB1)
10+
11+
#define TARGET_CRC32 (arm_arch_crc)
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- a/gcc/config/arm/arm.h
2+
+++ b/gcc/config/arm/arm.h
3+
@@ -165,7 +165,7 @@ emission of floating point pcs attribute
4+
/* Thumb-1 only. */
5+
#define TARGET_THUMB1_ONLY (TARGET_THUMB1 && !arm_arch_notm)
6+
7+
-#define TARGET_LDRD (arm_arch5te && ARM_DOUBLEWORD_ALIGN \
8+
+#define TARGET_LDRD (arm_arch6 && ARM_DOUBLEWORD_ALIGN \
9+
&& !TARGET_THUMB1)
10+
11+
#define TARGET_CRC32 (arm_arch_crc)
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- a/gcc/config/arm/arm.h
2+
+++ b/gcc/config/arm/arm.h
3+
@@ -165,7 +165,7 @@ emission of floating point pcs attribute
4+
/* Thumb-1 only. */
5+
#define TARGET_THUMB1_ONLY (TARGET_THUMB1 && !arm_arch_notm)
6+
7+
-#define TARGET_LDRD (arm_arch5te && ARM_DOUBLEWORD_ALIGN \
8+
+#define TARGET_LDRD (arm_arch6 && ARM_DOUBLEWORD_ALIGN \
9+
&& !TARGET_THUMB1)
10+
11+
#define TARGET_CRC32 (arm_arch_crc)
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- a/gcc/config/arm/arm.h
2+
+++ b/gcc/config/arm/arm.h
3+
@@ -165,7 +165,7 @@ emission of floating point pcs attribute
4+
/* Thumb-1 only. */
5+
#define TARGET_THUMB1_ONLY (TARGET_THUMB1 && !arm_arch_notm)
6+
7+
-#define TARGET_LDRD (arm_arch5te && ARM_DOUBLEWORD_ALIGN \
8+
+#define TARGET_LDRD (arm_arch6 && ARM_DOUBLEWORD_ALIGN \
9+
&& !TARGET_THUMB1)
10+
11+
#define TARGET_CRC32 (arm_arch_crc)

0 commit comments

Comments
 (0)