diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-12-21 13:34:12 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-12-21 13:34:12 +0000 |
| commit | 43d776b71dcb933b20ed206ef954bc0016244eaf (patch) | |
| tree | 9b067a696bc14ff72b59521b21f2088104a146e4 /gcc/ada/prj-nmsc.adb | |
| parent | 0ffbb1b6f91319290d8ccdc9519f669a9d7d608a (diff) | |
| download | gcc-43d776b71dcb933b20ed206ef954bc0016244eaf.tar.gz | |
2011-12-21 Arnaud Charlet <charlet@adacore.com>
* gnat1drv.adb (Gnat1Drv): Always delete old scil files in
CodePeer mode.
2011-12-21 Robert Dewar <dewar@adacore.com>
* comperr.adb: Minor reformatting.
2011-12-21 Ed Schonberg <schonberg@adacore.com>
* aspects.ads: New table Base_Aspect, to indicate that an aspect
is defined on a base type.
* aspects.adb (Find_Aspect): If the aspect is a Base_Aspect,
examine the representation items of the base type.
2011-12-21 Pascal Obry <obry@adacore.com>
* gnat_ugn.texi, prj.ads, prj-nmsc.adb, prj-attr.adb, projects.texi,
snames.ads-tmpl: Use Encapsulated instead of Fully Standalone library.
2011-12-21 Pascal Obry <obry@adacore.com>
* adaint.c (__gnat_is_executable_file_attr) [_WIN32]: Add parentheses
to kill warning.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@182582 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/prj-nmsc.adb')
| -rw-r--r-- | gcc/ada/prj-nmsc.adb | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/gcc/ada/prj-nmsc.adb b/gcc/ada/prj-nmsc.adb index b018026d946..3e86850ff0f 100644 --- a/gcc/ada/prj-nmsc.adb +++ b/gcc/ada/prj-nmsc.adb @@ -2220,12 +2220,12 @@ package body Prj.Nmsc is end; elsif - Attribute.Name = Name_Library_Fully_Standalone_Supported + Attribute.Name = Name_Library_Encapsulated_Supported then declare pragma Unsuppress (All_Checks); begin - Project.Config.Lib_Fully_Standalone_Supported := + Project.Config.Lib_Encapsulated_Supported := Boolean'Value (Get_Name_String (Attribute.Value.Value)); exception when Constraint_Error => @@ -2233,7 +2233,7 @@ package body Prj.Nmsc is (Data.Flags, "invalid value """ & Get_Name_String (Attribute.Value.Value) - & """ for Library_Fully_Standalone_Supported", + & """ for Library_Encapsulated_Supported", Attribute.Value.Location, Project); end; @@ -2955,11 +2955,10 @@ package body Prj.Nmsc is elsif Project.Library_Kind /= Static and then not Lib_Standalone.Default - and then Get_Name_String (Lib_Standalone.Value) = "full" + and then Get_Name_String (Lib_Standalone.Value) = "encapsulated" and then Proj.Library_Kind /= Static then - -- A fully standalone library must depend only on static - -- libraries. + -- An encapsulated library must depend only on static libraries Error_Msg_Name_1 := Project.Name; Error_Msg_Name_2 := Proj.Name; @@ -2967,16 +2966,17 @@ package body Prj.Nmsc is Error_Msg (Data.Flags, Continuation.all & - "standalone library project %% cannot import shared " & + "encapsulated library project %% cannot import shared " & "library project %%", Project.Location, Project); Continuation := Continuation_String'Access; elsif Project.Library_Kind /= Static and then Proj.Library_Kind = Static - and then (Lib_Standalone.Default - or else - Get_Name_String (Lib_Standalone.Value) /= "full") + and then + (Lib_Standalone.Default + or else + Get_Name_String (Lib_Standalone.Value) /= "encapsulated") then Error_Msg_Name_1 := Project.Name; Error_Msg_Name_2 := Proj.Name; @@ -4532,8 +4532,8 @@ package body Prj.Nmsc is if Name_Buffer (1 .. Name_Len) = "standard" then Project.Standalone_Library := Standard; - elsif Name_Buffer (1 .. Name_Len) = "full" then - Project.Standalone_Library := Full; + elsif Name_Buffer (1 .. Name_Len) = "encapsulated" then + Project.Standalone_Library := Encapsulated; elsif Name_Buffer (1 .. Name_Len) = "no" then Project.Standalone_Library := No; |