Skip to content

Commit

Permalink
toolchain: disable thumb-1 targets
Browse files Browse the repository at this point in the history
JIRA: RTOS-664
  • Loading branch information
badochov committed Dec 5, 2024
1 parent 0de4df7 commit 86765f5
Showing 1 changed file with 37 additions and 0 deletions.
37 changes: 37 additions & 0 deletions toolchain/gcc-9.5.0-16-disable-thumb1-targets.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
diff --git a/gcc/config/arm/t-rmprofile b/gcc/config/arm/t-rmprofile
index 7b78d7b67bf..702661f7364 100644
--- a/gcc/config/arm/t-rmprofile
+++ b/gcc/config/arm/t-rmprofile
@@ -27,14 +27,12 @@

# Arch and FPU variants to build libraries with

-MULTI_ARCH_OPTS_RM = march=armv6s-m/march=armv7-m/march=armv7e-m/march=armv7e-m+fp/march=armv7e-m+fp.dp/march=armv8-m.base/march=armv8-m.main/march=armv8-m.main+fp/march=armv8-m.main+fp.dp/march=armv7-r/march=armv7-r+fp/march=armv8-r/march=armv8-r+simd
-MULTI_ARCH_DIRS_RM = v6-m v7-m v7e-m v7e-m+fp v7e-m+dp v8-m.base v8-m.main v8-m.main+fp v8-m.main+dp v7-r v7-r+fp v8-r v8r+simd
+MULTI_ARCH_OPTS_RM = march=armv7-m/march=armv7e-m/march=armv7e-m+fp/march=armv7e-m+fp.dp/march=armv8-m.main/march=armv8-m.main+fp/march=armv8-m.main+fp.dp/march=armv7-r/march=armv7-r+fp/march=armv8-r/march=armv8-r+simd
+MULTI_ARCH_DIRS_RM = v7-m v7e-m v7e-m+fp v7e-m+dp v8-m.main v8-m.main+fp v8-m.main+dp v7-r v7-r+fp v8-r v8r+simd

# Base M-profile (no fp)
-MULTILIB_REQUIRED += mthumb/march=armv6s-m/mfloat-abi=soft
MULTILIB_REQUIRED += mthumb/march=armv7-m/mfloat-abi=soft
MULTILIB_REQUIRED += mthumb/march=armv7e-m/mfloat-abi=soft
-MULTILIB_REQUIRED += mthumb/march=armv8-m.base/mfloat-abi=soft
MULTILIB_REQUIRED += mthumb/march=armv8-m.main/mfloat-abi=soft
MULTILIB_REQUIRED += mthumb/march=armv7-r/mfloat-abi=soft
MULTILIB_REQUIRED += mthumb/march=armv8-r/mfloat-abi=soft
@@ -61,7 +59,6 @@ MULTILIB_REQUIRED += mthumb/march=armv8-r+simd/mfloat-abi=softfp


# Arch Matches
-MULTILIB_MATCHES += march?armv6s-m=march?armv6-m

# Map all v8-m.main+dsp FP variants down the the variant without DSP.
MULTILIB_MATCHES += march?armv8-m.main=march?armv8-m.main+dsp \
@@ -72,6 +69,6 @@ MULTILIB_MATCHES += march?armv8-m.main=march?armv8-m.main+dsp \
MULTILIB_MATCHES += march?armv7e-m+fp=march?armv7e-m+fpv5

# Softfp but no FP. Use the soft-float libraries.
-MULTILIB_REUSE += $(foreach ARCH, armv6s-m armv7-m armv7e-m armv8-m\.base armv8-m\.main armv7-r armv8-r, \
+MULTILIB_REUSE += $(foreach ARCH, armv7-m armv7e-m armv8-m\.main armv7-r armv8-r, \
mthumb/march.$(ARCH)/mfloat-abi.soft=mthumb/march.$(ARCH)/mfloat-abi.softfp)

0 comments on commit 86765f5

Please sign in to comment.