From 069a9ad56f97847757ef24a14531ff129688c50a Mon Sep 17 00:00:00 2001 From: Alexander Senier Date: Thu, 21 Jun 2018 21:05:04 +0200 Subject: [PATCH] Ada: runtime support for 64bit arithmetics --- repos/libports/lib/mk/ada.mk | 2 +- repos/libports/src/lib/ada/runtimelib/a-except_c.cc | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/repos/libports/lib/mk/ada.mk b/repos/libports/lib/mk/ada.mk index 2cad6c1e26..ca66df0c38 100644 --- a/repos/libports/lib/mk/ada.mk +++ b/repos/libports/lib/mk/ada.mk @@ -3,7 +3,7 @@ include $(REP_DIR)/lib/import/import-ada.mk ADALIB = $(ADA_RTS)/adalib ADAINCLUDE = $(ADA_RTS)/adainclude -PACKAGES = system s-stoele s-secsta a-except s-conca2 +PACKAGES = system s-stoele s-secsta a-except s-conca2 s-arit64 body_exists := $(filter $1.adb,$(shell if [ -e $2/$1.adb ]; then echo $1.adb; fi)) diff --git a/repos/libports/src/lib/ada/runtimelib/a-except_c.cc b/repos/libports/src/lib/ada/runtimelib/a-except_c.cc index 7f40dda94f..f32c36c118 100644 --- a/repos/libports/src/lib/ada/runtimelib/a-except_c.cc +++ b/repos/libports/src/lib/ada/runtimelib/a-except_c.cc @@ -13,12 +13,17 @@ extern "C" { } /* Constraint Error */ - void __gnat_rcheck_CE_Explicit_Raise(char *file, int line) + void constraint_error(char *file, int line) { Genode::error("Constraint Error in ", Genode::Cstring(file), " at line ", line); throw Ada::Exception::Constraint_Error(); } + void __gnat_rcheck_CE_Explicit_Raise(char *file, int line) + { + constraint_error(file, line); + } + /* Storage Error */ void __gnat_rcheck_SE_Explicit_Raise(char *file, int line) {