2010-06-22 Arnaud Charlet <charlet@adacore.com>

	* s-osinte-vxworks.ads: Fix casing.
	* s-vxwext-kernel.ads, s-vxwext-rtp.ads: Complete previous
	change: Interfaces.C does not provide a long_long type.

2010-06-22  Emmanuel Briot  <briot@adacore.com>

	* gnat_ugn.texi, projects.texi: Preprocess projects.texi for VMS and
	native user's guide, since this document contains the two versions.
	* gcc-interface/Make-lang.in: Update doc dependencies.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@161152 138bc75d-0d04-0410-961f-82ee72b054a4

7 files changed, 29 insertions, 14 deletions

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 9c56195442b..df841e214ba 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,15 @@
+2010-06-22  Arnaud Charlet  <charlet@adacore.com>
+
+	* s-osinte-vxworks.ads: Fix casing.
+	* s-vxwext-kernel.ads, s-vxwext-rtp.ads: Complete previous
+	change: Interfaces.C does not provide a long_long type.
+
+2010-06-22  Emmanuel Briot  <briot@adacore.com>
+
+	* gnat_ugn.texi, projects.texi: Preprocess projects.texi for VMS and
+	native user's guide, since this document contains the two versions.
+	* gcc-interface/Make-lang.in: Update doc dependencies.
+
 2010-06-22  Robert Dewar  <dewar@adacore.com>
 
 	* sem_ch3.adb: Minor reformatting.  Minor code reorganization.
diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in
index 1ec04abc8b2..33e192e6bea 100644
--- a/gcc/ada/gcc-interface/Make-lang.in
+++ b/gcc/ada/gcc-interface/Make-lang.in
@@ -564,15 +564,19 @@ ada/doctools/xgnatugn$(build_exeext): ada/xgnatugn.adb
 	$(CP) $^ ada/doctools
 	cd ada/doctools && $(GNATMAKE) -q xgnatugn
 
-# Note that doc/gnat_ugn.texi does not depend on xgnatugn
-# being built so we can distribute a pregenerated doc/gnat_ugn.info
+# Note that doc/gnat_ugn.texi and doc/projects.texi do not depend on
+# xgnatugn being built so we can distribute a pregenerated doc/gnat_ugn.info
 
 doc/gnat_ugn.texi: $(srcdir)/ada/gnat_ugn.texi $(srcdir)/ada/ug_words \
-   $(gcc_docdir)/include/gcc-common.texi gcc-vers.texi
-	$(MAKE) ada/doctools/xgnatugn$(build_exeext)
+   doc/projects.texi $(gcc_docdir)/include/gcc-common.texi gcc-vers.texi
 	ada/doctools/xgnatugn unw $(srcdir)/ada/gnat_ugn.texi \
 	   $(srcdir)/ada/ug_words doc/gnat_ugn.texi
 
+doc/projects.texi: $(srcdir)/ada/projects.texi
+	$(MAKE) ada/doctools/xgnatugn$(build_exeext)
+	ada/doctools/xgnatugn unw $(srcdir)/ada/projects.texi \
+	   $(srcdir)/ada/ug_words doc/projects.texi
+
 doc/gnat_ugn.info: doc/gnat_ugn.texi			\
    $(gcc_docdir)/include/fdl.texi $(gcc_docdir)/include/gcc-common.texi	\
    gcc-vers.texi
diff --git a/gcc/ada/gnat_ugn.texi b/gcc/ada/gnat_ugn.texi
index 5a6a9033413..562658753d9 100644
--- a/gcc/ada/gnat_ugn.texi
+++ b/gcc/ada/gnat_ugn.texi
@@ -9445,7 +9445,7 @@ directories.
 @item ^-P^/PROJECT_FILE=^@var{project}
 @cindex @option{^-P^/PROJECT_FILE^} (@command{gnatmake})
 Use project file @var{project}. Only one such switch can be used.
-@xref{^gnatmake^gnatmake^ and Project Files}.
+@xref{gnatmake and Project Files}.
 
 @item ^-q^/QUIET^
 @cindex @option{^-q^/QUIET^} (@command{gnatmake})
@@ -9497,7 +9497,7 @@ Verbosity level High. Equivalent to ^-v^/REASONS^.
 
 @item ^-vP^/MESSAGES_PROJECT_FILE=^@emph{x}
 Indicate the verbosity of the parsing of GNAT project files.
-@xref{^Switches^Switches^ Related to Project Files}.
+@xref{Switches Related to Project Files}.
 
 @item ^-x^/NON_PROJECT_UNIT_COMPILATION^
 @cindex @option{^-x^/NON_PROJECT_UNIT_COMPILATION^} (@command{gnatmake})
