Merge branch 'topic/kliemann/qemu_17' into 'master'

Move __initialize_mmu to .boot See merge request eng/toolchain/bb-runtimes!48
AdaCore · Oct 12, 2023 · 542446f · 542446f
2 parents 95428e9 + 793a8ec
commit 542446f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/s-mmu.ads b/src/s-mmu.ads
@@ -35,7 +35,8 @@ is
 
    procedure Initialize with
       Export,
-      Convention    => C,
-      External_Name => "__initialize_mmu";
+      Convention     => C,
+      External_Name  => "__initialize_mmu",
+      Linker_Section => ".boot";
 
 end System.MMU;
diff --git a/src/s-mmu__aarch64.adb b/src/s-mmu__aarch64.adb
@@ -178,7 +178,8 @@ package body System.MMU is
 
    type Level_3_Tables is array (Natural range <>) of Level_3_Table;
 
-   function Get_Level_1_Table return Address;
+   function Get_Level_1_Table return Address with
+     Inline_Always;
    --  Retrieve the address of the level 1 translation table from the
    --  TTBR0_EL1 register.