Commit 49bfcf43 by Arnaud Charlet

[multiple changes]

2011-08-03  Pascal Obry  <obry@adacore.com>

	* makeutl.adb: Minor reformatting.

2011-08-03  Vincent Celier  <celier@adacore.com>

	* fname-uf.adb
	(Get_File_Name) If the file cannot be found when there are no config
	pragmas file and May_Fail is True, return No_File instead of the file
	name, to be consistent.

2011-08-03  Pascal Obry  <obry@adacore.com>

	* adaint.c (__gnat_is_executable_file_attr): Avoid access
	to null pointer.

2011-08-03  Javier Miranda  <miranda@adacore.com>

	* sem_ch13.adb
	(Same_Representation): In VM targets the representation of arrays with
	aliased components differs from arrays with non-aliased components.

From-SVN: r177251
parent 34798441
2011-08-03 Pascal Obry <obry@adacore.com>
* makeutl.adb: Minor reformatting.
2011-08-03 Vincent Celier <celier@adacore.com>
* fname-uf.adb
(Get_File_Name) If the file cannot be found when there are no config
pragmas file and May_Fail is True, return No_File instead of the file
name, to be consistent.
2011-08-03 Pascal Obry <obry@adacore.com>
* adaint.c (__gnat_is_executable_file_attr): Avoid access
to null pointer.
2011-08-03 Javier Miranda <miranda@adacore.com>
* sem_ch13.adb
(Same_Representation): In VM targets the representation of arrays with
aliased components differs from arrays with non-aliased components.
2011-08-03 Emmanuel Briot <briot@adacore.com> 2011-08-03 Emmanuel Briot <briot@adacore.com>
* prj-proc.adb, prj-attr.adb, prj-attr.ads (Get_Attribute_Index): do * prj-proc.adb, prj-attr.adb, prj-attr.ads (Get_Attribute_Index): do
......
...@@ -2149,7 +2149,8 @@ __gnat_is_executable_file_attr (char* name, struct file_attributes* attr) ...@@ -2149,7 +2149,8 @@ __gnat_is_executable_file_attr (char* name, struct file_attributes* attr)
TCHAR *l, *last = _tcsstr(wname, _T(".exe")); TCHAR *l, *last = _tcsstr(wname, _T(".exe"));
/* look for last .exe */ /* look for last .exe */
while (l = _tcsstr(last+1, _T(".exe"))) last = l; if (last)
while (l = _tcsstr(last+1, _T(".exe"))) last = l;
attr->executable = GetFileAttributes (wname) != INVALID_FILE_ATTRIBUTES attr->executable = GetFileAttributes (wname) != INVALID_FILE_ATTRIBUTES
&& last - wname == (int) (_tcslen (wname) - 4); && last - wname == (int) (_tcslen (wname) - 4);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 1992-2007, Free Software Foundation, Inc. -- -- Copyright (C) 1992-2011, Free Software Foundation, Inc. --
-- -- -- --
-- GNAT is free software; you can redistribute it and/or modify it under -- -- GNAT is free software; you can redistribute it and/or modify it under --
-- terms of the GNU General Public License as published by the Free Soft- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -469,10 +469,15 @@ package body Fname.UF is ...@@ -469,10 +469,15 @@ package body Fname.UF is
-- the default GNAT naming scheme. The file does -- the default GNAT naming scheme. The file does
-- not exist, but there is no point doing the -- not exist, but there is no point doing the
-- second search, because we will end up with the -- second search, because we will end up with the
-- same file name. Just return the file name. -- same file name. Just return the file name, or No_File
-- if May_Fail is True.
elsif SFN_Patterns.Last = 2 then elsif SFN_Patterns.Last = 2 then
return Fnam; if May_Fail then
return No_File;
else
return Fnam;
end if;
-- The file does not exist, but there may be other -- The file does not exist, but there may be other
-- naming scheme. Keep on searching. -- naming scheme. Keep on searching.
......
...@@ -23,6 +23,12 @@ ...@@ -23,6 +23,12 @@
-- -- -- --
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
with Ada.Command_Line; use Ada.Command_Line;
with GNAT.Case_Util; use GNAT.Case_Util;
with GNAT.Directory_Operations; use GNAT.Directory_Operations;
with GNAT.HTable;
with ALI; use ALI; with ALI; use ALI;
with Debug; with Debug;
with Fname; with Fname;
...@@ -36,12 +42,6 @@ with Snames; use Snames; ...@@ -36,12 +42,6 @@ with Snames; use Snames;
with Table; with Table;
with Tempdir; with Tempdir;
with Ada.Command_Line; use Ada.Command_Line;
with GNAT.Case_Util; use GNAT.Case_Util;
with GNAT.Directory_Operations; use GNAT.Directory_Operations;
with GNAT.HTable;
package body Makeutl is package body Makeutl is
type Mark_Key is record type Mark_Key is record
...@@ -687,13 +687,13 @@ package body Makeutl is ...@@ -687,13 +687,13 @@ package body Makeutl is
Value : out Variable_Value; Value : out Variable_Value;
Is_Default : out Boolean) Is_Default : out Boolean)
is is
Project : constant Project_Id := Project : constant Project_Id :=
Ultimate_Extending_Project_Of (Source_Prj); Ultimate_Extending_Project_Of (Source_Prj);
Pkg : constant Package_Id := Pkg : constant Package_Id :=
Prj.Util.Value_Of Prj.Util.Value_Of
(Name => Pkg_Name, (Name => Pkg_Name,
In_Packages => Project.Decl.Packages, In_Packages => Project.Decl.Packages,
In_Tree => Project_Tree); In_Tree => Project_Tree);
begin begin
Is_Default := False; Is_Default := False;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 1992-2010, Free Software Foundation, Inc. -- -- Copyright (C) 1992-2011, Free Software Foundation, Inc. --
-- -- -- --
-- GNAT is free software; you can redistribute it and/or modify it under -- -- GNAT is free software; you can redistribute it and/or modify it under --
-- terms of the GNU General Public License as published by the Free Soft- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -7292,7 +7292,16 @@ package body Sem_Ch13 is ...@@ -7292,7 +7292,16 @@ package body Sem_Ch13 is
and then Known_Component_Size (T2) and then Known_Component_Size (T2)
and then Component_Size (T1) = Component_Size (T2) and then Component_Size (T1) = Component_Size (T2)
then then
return True; if VM_Target = No_VM then
return True;
-- In VM targets the representation of arrays with aliased
-- components differs from arrays with non-aliased components
else
return Has_Aliased_Components (Base_Type (T1))
= Has_Aliased_Components (Base_Type (T2));
end if;
end if; end if;
end if; end if;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment