* osint.adb(Create_Debug_File): When an object file is specified,

	put the .dg file in the same directory as the object file.

	* osint.adb: Minor reformatting

	* lib-xref.adb (Output_Instantiation): New procedure to generate
	instantiation references.

	* lib-xref.ads: Add documentation of handling of generic references.

	* ali.adb (Read_Instantiation_Ref): New procedure to read
	instantiation references

	* ali.ads: Add spec for storing instantiation references

	* bindusg.adb: Minor reformatting

	* switch.adb: Add entry for Latin-5 (Cyrillic ISO-8859-5)

	* usage.adb: Add entry for Latin-5 (Cyrillic ISO-8859-5)

	* gnatcmd.adb: Add entry for Latin-5 (Cyrillic ISO-8859-5)

	* csets.adb: Add entry for Latin-5 (Cyrillic ISO-8859-5)

	* csets.ads:
	Fix header format
	Add 2001 to copyright date
	Add entry for Latin-5 (Cyrillic ISO-8859-5)

	* adaint.c: mktemp is a macro on Lynx and can not be used as an
	expression.

	* misc.c (gnat_expand_constant): Do not strip UNCHECKED_CONVERT_EXPR
	if operand is CONSTRUCTOR.

	* trans.c (tree_transform, case N_Assignment_Statement): Set lineno
	before emiting check on right-hand side, so that exception information
	is correct.

	* utils.c (create_var_decl): Throw away initializing expression
	if just annotating types and non-constant.

	* prj-nmsc.adb: (Ada_Check): Migrate drom Ada_Default_... to
	Default_Ada_...

	* prj.adb: (Ada_Default_Spec_Suffix, Ada_Default_Impl_Suffix):
	Remove functions.
	(Default_Ada_Spec_Suffix, Default_Ada_Impl_Suffix): Move to spec.

	* prj.ads: (Ada_Default_Spec_Suffix, Ada_Default_Impl_Suffix):
	Remove functions.
	(Default_Ada_Spec_Suffix, Default_Ada_Impl_Suffix): Move from body.


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

1 files changed, 26 insertions, 0 deletions

diff --git a/gcc/ada/osint.adb b/gcc/ada/osint.adb
index f871a1972b2..ba527b41b02 100644
--- a/gcc/ada/osint.adb
+++ b/gcc/ada/osint.adb
@@ -725,12 +725,38 @@ package body Osint is
 
    begin
       Get_Name_String (Src);
+
       if Hostparm.OpenVMS then
          Name_Buffer (Name_Len + 1 .. Name_Len + 3) := "_dg";
       else
          Name_Buffer (Name_Len + 1 .. Name_Len + 3) := ".dg";
       end if;
+
       Name_Len := Name_Len + 3;
+
+      if Output_Object_File_Name /= null then
+
+         for Index in reverse Output_Object_File_Name'Range loop
+
+            if Output_Object_File_Name (Index) = Directory_Separator then
+               declare
+                  File_Name : constant String := Name_Buffer (1 .. Name_Len);
+
+               begin
+                  Name_Len := Index - Output_Object_File_Name'First + 1;
+                  Name_Buffer (1 .. Name_Len) :=
+                    Output_Object_File_Name
+                      (Output_Object_File_Name'First .. Index);
+                  Name_Buffer (Name_Len + 1 .. Name_Len + File_Name'Length) :=
+                    File_Name;
+                  Name_Len := Name_Len + File_Name'Length;
+               end;
+
+               exit;
+            end if;
+         end loop;
+      end if;
+
       Result := Name_Find;
       Name_Buffer (Name_Len + 1) := ASCII.NUL;
       Create_File_And_Check (Output_FD, Text);