Also move -P switch description to the top of the switches list.
Tested on x86_64-pc-linux-gnu, committed on trunk
gcc/ada/
* makeusg.adb,
doc/gnat_ugn/building_executable_programs_with_gnat.rst: Move -P
to the top of switches list and make it clear that gnatmake
passes the ball to gprbuild if -P is set.
* gnat_ugn.texi: Regenerate.
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
@@ -139,6 +139,17 @@ You may specify any of the following switches to ``gnatmake``:
all other options.
+.. index:: -P (gnatmake)
+
+:switch:`-P{project}`
+ Build GNAT project file ``project`` using GPRbuild. When this switch is
+ present, all other command-line switches are treated as GPRbuild switches
+ and not ``gnatmake`` switches.
+
+.. -- Comment:
+ :ref:`gnatmake_and_Project_Files`.
+
+
.. index:: --GCC=compiler_name (gnatmake)
:switch:`--GCC={compiler_name}`
@@ -522,15 +533,6 @@ You may specify any of the following switches to ``gnatmake``:
:switch:`-p`
Same as :switch:`--create-missing-dirs`
-.. index:: -P (gnatmake)
-
-:switch:`-P{project}`
- Use project file ``project``. Only one such switch can be used.
-
-.. -- Comment:
- :ref:`gnatmake_and_Project_Files`.
-
-
.. index:: -q (gnatmake)
:switch:`-q`
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
@@ -21,7 +21,7 @@
@copying
@quotation
-GNAT User's Guide for Native Platforms , Jun 24, 2022
+GNAT User's Guide for Native Platforms , Jul 11, 2022
AdaCore
@@ -7120,6 +7120,21 @@ If @code{--version} was not used, display usage, then exit disregarding
all other options.
@end table
+@geindex -P (gnatmake)
+
+
+@table @asis
+
+@item @code{-P@emph{project}}
+
+Build GNAT project file @code{project} using GPRbuild. When this switch is
+present, all other command-line switches are treated as GPRbuild switches
+and not @code{gnatmake} switches.
+@end table
+
+@c -- Comment:
+@c :ref:`gnatmake_and_Project_Files`.
+
@geindex --GCC=compiler_name (gnatmake)
@@ -7620,19 +7635,6 @@ This switch cannot be used when invoking @code{gnatmake} with several
Same as @code{--create-missing-dirs}
@end table
-@geindex -P (gnatmake)
-
-
-@table @asis
-
-@item @code{-P@emph{project}}
-
-Use project file @code{project}. Only one such switch can be used.
-@end table
-
-@c -- Comment:
-@c :ref:`gnatmake_and_Project_Files`.
-
@geindex -q (gnatmake)
diff --git a/gcc/ada/makeusg.adb b/gcc/ada/makeusg.adb
--- a/gcc/ada/makeusg.adb
+++ b/gcc/ada/makeusg.adb
@@ -54,6 +54,13 @@ begin
Display_Usage_Version_And_Help;
+ -- Line for -P
+
+ Write_Str (" -Pproj Build GNAT Project File proj using GPRbuild");
+ Write_Eol;
+ Write_Str (" Treats all other switches as GPRbuild switches");
+ Write_Eol;
+
-- Line for -a
Write_Str (" -a Consider all files, even readonly ali files");
@@ -169,11 +176,6 @@ begin
Write_Str (" -p Create missing obj, lib and exec dirs");
Write_Eol;
- -- Line for -P
-
- Write_Str (" -Pproj Use GNAT Project File proj");
- Write_Eol;
-
-- Line for -q
Write_Str (" -q Be quiet/terse");