From 2e3b11b354b58e6ddb230059130f2e28c14e7949 Mon Sep 17 00:00:00 2001
From: Martin Stein <martin.stein@genode-labs.com>
Date: Tue, 19 May 2020 12:15:06 +0200
Subject: [PATCH] ada-runtime: add s-expint.ad*

* switch to fork of the Ada runtime provided by m-stein
* switch to a Ada-runtime state that provides the Exp_Int package (exponential
  function on integers)
* adapt spark lib, symbols, and recipes to incorporate the Exp_Int package

Fixes #3848
---
 repos/libports/lib/mk/spark.mk              | 3 ++-
 repos/libports/lib/symbols/spark            | 1 +
 repos/libports/ports/ada-runtime.hash       | 2 +-
 repos/libports/ports/ada-runtime.port       | 8 ++++----
 repos/libports/recipes/api/spark/content.mk | 2 ++
 repos/libports/recipes/src/spark/content.mk | 2 ++
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/repos/libports/lib/mk/spark.mk b/repos/libports/lib/mk/spark.mk
index 5ebf351e1c..7bb5059757 100644
--- a/repos/libports/lib/mk/spark.mk
+++ b/repos/libports/lib/mk/spark.mk
@@ -11,7 +11,7 @@ SRC_ADS += system.ads \
 	   a-except.ads \
 	   ada.ads
 
-SRC_ADB += s-stalib.adb s-secsta.adb s-parame.adb i-c.adb s-arit64.adb s-stoele.adb s-init.adb
+SRC_ADB += s-stalib.adb s-secsta.adb s-parame.adb i-c.adb s-arit64.adb s-expint.adb s-stoele.adb s-init.adb
 CUSTOM_ADA_FLAGS = --RTS=$(ADA_RTS) -c -gnatg -gnatp -gnatpg -gnatn2
 
 # C runtime glue code
@@ -39,6 +39,7 @@ vpath s-parame.adb $(ADA_RUNTIME_DIR)
 vpath a-except.adb $(ADA_RUNTIME_DIR)
 vpath i-c.adb $(ADA_RUNTIME_DIR)
 vpath s-arit64.adb $(ADA_RUNTIME_DIR)
+vpath s-expint.adb $(ADA_RUNTIME_DIR)
 vpath system.ads $(ADA_RUNTIME_DIR)
 vpath s-stoele.adb $(ADA_RUNTIME_DIR)
 vpath s-init.adb $(ADA_RUNTIME_DIR)
diff --git a/repos/libports/lib/symbols/spark b/repos/libports/lib/symbols/spark
index b5ec16d3a2..8375428c88 100644
--- a/repos/libports/lib/symbols/spark
+++ b/repos/libports/lib/symbols/spark
@@ -152,6 +152,7 @@ system__default_priority R 4
 system__denorm R 1
 system__duration_32_bits R 1
 system__exit_status_supported R 1
+system__exp_int__exp_integer T
 system__fractional_fixed_ops R 1
 system__front_end_zcx_support R 1
 system__frontend_exceptions R 1
diff --git a/repos/libports/ports/ada-runtime.hash b/repos/libports/ports/ada-runtime.hash
index cc9b873b6e..82fbbf354c 100644
--- a/repos/libports/ports/ada-runtime.hash
+++ b/repos/libports/ports/ada-runtime.hash
@@ -1 +1 @@
-db898737bfc7439e637065a8f975097aad4741dc
+fabce1ce8b266d045615050e8e326159ae888a0d
diff --git a/repos/libports/ports/ada-runtime.port b/repos/libports/ports/ada-runtime.port
index 098aaf4a92..bf735c0e14 100644
--- a/repos/libports/ports/ada-runtime.port
+++ b/repos/libports/ports/ada-runtime.port
@@ -2,10 +2,10 @@ LICENSE   := AGPLv3 + GCC runtime library exception
 VERSION   := 0
 DOWNLOADS := ada-runtime.git ada-runtime-alis.git
 
-URL(ada-runtime) := https://github.com/Componolit/ada-runtime.git
-REV(ada-runtime) := e09f9981ad7e02407b1710b80b701384ef5c32f7
+URL(ada-runtime) := https://github.com/m-stein/ada-runtime.git
+REV(ada-runtime) := 6e3e054e6de7b8b355d42b6b4107fe9a6ba08142
 DIR(ada-runtime) := ada-runtime
 
-URL(ada-runtime-alis) := https://github.com/Componolit/ada-runtime-alis.git
-REV(ada-runtime-alis) := a679a4097b416360efa9b37a4184479ce5adbae0
+URL(ada-runtime-alis) := https://github.com/cnuke/ada-runtime-alis.git
+REV(ada-runtime-alis) := c8df42f821cf1ec4c56dd2c6fc5939fcde39a2d5
 DIR(ada-runtime-alis) := ada-runtime-alis
diff --git a/repos/libports/recipes/api/spark/content.mk b/repos/libports/recipes/api/spark/content.mk
index d4ab2e6a26..d774c2282a 100644
--- a/repos/libports/recipes/api/spark/content.mk
+++ b/repos/libports/recipes/api/spark/content.mk
@@ -15,6 +15,7 @@ MIRROR_FROM_ADA_RT_DIR := \
 		i-c.ads \
 		system.ads \
 		s-arit64.ads \
+		s-expint.ads \
 		s-exctab.ads \
 		s-parame.ads \
 		s-secsta.ads \
@@ -47,6 +48,7 @@ MIRROR_FROM_ADA_ALI_DIR := \
 	i-cexten.ali \
 	interfac.ali \
 	s-arit64.ali \
+	s-expint.ali \
 	s-init.ali \
 	s-parame.ali \
 	s-secsta.ali \
diff --git a/repos/libports/recipes/src/spark/content.mk b/repos/libports/recipes/src/spark/content.mk
index 4454dab5f3..5d13692334 100644
--- a/repos/libports/recipes/src/spark/content.mk
+++ b/repos/libports/recipes/src/spark/content.mk
@@ -17,6 +17,8 @@ MIRROR_FROM_ADA_RT_DIR := \
 		system.ads \
 		s-arit64.ads \
 		s-arit64.adb \
+		s-expint.ads \
+		s-expint.adb \
 		s-exctab.ads \
 		s-exctab.adb \
 		s-parame.ads \