Message ID | gkrsfooa7j2.fsf_-_@arm.com |
---|---|
State | New |
Headers | show |
Series | None | expand |
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.
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.
diff --git a/gcc/config/arm/t-rmprofile b/gcc/config/arm/t-rmprofile index eb321e832f1..77147dde2ea 100644 --- a/gcc/config/arm/t-rmprofile +++ b/gcc/config/arm/t-rmprofile @@ -27,8 +27,11 @@ # 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=armv8.1-m.main+mve -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 v8.1-m.main+mve +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=armv8.1-m.main+mve/march=armv8.1-m.main+pacbti/march=armv8.1-m.main+pacbti+fp/march=armv8.1-m.main+pacbti+fp.dp/march=armv8.1-m.main+pacbti+mve +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 v8.1-m.main+mve v8.1-m.main+pacbti v8.1-m.main+pacbti+fp v8.1-m.main+pacbti+dp 8.1-m.main+pacbti+mve + +MULTI_ARCH_OPTS_RM += mbranch-protection=standard +MULTI_ARCH_DIRS_RM += mbranch-protection # Base M-profile (no fp) MULTILIB_REQUIRED += mthumb/march=armv6s-m/mfloat-abi=soft @@ -50,6 +53,14 @@ MULTILIB_REQUIRED += mthumb/march=armv8-m.main+fp.dp/mfloat-abi=hard MULTILIB_REQUIRED += mthumb/march=armv8-m.main+fp.dp/mfloat-abi=softfp MULTILIB_REQUIRED += mthumb/march=armv8.1-m.main+mve/mfloat-abi=hard +MULTILIB_REQUIRED += mthumb/march=armv8.1-m.main+pacbti/mbranch-protection=standard/mfloat-abi=soft +MULTILIB_REQUIRED += mthumb/march=armv8.1-m.main+pacbti+fp/mbranch-protection=standard/mfloat-abi=softfp +MULTILIB_REQUIRED += mthumb/march=armv8.1-m.main+pacbti+fp/mbranch-protection=standard/mfloat-abi=hard +MULTILIB_REQUIRED += mthumb/march=armv8.1-m.main+pacbti+fp.dp/mbranch-protection=standard/mfloat-abi=softfp +MULTILIB_REQUIRED += mthumb/march=armv8.1-m.main+pacbti+fp.dp/mbranch-protection=standard/mfloat-abi=hard +MULTILIB_REQUIRED += mthumb/march=armv8.1-m.main+pacbti+mve/mbranch-protection=standard/mfloat-abi=hard + + # Arch Matches MULTILIB_MATCHES += march?armv6s-m=march?armv6-m @@ -87,9 +98,19 @@ MULTILIB_MATCHES += $(foreach FP, $(v8_1m_sp_variants), \ MULTILIB_MATCHES += $(foreach FP, $(v8_1m_dp_variants), \ march?armv8-m.main+fp.dp=mlibarch?armv8.1-m.main$(FP)) +# 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 + # For all the MULTILIB_REQUIRED for v8-m and above, add MULTILIB_MATCHES which # maps mlibarch with march for multilib linking. MULTILIB_MATCHES += march?armv8-m.main=mlibarch?armv8-m.main MULTILIB_MATCHES += march?armv8-m.main+fp=mlibarch?armv8-m.main+fp MULTILIB_MATCHES += march?armv8-m.main+fp.dp=mlibarch?armv8-m.main+fp.dp MULTILIB_MATCHES += march?armv8.1-m.main+mve=mlibarch?armv8.1-m.main+mve +MULTILIB_MATCHES += march?armv8.1-m.main+pacbti=mlibarch?armv8.1-m.main+pacbti