On 01/07/2022 15:54, Richard Earnshaw via Gcc-patches wrote:
On 01/06/2022 13:32, Andrea Corallo via Gcc-patches wrote:
Hi all,
second iteration of the previous patch adding the following new
multilibs:
thumb/v8.1-m.main+pacbti/mbranch-protection/nofp
thumb/v8.1-m.main+pacbti+dp/mbranch-protection/soft
thumb/v8.1-m.main+pacbti+dp/mbranch-protection/hard
thumb/v8.1-m.main+pacbti+fp/mbranch-protection/soft
thumb/v8.1-m.main+pacbti+fp/mbranch-protection/hard
thumb/v8.1-m.main+pacbti+mve/mbranch-protection/hard
To trigger the following compiler flags:
-mthumb -march=armv8.1-m.main+pacbti -mbranch-protection=standard
-mfloat-abi=soft
-mthumb -march=armv8.1-m.main+pacbti+fp -mbranch-protection=standard
-mfloat-abi=softfp
-mthumb -march=armv8.1-m.main+pacbti+fp -mbranch-protection=standard
-mfloat-abi=hard
-mthumb -march=armv8.1-m.main+pacbti+fp.dp
-mbranch-protection=standard -mfloat-abi=softfp
-mthumb -march=armv8.1-m.main+pacbti+fp.dp
-mbranch-protection=standard -mfloat-abi=hard
-mthumb -march=armv8.1-m.main+pacbti+mve -mbranch-protection=standard
-mfloat-abi=hard
gcc/ChangeLog:
* config/arm/t-rmprofile: Add multilib rules for march +pacbti
and mbranch-protection.
+# Map all mbranch-protection values other than 'none' to 'standard'.
+MULTILIB_MATCHES += mbranch-protection?standard=mbranch-protection?bti
+MULTILIB_MATCHES +=
mbranch-protection?standard=mbranch-protection?pac-ret
+MULTILIB_MATCHES +=
mbranch-protection?standard=mbranch-protection?pac-ret+leaf
+MULTILIB_MATCHES +=
mbranch-protection?standard=mbranch-protection?pac-ret+bti
+MULTILIB_MATCHES +=
mbranch-protection?standard=mbranch-protection?pac-ret+leaf+bti
+MULTILIB_MATCHES +=
mbranch-protection?standard=mbranch-protection?bti+pac-ret
+MULTILIB_MATCHES +=
mbranch-protection?standard=mbranch-protection?bti+pac-ret+leaf
+
The documentation mentions -mbranch-protection=standard+leaf, so you're
missing a mapping for that.
OK with that change.
R.
Oh, and please add some tests to gcc/testsuite/gcc.target/arm/multilib.exp
R.
