diff mbox series

[COMMITTED] ada: Add escape hatch to configurable run-time

Message ID 20230615080417.939801-1-poulhies@adacore.com
State Committed
Commit 70345b97934d4d998bef26a7d38c9e6a4aa8e776
Headers
Series [COMMITTED] ada: Add escape hatch to configurable run-time |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gcc_build--master-arm fail Patch failed to apply
linaro-tcwg-bot/tcwg_gcc_build--master-aarch64 fail Patch failed to apply
linaro-tcwg-bot/tcwg_gcc_check--master-aarch64 fail Patch failed to apply
linaro-tcwg-bot/tcwg_gcc_check--master-arm success Testing passed

Commit Message

Marc Poulhiès June 15, 2023, 8:04 a.m. UTC 
  From: Ronan Desplanques <desplanques@adacore.com>

Before this patch, the fact that Restrictions pragmas had to fit on
a single line in system.ads was difficult to reconcile with the
80-character line limit that is enforced in that file.

The special rules for pragmas in system.ads made it impossible to us
the Style_Checks pragma to allow long Restrictions pragmas. This patch
relaxes those rules so the Style_Checks pragma can be used in
system.ads.

gcc/ada/

	* targparm.adb: Allow pragma Style_Checks in some forms.
	* targparm.ads: Document new pragma permission.

Tested on x86_64-pc-linux-gnu, committed on master.

---
 gcc/ada/targparm.adb | 8 ++++++++
 gcc/ada/targparm.ads | 4 ++++
 2 files changed, 12 insertions(+)
diff mbox series

Patch

diff --git a/gcc/ada/targparm.adb b/gcc/ada/targparm.adb
index 6e753ea6aaa..d4701453995 100644
--- a/gcc/ada/targparm.adb
+++ b/gcc/ada/targparm.adb
@@ -660,6 +660,14 @@  package body Targparm is
             Opt.Task_Dispatching_Policy_Sloc := System_Location;
             goto Line_Loop_Continue;
 
+         --  Allow "pragma Style_Checks (On);" and "pragma Style_Checks (Off);"
+         --  to make it possible to have long "pragma Restrictions" line.
+
+         elsif Looking_At_Skip ("pragma Style_Checks (On);") or else
+           Looking_At_Skip ("pragma Style_Checks (Off);")
+         then
+            goto Line_Loop_Continue;
+
          --  No other configuration pragmas are permitted
 
          elsif Looking_At ("pragma ") then
diff --git a/gcc/ada/targparm.ads b/gcc/ada/targparm.ads
index 01ee492e015..212725219d7 100644
--- a/gcc/ada/targparm.ads
+++ b/gcc/ada/targparm.ads
@@ -110,6 +110,10 @@  package Targparm is
    --  If a pragma Profile with a valid profile argument appears, then
    --  the appropriate restrictions and policy flags are set.
 
+   --  pragma Style_Checks is allowed with "On" or "Off" as an argument, in
+   --  order to make the conditions on pragma Restrictions documented in the
+   --  next paragraph easier to manage.
+
    --  The only other pragma allowed is a pragma Restrictions that specifies
    --  a restriction that will be imposed on all units in the partition. Note
    --  that in this context, only one restriction can be specified in a single