From 571e421a165598fd83d0c8392cbcd85f78397537 Mon Sep 17 00:00:00 2001 From: charlet Date: Fri, 26 Jun 2009 08:33:56 +0000 Subject: [PATCH] 2009-06-26 Matthew Gingell * adaint.c: Do not use the dummy version of convert_addresses on LynxOS 2009-06-26 Vincent Celier * prj.ads (No_Language_Config): Value of Dependency_Kind is None by default. 2009-06-26 Robert Dewar * exp_ch4.adb, gnatcmd.adb, make.adb: Minor reformatting git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@148963 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ada/ChangeLog | 13 +++++++++++++ gcc/ada/adaint.c | 1 + gcc/ada/exp_ch4.adb | 11 ++++++----- gcc/ada/gnatcmd.adb | 2 +- gcc/ada/make.adb | 6 +++--- gcc/ada/prj.ads | 2 +- 6 files changed, 25 insertions(+), 10 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 33de551..5e09f44 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,16 @@ +2009-06-26 Matthew Gingell + + * adaint.c: Do not use the dummy version of convert_addresses on LynxOS + +2009-06-26 Vincent Celier + + * prj.ads (No_Language_Config): Value of Dependency_Kind is None by + default. + +2009-06-26 Robert Dewar + + * exp_ch4.adb, gnatcmd.adb, make.adb: Minor reformatting + 2009-06-26 Eric Botcazou * gcc-interface/decl.c (gnat_to_gnu_entity) : Pass diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c index 59d615b..56e6477 100644 --- a/gcc/ada/adaint.c +++ b/gcc/ada/adaint.c @@ -3312,6 +3312,7 @@ _flush_cache() && ! (defined (linux) && defined (__ia64__)) \ && ! (defined (linux) && defined (powerpc)) \ && ! defined (__FreeBSD__) \ + && ! defined (__Lynx__) \ && ! defined (__hpux__) \ && ! defined (__APPLE__) \ && ! defined (_AIX) \ diff --git a/gcc/ada/exp_ch4.adb b/gcc/ada/exp_ch4.adb index a4a6bc3..66e9ed6 100644 --- a/gcc/ada/exp_ch4.adb +++ b/gcc/ada/exp_ch4.adb @@ -599,27 +599,28 @@ package body Exp_Ch4 is Apply_Accessibility_Check (Temp); - -- Locate the enclosing list to insert the C++ constructor call + -- Locate the enclosing list and insert the C++ constructor call declare - P : Node_Id := Parent (Node); + P : Node_Id; begin + P := Parent (Node); while not Is_List_Member (P) loop P := Parent (P); end loop; Insert_List_After_And_Analyze (P, Build_Initialization_Call (Loc, - Id_Ref => Make_Explicit_Dereference (Loc, - New_Reference_To (Temp, Loc)), + Id_Ref => + Make_Explicit_Dereference (Loc, + Prefix => New_Reference_To (Temp, Loc)), Typ => Root_Type (Etype (Exp)), Constructor_Ref => Exp)); end; Rewrite (N, New_Reference_To (Temp, Loc)); Analyze_And_Resolve (N, PtrT); - return; end if; diff --git a/gcc/ada/gnatcmd.adb b/gcc/ada/gnatcmd.adb index 86f534d..68ed4c7 100644 --- a/gcc/ada/gnatcmd.adb +++ b/gcc/ada/gnatcmd.adb @@ -2122,7 +2122,7 @@ begin Dir_Index : Integer := 0; Last : constant Integer := Last_Switches.Last; Lang : constant Language_Ptr := - Get_Language_From_Name (Project, "ada"); + Get_Language_From_Name (Project, "ada"); begin for Index in 1 .. Last loop diff --git a/gcc/ada/make.adb b/gcc/ada/make.adb index 8d7e6de..5c689bd 100644 --- a/gcc/ada/make.adb +++ b/gcc/ada/make.adb @@ -8164,13 +8164,13 @@ package body Make is and then Lang /= null then declare - Naming : Lang_Naming_Data renames Lang.Config.Naming_Data; + Naming : Lang_Naming_Data renames Lang.Config.Naming_Data; Name : String (1 .. Source_File_Name'Length + 3); Last : Positive := Source_File_Name'Length; Spec_Suffix : constant String := - Get_Name_String (Naming.Spec_Suffix); + Get_Name_String (Naming.Spec_Suffix); Body_Suffix : constant String := - Get_Name_String (Naming.Body_Suffix); + Get_Name_String (Naming.Body_Suffix); Truncated : Boolean := False; begin diff --git a/gcc/ada/prj.ads b/gcc/ada/prj.ads index 2228025..ad2a485 100644 --- a/gcc/ada/prj.ads +++ b/gcc/ada/prj.ads @@ -587,7 +587,7 @@ package Prj is Mapping_Spec_Suffix => No_File, Mapping_Body_Suffix => No_File, Config_File_Switches => No_Name_List, - Dependency_Kind => Makefile, + Dependency_Kind => None, Dependency_Option => No_Name_List, Compute_Dependency => No_Name_List, Include_Option => No_Name_List, -- 2.7.4