[multiple changes]

2013-02-06  Javier Miranda  <miranda@adacore.com>

	* sem_ch6.adb (Analyze_Subprogram_Body_Helper): Do not build the body
	of an inlined function if we do not generate code for the function.

2013-02-06  Pascal Obry  <obry@adacore.com>

	* s-os_lib.adb (Locate_Exec_On_Path): Call Normalize_Pathname
	with Resolve_Links set to False.

From-SVN: r195785

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 58b30a2..8748d8c 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,13 @@
+2013-02-06  Javier Miranda  <miranda@adacore.com>
+
+       * sem_ch6.adb (Analyze_Subprogram_Body_Helper): Do not build the body
+       of an inlined function if we do not generate code for the function.
+
+2013-02-06  Pascal Obry  <obry@adacore.com>
+
+       * s-os_lib.adb (Locate_Exec_On_Path): Call Normalize_Pathname
+       with Resolve_Links set to False.
+
 2013-02-03  Eric Botcazou  <ebotcazou@adacore.com>
 
        * gcc-interface/decl.c: Include diagnostic-core.h.

diff --git a/gcc/ada/s-os_lib.adb b/gcc/ada/s-os_lib.adb
index 100b174..fbd3813 100644 (file)
--- a/gcc/ada/s-os_lib.adb
+++ b/gcc/ada/s-os_lib.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---                     Copyright (C) 1995-2012, AdaCore                     --
+--                     Copyright (C) 1995-2013, AdaCore                     --
 --                                                                          --
 -- 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- --
@@ -1479,7 +1479,7 @@ package body System.OS_Lib is
          if not Is_Absolute_Path (Result.all) then
             declare
                Absolute_Path : constant String :=
-                                 Normalize_Pathname (Result.all);
+                 Normalize_Pathname (Result.all, Resolve_Links => False);
             begin
                Free (Result);
                Result := new String'(Absolute_Path);

diff --git a/gcc/ada/sem_ch6.adb b/gcc/ada/sem_ch6.adb
index 68eeea3..5e365db 100644 (file)
--- a/gcc/ada/sem_ch6.adb
+++ b/gcc/ada/sem_ch6.adb
@@ -2909,6 +2909,7 @@ package body Sem_Ch6 is
         and then Serious_Errors_Detected = 0
         and then Present (Spec_Id)
         and then Has_Pragma_Inline (Spec_Id)
+        and then In_Extended_Main_Code_Unit (N)
       then
          Check_And_Build_Body_To_Inline (N, Spec_Id, Body_Id);
       end if;