diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2009-04-24 12:25:20 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2009-04-24 12:25:20 +0200 |
| commit | c54ab0b5d10f8a81041e9403b3a3ae0d4587d499 (patch) | |
| tree | 5399178000a10bd73843e70c925dd3e5bb814955 /gcc | |
| parent | b3520ca005a1242308fa8d4c4e684f16ef6a0905 (diff) | |
| download | gcc-c54ab0b5d10f8a81041e9403b3a3ae0d4587d499.zip gcc-c54ab0b5d10f8a81041e9403b3a3ae0d4587d499.tar.gz gcc-c54ab0b5d10f8a81041e9403b3a3ae0d4587d499.tar.bz2 | |
[multiple changes]
2009-04-24 Vincent Celier <celier@adacore.com>
* opt.ads (Unchecked_Shared_Lib_Imports): New Boolean flag.
* prj-nmsc.adb (Check_Library): No error for imports by shared library
projects, when --unchecked-shared-lib-imports is used.
2009-04-24 Robert Dewar <dewar@adacore.com>
* sem_ch7.adb: Minor reformatting
From-SVN: r146693
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/ChangeLog | 11 | ||||
| -rw-r--r-- | gcc/ada/opt.ads | 6 | ||||
| -rw-r--r-- | gcc/ada/prj-nmsc.adb | 9 | ||||
| -rw-r--r-- | gcc/ada/sem_ch7.adb | 6 |
4 files changed, 26 insertions, 6 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index ce28114..ec8255b 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,14 @@ +2009-04-24 Vincent Celier <celier@adacore.com> + + * opt.ads (Unchecked_Shared_Lib_Imports): New Boolean flag. + + * prj-nmsc.adb (Check_Library): No error for imports by shared library + projects, when --unchecked-shared-lib-imports is used. + +2009-04-24 Robert Dewar <dewar@adacore.com> + + * sem_ch7.adb: Minor reformatting + 2009-04-24 Tristan Gingold <gingold@adacore.com> * s-osinte-darwin.adb, s-osinte-darwin.ads: lwp_self now returns the diff --git a/gcc/ada/opt.ads b/gcc/ada/opt.ads index 9b8cf0b..229babf 100644 --- a/gcc/ada/opt.ads +++ b/gcc/ada/opt.ads @@ -1166,6 +1166,12 @@ package Opt is -- the other hand, most such blowups will be caught cleanly and simply -- say compilation abandoned. This flag is set to True by -gnatq or -gnatQ. + Unchecked_Shared_Lib_Imports : Boolean := False; + -- GPRBUILD + -- Set to True when shared library projects are allowed to import projects + -- that are not shared library projects. Set by switch + -- --unchecked-shared-lib-imports. + Undefined_Symbols_Are_False : Boolean := False; -- GNAT, GNATPREP -- Set to True by switch -u of gnatprep or -u in the preprocessing data diff --git a/gcc/ada/prj-nmsc.adb b/gcc/ada/prj-nmsc.adb index 5098883..451c678 100644 --- a/gcc/ada/prj-nmsc.adb +++ b/gcc/ada/prj-nmsc.adb @@ -3461,7 +3461,9 @@ package body Prj.Nmsc is Continuation := Continuation_String'Access; end if; - elsif Data.Library_Kind /= Static then + elsif (not Unchecked_Shared_Lib_Imports) + and then Data.Library_Kind /= Static + then Error_Msg (Project, In_Tree, Continuation.all & @@ -3485,17 +3487,18 @@ package body Prj.Nmsc is "shared library project %% cannot extend static " & "library project %%", Data.Location); + Continuation := Continuation_String'Access; - else + elsif not Unchecked_Shared_Lib_Imports then Error_Msg (Project, In_Tree, Continuation.all & "shared library project %% cannot import static " & "library project %%", Data.Location); + Continuation := Continuation_String'Access; end if; - Continuation := Continuation_String'Access; end if; end if; end Check_Library; diff --git a/gcc/ada/sem_ch7.adb b/gcc/ada/sem_ch7.adb index 54d4a29..5cff944 100644 --- a/gcc/ada/sem_ch7.adb +++ b/gcc/ada/sem_ch7.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1992-2008, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2009, Free Software Foundation, Inc. -- -- -- -- 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- -- @@ -2146,8 +2146,8 @@ package body Sem_Ch7 is then if not Has_Private_Declaration (Etype (Id)) then - -- We assume that the user did not intend a deferred - -- constant declaration, and the expression is just missing. + -- We assume that the user did not intend a deferred constant + -- declaration, and the expression is just missing. Error_Msg_N ("constant declaration requires initialization expression", |