Skip to content

Commit

Permalink
Merge pull request #27 from dinkelk/toolchain-update-s
Browse files Browse the repository at this point in the history
Toolchain Update
  • Loading branch information
dinkelk authored Feb 28, 2024
2 parents 2a529ea + 22e65c4 commit e072276
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
6 changes: 3 additions & 3 deletions alire.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ tags = ["embedded", "framework"]
website = "https://github.com/lasp/adamant"

[[depends-on]]
gnat_native = "12.2.1"
gnat_native = "13.2.1"
gprbuild = "22.0.1"
gnatprove = "12.1.1"
aunit = "23.0.0"
gnatprove = "13.2.1"
aunit = "24.0.0"

# This crate provides gnatpp & gnatmetric. However this
# takes a very long time to compile. We will do this
Expand Down
2 changes: 2 additions & 0 deletions gen/templates/memory_map/name.ads
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,10 @@ is

pragma Warnings (Off, "indirect writes to ""{{ item.name }}"" through a potential alias are ignored");
pragma Warnings (Off, "writing to ""{{ item.name }}"" is assumed to have no effects on other non-volatile objects");
pragma Warnings (Off, "assuming no concurrent accesses to non-atomic object ""{{ item.name }}""");
{{ item.name }} : aliased {{ item.type }}
with Import, Convention => Ada, Address => {{ item.name }}_Address;
pragma Warnings (On, "assuming no concurrent accesses to non-atomic object ""{{ item.name }}""");
pragma Warnings (On, "writing to ""{{ item.name }}"" is assumed to have no effects on other non-volatile objects");
pragma Warnings (On, "indirect writes to ""{{ item.name }}"" through a potential alias are ignored");

Expand Down
2 changes: 2 additions & 0 deletions gen/templates/register_map/name.ads
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,10 @@ is
{{ item.name }}_End : constant Unsigned_32 := {{ item.name }}_Offset + {{ item.name }}_Size - 1; -- 0x{{ '%08X' % (item.address + item.size - 1) }}
{{ item.name }}_Address : constant System.Address := To_Address (Integer_Address ({{ item.name }}_Offset));
pragma Warnings (Off, "writing to ""{{ item.name }}"" is assumed to have no effects on other non-volatile objects");
pragma Warnings (Off, "assuming no concurrent accesses to non-atomic object ""{{ item.name }}""");
{{ item.name }} : aliased {{ item.type }}
with {% if item.volatile_aspect %}{{ item.volatile_aspect }} => True, {% endif %}Import, Convention => Ada, Address => {{ item.name }}_Address;
pragma Warnings (On, "assuming no concurrent accesses to non-atomic object ""{{ item.name }}""");
pragma Warnings (On, "writing to ""{{ item.name }}"" is assumed to have no effects on other non-volatile objects");

{% endfor %}
Expand Down
3 changes: 1 addition & 2 deletions redo/targets/gpr/a_adamant.gpr
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ abstract project a_adamant is
--
-- -gnatf - full errors
-- -gnatwa - enable all warnings
-- -gnatwh - warn on hiding
-- -gnatwl - elaboration pragma warnings
-- -gnatw.o - modified but unreferenced out parameters warnings
-- -gnatwt - deleted conditional code
Expand All @@ -48,7 +47,7 @@ abstract project a_adamant is
-- Note: I did not turn on gnatwd, because writing "all" all the time makes things
-- less readable.
--
ADA_FLAGS := ("-gnatf", "-gnatwa", "-gnatwh", "-gnatwl", "-gnatw.o", "-gnatwt", "-gnatw.X");
ADA_FLAGS := ("-gnatf", "-gnatwa", "-gnatwl", "-gnatw.o", "-gnatwt", "-gnatw.X");
COMMON_C_FLAGS := ("-Wall", "-Wextra", "-pedantic");
C_FLAGS := COMMON_C_FLAGS & ("-std=gnu99");
CPP_FLAGS := COMMON_C_FLAGS & ("-std=c++0x");
Expand Down

0 comments on commit e072276

Please sign in to comment.