Preparation for distribution, GCC 6 compatibility.

  * README: converted to Markdown format.
  * common/Makefile.dist (RTS_DISTRIBUTION_FILES): added adaint.c,
      *-gcc6 files.
  * common/adaint.c: new (__gl_main_priority couldn't be exported from
      environment_task.adb, because it has to be initialized which
      happens after adainit has set the new value, if any).
  * common/environment_task.adb (Main_Priority): imported, and moved
      into Create.
  * common/environment_task.adb-gcc6: copied from the gcc6-fixes
      branch, with Main_Priority set as above.
  * common/s-tarest.adb-gcc6: copied from the gcc6-fixes
      branch.
  * common/s-tarest.ads-gcc6: likewise.
  * arduino-due/Makefile.dist: don't build the RTS.
  * stm32f4/Makefile.dist: likewise.
  * stm32f429i/Makefile.dist: likewise.

Author: simonjwright

README

@@ -1,18 +1,18 @@
-This package includes GNAT Ada Run Time Systems (RTSs) based
-on FreeRTOS (http://www.freertos.org) and targeted at boards with
-Cortex-M3, -M4, -M4F MCUs (Arduino Due from http://www.arduino.org,
-the STM32F4-series evaluation boards from STMicroelectronics at
-http://www.st.com).
+This package includes GNAT Ada Run Time Systems (RTSs) based on
+[FreeRTOS](http://www.freertos.org) and targeted at boards with
+Cortex-M3, -M4, -M4F MCUs ([Arduino Due](http://www.arduino.org), the
+STM32F4-series evaluation boards from
+[STMicroelectronics](http://www.st.com).
 
 The RTSs are all Ravenscar-based, with additional restrictions
-No_Exception_Propagation, No_Finalization and
-No_Recursion. No_Exception_Propagation means that exceptions can't be
-caught except in their immediate scope; instead, a Last_Chance_Handler
-is called.
+`No_Exception_Propagation`, `No_Finalization` and
+`No_Recursion`. `No_Exception_Propagation` means that exceptions can't
+be caught except in their immediate scope; instead, a
+`Last_Chance_Handler` is called.
 
 In each case, the board support for the RTS (configuration for size
 and location of Flash, RAM; clock initialization; interrupt naming) is
-in $RTS/adainclude. Support for the on-chip peripherals is also
+in `$RTS/adainclude`. Support for the on-chip peripherals is also
 included, in Ada spec files generated by SVD2Ada
 (https://github.com/AdaCore/svd2ada).
 
@@ -21,102 +21,131 @@ some later releases too).
 
 The boards supported are
 
-(1) arduino-due for the Arduino Due.
+(1) `arduino-due` for the Arduino Due. `See arduino-due/COPYING*` for
+licensing terms.
 
-    See arduino-due/COPYING* for licensing terms.
+  * On-chip peripheral support in `atsam3x8e/`.
 
-    On-chip peripheral support in atsam3x8e/.
+  * Tests in `test-arduino-due/`.
 
-    Tests in test-arduino-due/.
+(2) `stm32f4` for the STM32F4-DISC* board (and also the Crazyflie). See
+`stm32f4/COPYING*` for licensing terms.
 
-(2) stm32f4 for the STM32F4-DISC* board (and also the Crazyflie).
+  * On-chip peripheral support in `stm32f40x/`.
 
-    See stm32f4/COPYING* for licensing terms.
+  * Tests in `test-stm32f4/`.
 
-    On-chip peripheral support in stm32f40x/.
+(3) `stm32f429i` for the STM32F429I-DISC* board. See
+`stm32f429i/COPYING*` for licensing terms.
 
-    Tests in test-stm32f4/.
+  * On-chip peripheral support in `stm32f429x/`.
 
-(3) stm32f429i for the STM32F429I-DISC* board.
-
-    See stm32f429i/COPYING* for licensing terms.
-
-    On-chip peripheral support in stm32f429x/.
-
-    Tests in test-stm32f429i/.
+  * Tests in `test-stm32f429i/`.
 
 The standard packages included (there are more, implementation-specific,
 ones) for all RTSs are:
 
-Ada
-Ada.Containers
-Ada.Containers.Bounded_Hashed_Maps
-Ada.Containers.Bounded_Vectors
-Ada.Exceptions
-Ada.IO_Exceptions
-Ada.Interrupts
-Ada.Interrupts.Names
-Ada.Iterator_Interfaces
-Ada.Real_Time
-Ada.Real_Time.Timing_Events
-Ada.Streams
-Ada.Synchronous_Task_Control
-Ada.Tags
-Ada.Task_Identification
-Interfaces
-Interfaces.C
-Interfaces.C.Extensions
-Interfaces.C.Strings
-System
-System.Assertions
-System.Address_To_Access_Conversions
-System.Storage_Elements
-GNAT
-GNAT.Source_Info
-
-Additionally, stm32f4 includes all of Ada.Numerics (excluding random
-number generation).
+    Ada
+    Ada.Containers
+    Ada.Containers.Bounded_Hashed_Maps
+    Ada.Containers.Bounded_Vectors
+    Ada.Exceptions
+    Ada.IO_Exceptions
+    Ada.Interrupts
+    Ada.Interrupts.Names
+    Ada.Iterator_Interfaces
+    Ada.Real_Time
+    Ada.Real_Time.Timing_Events
+    Ada.Streams
+    Ada.Synchronous_Task_Control
+    Ada.Tags
+    Ada.Task_Identification
+    Interfaces
+    Interfaces.C
+    Interfaces.C.Extensions
+    Interfaces.C.Strings
+    System
+    System.Assertions
+    System.Address_To_Access_Conversions
+    System.Storage_Elements
+    GNAT
+    GNAT.Source_Info
+
+Additionally, `stm32f4` includes all of `Ada.Numerics` (excluding
+random number generation).
 
 Release Notes
 =============
 
-20170725
+20170726
 --------
 
-This release is motivated by a wish to support the Crazyflie code from
-AdaCore in the stm32f4 RTS. However, most of the changes apply to the
-other RTSs as well.
+This release is motivated by a wish to support the
+[Crazyflie, a.k.a. Certyflie](https://github.com/AdaCore/Certyflie)
+code from AdaCore in the `stm32f4` RTS. However, most of the changes
+apply to the other RTSs as well.
 
-Common
-......
+The RTSs build as-is with FSF GCC 7.1.0 (for macOS users, a compiler
+is available at
+[Sourceforge](https://sourceforge.net/projects/gnuada/files/GNAT_GCC%20Mac%20OS%20X/7.1.0/).
+
+At FSF GCC 7, the interface to create a task changed (`Create` takes an
+extra parameter, `Secondary_Stack_Size`). Alternate versions are
+provided for use with FSF GCC 6 (macOS compiler also at
+[Sourceforge](https://sourceforge.net/projects/gnuada/files/GNAT_GCC%20Mac%20OS%20X/6.1.0/)):
+
+    common/environment_task.adb-gcc6
+    common/s-tarest.ads-gcc6
+    common/s-tarest.adb-gcc6
 
-The supported compiler is GCC 7 (NB, _not_ GNAT GPL 2017, which is
-based on GCC 6).
+To use them, copy over the equivalent `.ad?` file.
+
+These patches are also needed to build the RTS with GNAT GPL 2016.
+
+GNAT GPL 2017 does not require these patches: however, attempting to
+build the RTS results in
+
+    [Ada]          a-stream.ads
+    a-stream.ads:67:09: expected type "Standard.Boolean"
+    a-stream.ads:67:09: found type "Ada.Tags.Size_Ptr"
+    a-stream.ads:67:09: expected type "Ada.Tags.Select_Specific_Data_Ptr"
+    a-stream.ads:67:09: found a composite type
+    a-stream.ads:67:09: no value supplied for component "Tags_Table"
+    gprbuild: *** compilation phase failed
+
+With GNAT GPL 2016, the cortex-gnat-rts test programs work
+properly. The
+[Certyflie branch](https://github.com/simonjwright/Certyflie/tree/sjw)
+also works, after removing the `Create_Missing_Dirs` attributes, new
+in GPRBuild GPL 2017, from all the GPRs.
+
+Common
+------
 
 The base is FreeRTOS 9.0.0.
 
-Added Ada.Real_Time.Timing_Events (with limitations: there's no
+Added `Ada.Real_Time.Timing_Events` (with limitations: there's no
 finalization, so they should only be declared at library level).
 
-SPARK annotations in Ada.Real_Time are copied from those in GCC 7.1.0.
+SPARK annotations in `Ada.Real_Time` are copied from those in GCC 7.1.0.
 
-Added Interfaces.C.Extensions.
+Added `Interfaces.C.Extensions`.
 
-type'Image() and object'Img are supported.
+`type'Image()` and `object'Img` are supported.
 
 The default stack size is 4096 (the minimum size is still 768).
 
-stm32f4
-.......
+`stm32f4`
+---------
 
 Stack overflow checking is enabled in FreeRTOS.
 
-Added Ada.Numerics.* (excluding random number generation).
+Added `Ada.Numerics.*` (excluding random number generation).
 
-In Ada.Interrupts.Names, interrupts are still named *_IRQ, but
-renamings to *_Interrupt are included.
+In `Ada.Interrupts.Names`, interrupts are still named `*_IRQ`, but
+renamings to `*_Interrupt` are included.
 
-The main program can have pragma (or aspect) Priority.
+The main program can have `pragma` (or aspect) `Priority`.
 
 Executables can be built to load at an offset from the STM32F4's
 default (this is to support the Crazyflie's over-the-air bootloader).
@@ -130,9 +159,9 @@ In this release,
   STM32Cube package.
 
 * The support for on-chip peripherals is limited to the
-  SVD2Ada-generated spec files. The AdaCore 'bareboard' software
-  (currently https://github.com/AdaCore/Ada_Drivers_Library, but a
-  name change is under consideration) supports the STM32 line.
+  SVD2Ada-generated spec files. The
+  [AdaCore 'bareboard' software](https://github.com/AdaCore/Ada_Drivers_Library)
+  supports the STM32 line.
 
 * Tasking no longer requires an explicit start
   (https://sourceforge.net/p/cortex-gnat-rts/tickets/5/).

arduino-due/Makefile.dist

@@ -66,6 +66,5 @@ dist:: $(RTS_DISTRIBUTION_FILES)
 	mkdir $(DIST)/$(THIS)
 	tar cf - $(RTS_DISTRIBUTION_FILES) | \
 	  tar xvf - -C $(DIST)/$(THIS)
-	cd $(DIST)/$(THIS); make; rm -rf .build
 
 .PHONY: all dist

common/Makefile.dist

@@ -73,6 +73,7 @@ RTS_DISTRIBUTION_FILES +=			\
   a-uncdea.ads					\
   ada.ads					\
   environment_task.adb				\
+  environment_task.adb-gcc6			\
   environment_task.ads				\
   g-souinf.ads					\
   gnat.ads					\
@@ -148,7 +149,9 @@ RTS_DISTRIBUTION_FILES +=			\
   s-taprob.adb					\
   s-taprob.ads					\
   s-tarest.adb					\
+  s-tarest.adb-gcc6				\
   s-tarest.ads					\
+  s-tarest.ads-gcc6				\
   s-tasinf.ads					\
   s-taskin.adb					\
   s-taskin.ads					\
@@ -203,6 +206,7 @@ RTS_DISTRIBUTION_FILES +=			\
   math/s-gearop.ads
 
 RTS_DISTRIBUTION_FILES +=			\
+  adaint.c					\
   freertos_bindings.c				\
   last_chance_handler.c				\
   vApplicationStackOverflowHook.c

common/adaint.c

@@ -0,0 +1,23 @@
+// Copyright (C) 2017 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-
+// ware  Foundation;  either version 3,  or (at your option) any later ver-
+// sion.  GNAT is distributed in the hope that it will be useful, but WITH-
+// OUT ANY WARRANTY;  without even the  implied warranty of MERCHANTABILITY
+// or FITNESS FOR A PARTICULAR PURPOSE.
+//
+// As a special exception under Section 7 of GPL version 3, you are granted
+// additional permissions described in the GCC Runtime Library Exception,
+// version 3.1, as published by the Free Software Foundation.
+//
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// <http://www.gnu.org/licenses/>.
+//
+// The variable __gl_main_priority is initialized to -1
+// (System.Tasking.Unspecified_Priority) and will be updated if the main
+// program has pragma Priority.
+
+int __gl_main_priority = -1;

common/environment_task.adb

@@ -45,12 +45,11 @@ package body Environment_Task is
    Environment_TCB : aliased System.Tasking.Ada_Task_Control_Block
      (System.Tasking.Null_Entry);
 
-   --  Will be overwritten by binder-generated code if the main
-   --  program has pragma Priority.
-   Main_Priority : Integer := System.Tasking.Unspecified_Priority;
-   pragma Export (C, Main_Priority, "__gl_main_priority");
-
    procedure Create is
+      --  Will be overwritten by binder-generated code if the main
+      --  program has pragma Priority.
+      Main_Priority : Integer;
+      pragma Import (C, Main_Priority, "__gl_main_priority");
    begin
       System.Tasking.Restricted.Stages.Create_Restricted_Task
         (Priority             => Main_Priority,

common/environment_task.adb-gcc6

@@ -0,0 +1,70 @@
+--  -*- ada -*-
+
+--  Copyright (C) 2016 Free Software Foundation, Inc.
+--
+--  This file is part of the Cortex GNAT RTS project. This file is
+--  free software; you can redistribute it and/or modify it under
+--  terms of the GNU General Public License as published by the Free
+--  Software Foundation; either version 3, or (at your option) any
+--  later version. This file is distributed in the hope that it will
+--  be useful, but WITHOUT ANY WARRANTY; without even the implied
+--  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+--
+--  As a special exception under Section 7 of GPL version 3, you are
+--  granted additional permissions described in the GCC Runtime
+--  Library Exception, version 3.1, as published by the Free Software
+--  Foundation.
+--
+--  You should have received a copy of the GNU General Public License
+--  and a copy of the GCC Runtime Library Exception along with this
+--  program; see the files COPYING3 and COPYING.RUNTIME respectively.
+--  If not, see <http://www.gnu.org/licenses/>.
+
+with System.Parameters;
+with System.Tasking.Restricted.Stages;
+with System.Task_Info;
+
+package body Environment_Task is
+
+   procedure Environment_Task (Arg : System.Address);
+   procedure Environment_Task (Arg : System.Address) is
+      pragma Unreferenced (Arg);
+      --  Generated by gnatbind.
+      procedure Main
+      with
+        Import,
+        Convention => C,
+        External_Name => "main";
+   begin
+      Main; -- should not return;
+   end Environment_Task;
+
+   --  For creating the environment task; declared here to avoid
+   --  accessibility level issues.
+   Environment_Task_Elaborated : aliased Boolean;
+   Activation_Chain_Dummy : System.Tasking.Activation_Chain
+     with Suppress_Initialization;
+   Environment_TCB : aliased System.Tasking.Ada_Task_Control_Block
+     (System.Tasking.Null_Entry);
+
+   procedure Create is
+      --  Will be overwritten by binder-generated code if the main
+      --  program has pragma Priority.
+      Main_Priority : Integer;
+      pragma Import (C, Main_Priority, "__gl_main_priority");
+   begin
+      System.Tasking.Restricted.Stages.Create_Restricted_Task
+        (Priority      => Main_Priority,
+         Stack_Address => System.Null_Address,
+         Size          => System.Parameters.Unspecified_Size,
+         Task_Info     => System.Task_Info.Unspecified_Task_Info,
+         CPU           => System.Tasking.Unspecified_CPU,
+         State         => Environment_Task'Access,
+         Discriminants => System.Null_Address,
+         Elaborated    => Environment_Task_Elaborated'Access,
+         Chain         => Activation_Chain_Dummy,
+         Task_Image    => "",
+         Created_Task  => Environment_TCB'Access);
+   end Create;
+
+end Environment_Task;