diff options
| -rw-r--r-- | gcc/ada/ChangeLog | 23 | ||||
| -rw-r--r-- | gcc/ada/gnat_ugn.texi | 11 | ||||
| -rw-r--r-- | gcc/ada/prj-nmsc.adb | 21 | ||||
| -rw-r--r-- | gcc/ada/system-vxworks-ppc.ads | 12 | ||||
| -rw-r--r-- | gcc/ada/uintp.adb | 2 |
5 files changed, 48 insertions, 21 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 4df535b..0d06faf 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,26 @@ +2012-07-23 Fedor Rybin <frybin@adacore.com> + + * gnat_ugn.texi: Removing obsolete limitation of gnattest + to support only ada05. Updating gnattest support for other + platforms/run-times section to reflect the usage of taget + prefix in gnattest calls. Fixing missed obsolete --stub-default + option name. + +2012-07-23 Robert Dewar <dewar@adacore.com> + + * uintp.adb: Minor reformatting. + +2012-07-23 Olivier Hainque <hainque@adacore.com> + + * system-vxworks-ppc.ads: Replace the default + Linker_Options requesting crtbe by a commented out request for + -nostartfiles. + +2012-07-23 Vincent Celier <celier@adacore.com> + + * prj-nmsc.adb (Check_Naming): Do not get the exceptions names + in a virtual project. + 2012-07-23 Robert Dewar <dewar@adacore.com> * layout.adb, sem_prag.adb, sem.ads, freeze.adb, diff --git a/gcc/ada/gnat_ugn.texi b/gcc/ada/gnat_ugn.texi index c1ea83b..a9eccf2 100644 --- a/gcc/ada/gnat_ugn.texi +++ b/gcc/ada/gnat_ugn.texi @@ -18416,7 +18416,7 @@ as passed to gnattest when generating the test driver. Passing it to the driver generated on the first example: @smallexample -test_runner --stub-default=pass +test_runner --skeleton-default=pass @end smallexample makes both tests pass, even the unimplemented one. @@ -18633,11 +18633,13 @@ such as Zero FootPrint (ZFP), a simplified harness is generated. Two variables are used to tell the underlying AUnit framework how to generate the test harness: @code{PLATFORM}, which identifies the target, and @code{RUNTIME}, used to determine the run-time library for which the harness -is generated. For example, the following options are used to generate the -AUnit test harness for a PowerPC ELF target using the ZFP run-time library: +is generated. Corresponding prefix should also be used when calling +@command{gnattest} for non-native targets. For example, the following options +are used to generate the AUnit test harness for a PowerPC ELF target using +the ZFP run-time library: @smallexample -gnattest -Psimple.gpr -XPLATFORM=powerpc-elf -XRUNTIME=zfp +powerpc-elf-gnattest -Psimple.gpr -XPLATFORM=powerpc-elf -XRUNTIME=zfp @end smallexample @node Current Limitations @@ -18650,7 +18652,6 @@ The tool currently does not support following features: @itemize @bullet @item generic tests for generic packages and package instantiations @item tests for protected subprograms and entries -@item generating test packages for code that is not conformant with ada 2005 @end itemize diff --git a/gcc/ada/prj-nmsc.adb b/gcc/ada/prj-nmsc.adb index facf9f9..77d1cfd 100644 --- a/gcc/ada/prj-nmsc.adb +++ b/gcc/ada/prj-nmsc.adb @@ -4209,22 +4209,25 @@ package body Prj.Nmsc is Lang_Id := Lang_Id.Next; end loop; - -- Get the naming exceptions for all languages - - for Kind in Spec_Or_Body loop - Lang_Id := Project.Languages; - while Lang_Id /= No_Language_Index loop - case Lang_Id.Config.Kind is + -- Get the naming exceptions for all languages, but not for virtual + -- projects. + + if not Project.Virtual then + for Kind in Spec_Or_Body loop + Lang_Id := Project.Languages; + while Lang_Id /= No_Language_Index loop + case Lang_Id.Config.Kind is when File_Based => Process_Exceptions_File_Based (Lang_Id, Kind); when Unit_Based => Process_Exceptions_Unit_Based (Lang_Id, Kind); - end case; + end case; - Lang_Id := Lang_Id.Next; + Lang_Id := Lang_Id.Next; + end loop; end loop; - end loop; + end if; end Check_Naming; ---------------------------- diff --git a/gcc/ada/system-vxworks-ppc.ads b/gcc/ada/system-vxworks-ppc.ads index 8ccc9b8..62d604f 100644 --- a/gcc/ada/system-vxworks-ppc.ads +++ b/gcc/ada/system-vxworks-ppc.ads @@ -115,14 +115,14 @@ package System is private - -- Note: we are moving to a scheme where we more closely rely on the - -- VxWorks mechanisms to register exception tables. This change requests - -- it by default (-auto-register) and removes the incomplete circuitry - -- that was taking care of the registration as part of the Ada RTS - -- initialization. + -- Note: we now more closely rely on the VxWorks mechanisms to register + -- exception tables for ZCX support in kernel mode, thanks to crt objects + -- featuring dedicated constructors triggered by linker options below. + + -- Commenting the pragma for the sjlj runtimes is performed automatically + -- by our Makefiles, so this line needs to be manipulated with care. pragma Linker_Options ("-crtbe" & ASCII.NUL & "-auto-register"); - -- Required by ZCX on VxWorks kernel type Address is mod Memory_Size; Null_Address : constant Address := 0; diff --git a/gcc/ada/uintp.adb b/gcc/ada/uintp.adb index ca71279..ce7436f 100644 --- a/gcc/ada/uintp.adb +++ b/gcc/ada/uintp.adb @@ -1188,7 +1188,7 @@ package body Uintp is if D > Int_1 then - -- Multiply Dividend by D + -- Multiply Dividend by d Carry := 0; for J in reverse Dividend'Range loop |