@@ -9514,7 +9514,7 @@ command line need to be sources of a project file.
 Indicate that external variable @var{name} has the value @var{value}.
 The Project Manager will use this value for occurrences of
 @code{external(name)} when parsing the project file.
-@xref{^Switches^Switches^ Related to Project Files}.
+@xref{Switches Related to Project Files}.
 
 @item ^-z^/NOMAIN^
 @cindex @option{^-z^/NOMAIN^} (@command{gnatmake})
@@ -11781,7 +11781,6 @@ are used in this example.
 @cindex \TXT\
 @end macro
 
-
 @include projects.texi
 
 @c *****************************************
@@ -15385,14 +15384,14 @@ Verbose mode.
 @item ^-vP^/MESSAGES_PROJECT_FILE=^@emph{x}
 @cindex @option{^-vP^/MESSAGES_PROJECT_FILE^} (@code{gnatclean})
 Indicates the verbosity of the parsing of GNAT project files.
-@xref{^Switches^Switches^ Related to Project Files}.
+@xref{Switches Related to Project Files}.
 
 @item ^-X^/EXTERNAL_REFERENCE=^@var{name=value}
 @cindex @option{^-X^/EXTERNAL_REFERENCE^} (@code{gnatclean})
 Indicates that external variable @var{name} has the value @var{value}.
 The Project Manager will use this value for occurrences of
 @code{external(name)} when parsing the project file.
-@xref{^Switches^Switches^ Related to Project Files}.
+@xref{Switches Related to Project Files}.
 
 @item ^-aO^/OBJECT_SEARCH=^@var{dir}
 @cindex @option{^-aO^/OBJECT_SEARCH^} (@code{gnatclean})
diff --git a/gcc/ada/projects.texi b/gcc/ada/projects.texi
index 2624e75ff68..3d11bf3f9cb 100644
--- a/gcc/ada/projects.texi
+++ b/gcc/ada/projects.texi
@@ -1077,7 +1077,7 @@ project files rather than packages.
 Each literal string after @code{with} is the path
 (absolute or relative) to a project file. The @code{.gpr} extension is
 optional, although we recommend adding it. If no extension is specified,
-and no project file with the @file{^.gpr^.GPR} extension is found, then
+and no project file with the @file{^.gpr^.GPR^} extension is found, then
 the file is searched for exactly as written in the @code{with} clause,
 that is with no extension.
 
diff --git a/gcc/ada/s-osinte-vxworks.ads b/gcc/ada/s-osinte-vxworks.ads
index 46a68b63bea..146bc9a4934 100644
--- a/gcc/ada/s-osinte-vxworks.ads
+++ b/gcc/ada/s-osinte-vxworks.ads
@@ -155,7 +155,7 @@ package System.OS_Interface is
    SIG_DFL : constant := 0;
    SIG_IGN : constant := 1;
 
-   subtype sigset_t is System.Vxworks.Ext.sigset_t;
+   subtype sigset_t is System.VxWorks.Ext.sigset_t;
 
    type struct_sigaction is record
       sa_handler : System.Address;
diff --git a/gcc/ada/s-vxwext-kernel.ads b/gcc/ada/s-vxwext-kernel.ads
index b29322860fd..0df9211a68f 100644
--- a/gcc/ada/s-vxwext-kernel.ads
+++ b/gcc/ada/s-vxwext-kernel.ads
@@ -39,7 +39,7 @@ package System.VxWorks.Ext is
    subtype SEM_ID is Long_Integer;
    --  typedef struct semaphore *SEM_ID;
 
-   type sigset_t is mod 2 ** Interfaces.C.long_long'Size;
+   type sigset_t is mod 2 ** Long_Long_Integer'Size;
 
    type t_id is new Long_Integer;
    subtype int is Interfaces.C.int;
diff --git a/gcc/ada/s-vxwext-rtp.ads b/gcc/ada/s-vxwext-rtp.ads
index 2b9b61e2014..844d39415db 100644
--- a/gcc/ada/s-vxwext-rtp.ads
+++ b/gcc/ada/s-vxwext-rtp.ads
@@ -39,7 +39,7 @@ package System.VxWorks.Ext is
    subtype SEM_ID is Long_Integer;
    --  typedef struct semaphore *SEM_ID;
 
-   type sigset_t is mod 2 ** Interfaces.C.long_long'Size;
+   type sigset_t is mod 2 ** Long_Long_Integer'Size;
 
    type t_id is new Long_Integer;
    subtype int is Interfaces.C.int;