From: Piotr Trojanek <troja...@adacore.com>
The C version of SCOs unit provided a gigi interface to source code obligations
that at some point were generated by the frontend. This functionality has been
deconstructed long ago.
gcc/ada/ChangeLog:
* libgnat/g-dyntab.ads (Instance): Update and extend comment.
* scos.ads: Remove comment about the corresponding C header.
* scos.h: Remove.
Tested on x86_64-pc-linux-gnu, committed on master.
---
gcc/ada/libgnat/g-dyntab.ads | 5 +-
gcc/ada/scos.ads | 3 --
gcc/ada/scos.h | 89 ------------------------------------
3 files changed, 3 insertions(+), 94 deletions(-)
delete mode 100644 gcc/ada/scos.h
diff --git a/gcc/ada/libgnat/g-dyntab.ads b/gcc/ada/libgnat/g-dyntab.ads
index 7e2e3b22be4..78109867ec2 100644
--- a/gcc/ada/libgnat/g-dyntab.ads
+++ b/gcc/ada/libgnat/g-dyntab.ads
@@ -168,8 +168,9 @@ package GNAT.Dynamic_Tables is
--
-- Tab : Table_Type renames X.Table (First .. X.Last);
--
- -- Note: The Table component must come first. See declarations of
- -- SCO_Unit_Table and SCO_Table in scos.h.
+ -- Note: The Table component must come first to simplify interfacing
+ -- with C, similar to how we do it for the Table unit; see declarations
+ -- of Names_Ptr and Names_Char_Ptr in namet.h.
Locked : Boolean := False;
-- Table reallocation is permitted only if this is False. A client may
diff --git a/gcc/ada/scos.ads b/gcc/ada/scos.ads
index a2ade8a0907..b5f39c9632e 100644
--- a/gcc/ada/scos.ads
+++ b/gcc/ada/scos.ads
@@ -28,9 +28,6 @@
-- the ALI file, and by Get_SCO/Put_SCO to read and write the text form that
-- is used in the ALI file.
--- WARNING: There is a C version of this package. Any changes to this
--- source file must be properly reflected in the C header file scos.h
-
with Namet; use Namet;
with Table;
with Types; use Types;
diff --git a/gcc/ada/scos.h b/gcc/ada/scos.h
deleted file mode 100644
index 3d800bf12b1..00000000000
--- a/gcc/ada/scos.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/****************************************************************************
- * *
- * GNAT COMPILER COMPONENTS *
- * *
- * S C O S *
- * *
- * C Header File *
- * *
- * Copyright (C) 2014-2025, Free Software Foundation, Inc. *
- * *
- * GNAT is free software; you can redistribute it and/or modify it under *
- * terms of the GNU General Public License as published by the Free Soft- *
- * ware Foundation; either version 3, or (at your option) any later ver- *
- * sion. GNAT is distributed in the hope that it will be useful, but WITH- *
- * OUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY *
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License *
- * for more details. You should have received a copy of the GNU General *
- * Public License distributed with GNAT; see file COPYING3. If not, go to *
- * http://www.gnu.org/licenses for a complete copy of the license. *
- * *
- * GNAT was originally developed by the GNAT team at New York University. *
- * Extensive contributions were provided by Ada Core Technologies Inc. *
- * *
- ****************************************************************************/
-
-/* This is the C header that corresponds to the Ada package specification for
- Scos. It was created manually from scos.ads and must be kept synchronized
- with changes in this file. */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Unit table: */
-
-typedef Int SCO_Unit_Index;
-
-struct SCO_Unit_Table_Entry
- {
- String_Pointer File_Name;
- Int File_Index;
- Nat Dep_Num;
- Nat From, To;
- };
-
-typedef struct SCO_Unit_Table_Entry *SCO_Unit_Table_Type;
-
-extern SCO_Unit_Table_Type scos__sco_unit_table__table;
-#define SCO_Unit_Table scos__sco_unit_table__table
-
-extern Int scos__sco_unit_table__min;
-#define SCO_Unit_Table_Min scos__sco_unit_table__min
-
-extern Int scos__sco_unit_table__last_val;
-#define SCO_Unit_Table_Last_Val scos__sco_unit_table__last_val
-
-
-/* SCOs table: */
-
-struct Source_Location
- {
- Line_Number_Type Line;
- Column_Number_Type Col;
- };
-
-struct SCO_Table_Entry
- {
- struct Source_Location From, To;
- char C1, C2;
- bool Last;
- Source_Ptr Pragma_Sloc;
- Name_Id Pragma_Aspect_Name;
- };
-
-typedef struct SCO_Table_Entry *SCO_Table_Type;
-
-extern SCO_Table_Type scos__sco_table__table;
-#define SCO_Table scos__sco_table__table
-
-extern Int scos__sco_table__min;
-#define SCO_Table_Min scos__sco_table__min
-
-extern Int scos__sco_table__last_val;
-#define SCO_Table_Last_Val scos__sco_table__last_val
-
-#ifdef __cplusplus
-}
-#endif
--
2.43.0
