Commit 63d24a9a authored by TASTE User's avatar TASTE User

* Add machinery to use GNAT cross runtimes, minor update for output

parent 7e6d2c51
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 2006-2009 Telecom ParisTech, 2010-2015 ESA & ISAE. -- -- Copyright (C) 2006-2009 Telecom ParisTech, 2010-2017 ESA & ISAE. --
-- -- -- --
-- PolyORB-HI is free software; you can redistribute it and/or modify under -- -- PolyORB-HI is free software; you can redistribute it and/or modify under --
-- terms of the GNU General Public License as published by the Free Soft- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -177,8 +177,10 @@ package body PolyORB_HI.Output is ...@@ -177,8 +177,10 @@ package body PolyORB_HI.Output is
end if; end if;
PolyORB_HI.Output_Low_Level.Put ("["); PolyORB_HI.Output_Low_Level.Put ("[");
PolyORB_HI.Output_Low_Level.Put -- XXX The following is disabled as some cross-runtime do not have
(Duration'Image (To_Duration (Elapsed * 1000))); -- the capability to build Duration'Image
-- PolyORB_HI.Output_Low_Level.Put
-- (Duration'Image (To_Duration (Elapsed * 1000)));
PolyORB_HI.Output_Low_Level.Put ("] "); PolyORB_HI.Output_Low_Level.Put ("] ");
PolyORB_HI.Output_Low_Level.Put (Text); PolyORB_HI.Output_Low_Level.Put (Text);
end Unprotected_Put; end Unprotected_Put;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- P r o j e c t -- -- P r o j e c t --
-- -- -- --
-- Copyright (C) 2007-2009 Telecom ParisTech, 2010-2015 ESA & ISAE. -- -- Copyright (C) 2007-2009 Telecom ParisTech, 2010-2017 ESA & ISAE. --
-- -- -- --
-- PolyORB-HI is free software; you can redistribute it and/or modify under -- -- PolyORB-HI is free software; you can redistribute it and/or modify under --
-- terms of the GNU General Public License as published by the Free Soft- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -31,7 +31,8 @@ ...@@ -31,7 +31,8 @@
project PolyORB_HI is project PolyORB_HI is
type Target_Type is ("NATIVE", "LEON_ORK", "LEON_GNAT", "ERC32", "MARTEOS"); type Target_Type is
("NATIVE", "LEON_ORK", "LEON_GNAT", "ERC32", "MARTEOS", "ARM_CORTEX");
Target : Target_Type := external ("TARGET", "NATIVE"); Target : Target_Type := external ("TARGET", "NATIVE");
type Build_Type is ("Debug", "Release", "Analyzable"); type Build_Type is ("Debug", "Release", "Analyzable");
...@@ -122,11 +123,25 @@ project PolyORB_HI is ...@@ -122,11 +123,25 @@ project PolyORB_HI is
case Target is case Target is
when "NATIVE" | "MARTEOS" => when "NATIVE" | "MARTEOS" =>
for Local_Configuration_Pragmas use "native.adc"; for Local_Configuration_Pragmas use "native.adc";
when "LEON_ORK" | "LEON_GNAT" | "ERC32" => when "LEON_ORK" | "LEON_GNAT" | "ERC32" | "ARM_CORTEX" =>
for Local_Configuration_Pragmas use "hi-e.adc"; for Local_Configuration_Pragmas use "hi-e.adc";
end case; end case;
end Compiler; end Compiler;
-- Default configuration for GNAT runtime for some cross-targets.
-- Note: PolyORB-HI/Ada requires a Ravenscar runtime
-- XXX: one would need to have this overriden from the command line
gnat_runtime := "";
case Target is
when "ARM_CORTEX" =>
gnat_runtime := "ravenscar-sfp-stm32f4";
when others =>
gnat_runtime := "";
end case;
------------- -------------
-- Builder -- -- Builder --
------------- -------------
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment