From: "Marc Poulhiès" <poulhies@adacore.com>
To: gcc-patches@gcc.gnu.org
Cc: Arnaud Charlet <charlet@adacore.com>
Subject: [Ada] New gnatbind switch -k
Date: Mon, 5 Sep 2022 09:25:55 +0200 [thread overview]
Message-ID: <20220905072555.GA1174563@poulhies-Precision-5550> (raw)
[-- Attachment #1: Type: text/plain, Size: 484 bytes --]
This switch can be used to disable the effect of -F when using -n
explicitly or implicitly.
Tested on x86_64-pc-linux-gnu, committed on trunk
gcc/ada/
* bindgen.adb (Gen_Elab_Calls): Check for Check_Elaboration_Flags.
* bindusg.adb (Display): Add -k.
* opt.ads (Check_Elaboration_Flags): New.
* switch-b.adb (Scan_Binder_Switches): Add processing of -k.
* doc/gnat_ugn/building_executable_programs_with_gnat.rst: Add
documentation for -k and -K.
* gnat_ugn.texi: Regenerate.
[-- Attachment #2: patch.diff --]
[-- Type: text/x-diff, Size: 3836 bytes --]
diff --git a/gcc/ada/bindgen.adb b/gcc/ada/bindgen.adb
--- a/gcc/ada/bindgen.adb
+++ b/gcc/ada/bindgen.adb
@@ -1544,6 +1544,7 @@ package body Bindgen is
Check_Elab_Flag :=
Units.Table (Unum_Spec).Set_Elab_Entity
+ and then Check_Elaboration_Flags
and then not CodePeer_Mode
and then (Force_Checking_Of_Elaboration_Flags
or Interface_Library_Unit
diff --git a/gcc/ada/bindusg.adb b/gcc/ada/bindusg.adb
--- a/gcc/ada/bindusg.adb
+++ b/gcc/ada/bindusg.adb
@@ -156,6 +156,11 @@ package body Bindusg is
(" -I- Don't look for sources & library files in default "
& "directory");
+ -- Line for -k switch
+
+ Write_Line
+ (" -k Disable checking of elaboration flags");
+
-- Line for -K switch
Write_Line
diff --git a/gcc/ada/doc/gnat_ugn/building_executable_programs_with_gnat.rst b/gcc/ada/doc/gnat_ugn/building_executable_programs_with_gnat.rst
--- a/gcc/ada/doc/gnat_ugn/building_executable_programs_with_gnat.rst
+++ b/gcc/ada/doc/gnat_ugn/building_executable_programs_with_gnat.rst
@@ -6534,6 +6534,22 @@ be presented in subsequent sections.
ALI file named in the ``gnatbind`` command line.
+ .. index:: -k (gnatbind)
+
+:switch:`-k`
+ Disable checking of elaboration flags. When using :switch:`-n`
+ either explicitly or implicitly, :switch:`-F` is also implied,
+ unless :switch:`-k` is used. This switch should be used with care
+ and you should ensure manually that elaboration routines are not called
+ twice unintentionally.
+
+
+ .. index:: -K (gnatbind)
+
+:switch:`-K`
+ Give list of linker options specified for link.
+
+
.. index:: -l (gnatbind)
:switch:`-l`
diff --git a/gcc/ada/gnat_ugn.texi b/gcc/ada/gnat_ugn.texi
--- a/gcc/ada/gnat_ugn.texi
+++ b/gcc/ada/gnat_ugn.texi
@@ -15724,6 +15724,22 @@ Do not look for sources in the current directory where @code{gnatbind} was
invoked, and do not look for ALI files in the directory containing the
ALI file named in the @code{gnatbind} command line.
+@geindex -k (gnatbind)
+
+@item @code{-k}
+
+Disable checking of elaboration flags. When using @code{-n}
+either explicitly or implicitly, @code{-F} is also implied,
+unless @code{-k} is used. This switch should be used with care
+and you should ensure manually that elaboration routines are not called
+twice unintentionally.
+
+@geindex -K (gnatbind)
+
+@item @code{-K}
+
+Give list of linker options specified for link.
+
@geindex -l (gnatbind)
@item @code{-l}
@@ -29292,8 +29308,8 @@ to permit their use in free software.
@printindex ge
-@anchor{cf}@w{ }
@anchor{gnat_ugn/gnat_utility_programs switches-related-to-project-files}@w{ }
+@anchor{cf}@w{ }
@c %**end of body
@bye
diff --git a/gcc/ada/opt.ads b/gcc/ada/opt.ads
--- a/gcc/ada/opt.ads
+++ b/gcc/ada/opt.ads
@@ -267,6 +267,10 @@ package Opt is
-- Set to True to detect whether subprogram parameters and function results
-- alias the same object(s).
+ Check_Elaboration_Flags : Boolean := True;
+ -- GNATBIND
+ -- Set to False if switch -k is set.
+
Check_Float_Overflow : Boolean := False;
-- GNAT
-- Set to True to check that operations on predefined unconstrained float
diff --git a/gcc/ada/switch-b.adb b/gcc/ada/switch-b.adb
--- a/gcc/ada/switch-b.adb
+++ b/gcc/ada/switch-b.adb
@@ -379,6 +379,12 @@ package body Switch.B is
Bad_Switch (Switch_Chars);
end if;
+ -- Processing for k switch
+
+ when 'k' =>
+ Ptr := Ptr + 1;
+ Check_Elaboration_Flags := False;
+
-- Processing for K switch
when 'K' =>
reply other threads:[~2022-09-05 7:25 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220905072555.GA1174563@poulhies-Precision-5550 \
--to=poulhies@adacore.com \
--cc=charlet@adacore.com \
--cc=gcc-patches@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).