From: Ronan Desplanques <[email protected]>
This variable was used for the "Community" variant of GNAT Pro. That's
gone now, so remove the variable.
gcc/ada/ChangeLog:
* opt.ads (Latest_Ada_Only): Remove.
* par-prag.adb (Prag): Adapt to removal.
* sem_prag.adb (Analyze_Pragma): Likewise.
* switch-c.adb (Scan_Front_End_Switches): Likewise.
* usage.adb (Usage): Likewise.
Tested on x86_64-pc-linux-gnu, committed on master.
---
gcc/ada/opt.ads | 5 -----
gcc/ada/par-prag.adb | 18 +++++++-----------
gcc/ada/sem_prag.adb | 30 +++++++++---------------------
gcc/ada/switch-c.adb | 10 ++++------
gcc/ada/usage.adb | 21 +++++++++------------
5 files changed, 29 insertions(+), 55 deletions(-)
diff --git a/gcc/ada/opt.ads b/gcc/ada/opt.ads
index aabb9a49310..5d06c7d859e 100644
--- a/gcc/ada/opt.ads
+++ b/gcc/ada/opt.ads
@@ -67,11 +67,6 @@ package Opt is
-- case of some binder variables, Gnatbind.Scan_Bind_Arg may modify
-- the default values.
- Latest_Ada_Only : Boolean := False;
- -- If True, the only value valid for Ada_Version is Ada_2012 or later.
- -- Trying to specify other values will be ignored (in case of pragma
- -- Ada_xxx) or generate an error (in case of -gnat83/95/xx switches).
-
type Ada_Version_Type is
(Ada_83, Ada_95, Ada_2005, Ada_2012, Ada_2022,
Ada_With_Core_Extensions, Ada_With_All_Extensions);
diff --git a/gcc/ada/par-prag.adb b/gcc/ada/par-prag.adb
index 63eb2ddb695..16c6582a396 100644
--- a/gcc/ada/par-prag.adb
+++ b/gcc/ada/par-prag.adb
@@ -354,22 +354,18 @@ begin
------------
when Pragma_Ada_83 =>
- if not Latest_Ada_Only then
- Ada_Version := Ada_83;
- Ada_Version_Explicit := Ada_83;
- Ada_Version_Pragma := Pragma_Node;
- end if;
+ Ada_Version := Ada_83;
+ Ada_Version_Explicit := Ada_83;
+ Ada_Version_Pragma := Pragma_Node;
------------
-- Ada_95 --
------------
when Pragma_Ada_95 =>
- if not Latest_Ada_Only then
- Ada_Version := Ada_95;
- Ada_Version_Explicit := Ada_95;
- Ada_Version_Pragma := Pragma_Node;
- end if;
+ Ada_Version := Ada_95;
+ Ada_Version_Explicit := Ada_95;
+ Ada_Version_Pragma := Pragma_Node;
---------------------
-- Ada_05/Ada_2005 --
@@ -378,7 +374,7 @@ begin
when Pragma_Ada_05
| Pragma_Ada_2005
=>
- if Arg_Count = 0 and not Latest_Ada_Only then
+ if Arg_Count = 0 then
Ada_Version := Ada_2005;
Ada_Version_Explicit := Ada_2005;
Ada_Version_Pragma := Pragma_Node;
diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb
index 24d61afd7e1..d007c1ed8d1 100644
--- a/gcc/ada/sem_prag.adb
+++ b/gcc/ada/sem_prag.adb
@@ -13793,13 +13793,9 @@ package body Sem_Prag is
-- Now set Ada 83 mode
- if Latest_Ada_Only then
- Error_Pragma ("??pragma% ignored");
- else
- Ada_Version := Ada_83;
- Ada_Version_Explicit := Ada_83;
- Ada_Version_Pragma := N;
- end if;
+ Ada_Version := Ada_83;
+ Ada_Version_Explicit := Ada_83;
+ Ada_Version_Pragma := N;
------------
-- Ada_95 --
@@ -13829,13 +13825,9 @@ package body Sem_Prag is
-- Now set Ada 95 mode
- if Latest_Ada_Only then
- Error_Pragma ("??pragma% ignored");
- else
- Ada_Version := Ada_95;
- Ada_Version_Explicit := Ada_95;
- Ada_Version_Pragma := N;
- end if;
+ Ada_Version := Ada_95;
+ Ada_Version_Explicit := Ada_95;
+ Ada_Version_Pragma := N;
---------------------
-- Ada_05/Ada_2005 --
@@ -13893,13 +13885,9 @@ package body Sem_Prag is
-- Now set appropriate Ada mode
- if Latest_Ada_Only then
- Error_Pragma ("??pragma% ignored");
- else
- Ada_Version := Ada_2005;
- Ada_Version_Explicit := Ada_2005;
- Ada_Version_Pragma := N;
- end if;
+ Ada_Version := Ada_2005;
+ Ada_Version_Explicit := Ada_2005;
+ Ada_Version_Pragma := N;
end if;
end;
diff --git a/gcc/ada/switch-c.adb b/gcc/ada/switch-c.adb
index 840915e83a4..2ae9db7915b 100644
--- a/gcc/ada/switch-c.adb
+++ b/gcc/ada/switch-c.adb
@@ -1572,7 +1572,7 @@ package body Switch.C is
Ptr := Ptr + 1;
- if Switch_Chars (Ptr) /= '3' or else Latest_Ada_Only then
+ if Switch_Chars (Ptr) /= '3' then
Bad_Switch ("-gnat8" & Switch_Chars (Ptr .. Max));
else
Ptr := Ptr + 1;
@@ -1590,7 +1590,7 @@ package body Switch.C is
Ptr := Ptr + 1;
- if Switch_Chars (Ptr) /= '5' or else Latest_Ada_Only then
+ if Switch_Chars (Ptr) /= '5' then
Bad_Switch ("-gnat9" & Switch_Chars (Ptr .. Max));
else
Ptr := Ptr + 1;
@@ -1608,7 +1608,7 @@ package body Switch.C is
Ptr := Ptr + 1;
- if Switch_Chars (Ptr) /= '5' or else Latest_Ada_Only then
+ if Switch_Chars (Ptr) /= '5' then
Bad_Switch ("-gnat0" & Switch_Chars (Ptr .. Max));
else
Ptr := Ptr + 1;
@@ -1641,9 +1641,7 @@ package body Switch.C is
if Ptr > Max - 3 then
Bad_Switch ("-gnat" & Switch_Chars (Ptr .. Max));
- elsif Switch_Chars (Ptr .. Ptr + 3) = "2005"
- and then not Latest_Ada_Only
- then
+ elsif Switch_Chars (Ptr .. Ptr + 3) = "2005" then
Ada_Version := Ada_2005;
elsif Switch_Chars (Ptr .. Ptr + 3) = "2012" then
diff --git a/gcc/ada/usage.adb b/gcc/ada/usage.adb
index aba314cfee3..eb85723455c 100644
--- a/gcc/ada/usage.adb
+++ b/gcc/ada/usage.adb
@@ -715,23 +715,20 @@ begin
Write_Switch_Char ("zr");
Write_Line ("Distribution stub generation for receiver stubs");
- if not Latest_Ada_Only then
+ -- Line for -gnat83 switch
- -- Line for -gnat83 switch
+ Write_Switch_Char ("83");
+ Write_Line ("Ada 83 mode");
- Write_Switch_Char ("83");
- Write_Line ("Ada 83 mode");
+ -- Line for -gnat95 switch
- -- Line for -gnat95 switch
+ Write_Switch_Char ("95");
+ Write_Line ("Ada 95 mode");
- Write_Switch_Char ("95");
- Write_Line ("Ada 95 mode");
+ -- Line for -gnat2005 switch
- -- Line for -gnat2005 switch
-
- Write_Switch_Char ("2005");
- Write_Line ("Ada 2005 mode");
- end if;
+ Write_Switch_Char ("2005");
+ Write_Line ("Ada 2005 mode");
-- Line for -gnat2012 switch
--
2.53.0
