aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorArnaud Charlet <charlet@gcc.gnu.org>2013-02-06 10:56:47 +0100
committerArnaud Charlet <charlet@gcc.gnu.org>2013-02-06 10:56:47 +0100
commit2ae395d6c2478de339b17ffffdb83144e6518ea9 (patch)
treee63d408117b1c9ea1d8d6715c50016d53a86628d /gcc
parent0f33baa989f17b16f68834c53ad6f3dc0f65ff04 (diff)
downloadgcc-2ae395d6c2478de339b17ffffdb83144e6518ea9.zip
gcc-2ae395d6c2478de339b17ffffdb83144e6518ea9.tar.gz
gcc-2ae395d6c2478de339b17ffffdb83144e6518ea9.tar.bz2
[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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ada/ChangeLog10
-rw-r--r--gcc/ada/s-os_lib.adb4
-rw-r--r--gcc/ada/sem_ch6.adb1
3 files changed, 13 insertions, 2 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 58b30a2..8748d8c 100644
--- 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
--- 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
--- 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;