re PR ada/66205 (gnatbind generates invalid code when finalization is enabled in...

	PR ada/66205
	* bindgen.adb (Gen_AdaFinal): If the restriction No_Task_Termination is
	set, generate a null body.

From-SVN: r255441

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 2619b162c3a1a4763d46b8a937ce692962ea64ff..3168ba485016829bdf6d51e319af1effa8774383 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,9 @@
+2017-12-06  Simon Wright  <simon@pushface.org>
+
+       PR ada/66205
+       * bindgen.adb (Gen_AdaFinal): If the restriction No_Task_Termination is
+       set, generate a null body.
+
 2017-12-05  Piotr Trojanek  <trojanek@adacore.com>
 
        * sem_util.adb (Contains_Refined_State): Remove.

diff --git a/gcc/ada/bindgen.adb b/gcc/ada/bindgen.adb
index e3d875bc8cc5db63a44a3825c62f31488bc09dbf..44d521e8c46bfb48cd786c6d3f8f3073d5bc6586 100644 (file)
--- a/gcc/ada/bindgen.adb
+++ b/gcc/ada/bindgen.adb
@@ -450,6 +450,18 @@ package body Bindgen is
    begin
       WBI ("   procedure " & Ada_Final_Name.all & " is");
 
+      --  If task termination is not allowed, as is the case in restricted
+      --  runtimes, such as Ravenscar or ZFP, but may not be the case for all
+      --  configurable runtimes, we do not need program-level finalization.
+
+      if Cumulative_Restrictions.Set (No_Task_Termination) then
+         WBI ("   begin");
+         WBI ("      null;");
+         WBI ("   end " & Ada_Final_Name.all & ";");
+         WBI ("");
+         return;
+      end if;
+
       --  Call s_stalib_adafinal to await termination of tasks and so on. We
       --  want to do this if there is a main program, either in Ada or in some
       --  other language. (Note that Bind_Main_Program is True for Ada mains,