aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRomain Beguet <beguet@adacore.com>2022-04-25 15:57:25 +0200
committerPierre-Marie de Rodat <derodat@adacore.com>2022-05-30 08:29:03 +0000
commitf55e8fd165c1ed1e1c12def08ddb5f4fc55dafbb (patch)
tree8880e2cef35e0a293d8ada913a9c1020614fe40d
parentebddfe50d8bf48458db0b658b962f62548dd671f (diff)
downloadgcc-f55e8fd165c1ed1e1c12def08ddb5f4fc55dafbb.zip
gcc-f55e8fd165c1ed1e1c12def08ddb5f4fc55dafbb.tar.gz
gcc-f55e8fd165c1ed1e1c12def08ddb5f4fc55dafbb.tar.bz2
[Ada] Fix illegal Ada in s-dwalin.adb
Both the `System.Mmap` and `System.Object_Reader` packages are defining entities named `Offset` and they are both `use`d at the top of s-dwalin.adb. Therefore, the references to `Offset` throughout this file are ambiguous, and GNAT is supposed to complain. Since it does not for the moment, we fix the ambiguity by declaring a subtype `Offset` at the top of the file simply renames `System.Object_Reader.Offset`. gcc/ada/ * libgnat/s-dwalin.adb: Add a subtype declaration to fix the ambiguity.
-rw-r--r--gcc/ada/libgnat/s-dwalin.adb2
1 files changed, 2 insertions, 0 deletions
diff --git a/gcc/ada/libgnat/s-dwalin.adb b/gcc/ada/libgnat/s-dwalin.adb
index 5a0a2f6..e1e55f3 100644
--- a/gcc/ada/libgnat/s-dwalin.adb
+++ b/gcc/ada/libgnat/s-dwalin.adb
@@ -44,6 +44,8 @@ with System.Storage_Elements; use System.Storage_Elements;
package body System.Dwarf_Lines is
+ subtype Offset is Object_Reader.Offset;
+
function Get_Load_Displacement (C : Dwarf_Context) return Storage_Offset;
-- Return the displacement between the load address present in the binary
-- and the run-time address at which it is loaded (i.e. non-zero for PIE).