From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Tue, 5 Dec 2017 10:46:42 +0000 (+0000)
Subject: RTEMS/Ada: Define EH_MECHANISM
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ab92e6e6a5f5cdd3a28d54c4626f1efb8218f561;p=gcc.git

RTEMS/Ada: Define EH_MECHANISM

Without this definition I got the following error:

<...>/xgcc <...>  -c -g -O2   -W -Wall -gnatpg -nostdinc  -g -fno-inline \
      -fno-toplevel-reorder -O1  a-except.adb -o a-except.o
a-exexpr.adb:38:06: "System.Exceptions.Machine" is not a predefined library unit
a-exexpr.adb:38:06: "Ada.Exceptions (body)" depends on "Ada.Exceptions.Exception_Propagation (body)"
a-exexpr.adb:38:06: "Ada.Exceptions.Exception_Propagation (body)" depends on "System.Exceptions.Machine (spec)"
../gcc-interface/Makefile:2661: recipe for target 'a-except.o' failed

gcc/ada

	* gcc-interface/Makefile.in (RTEMS): Define EH_MECHANISM.

From-SVN: r255408
---

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 714ea612b79..79417ddde28 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2017-12-05  Sebastian Huber  <sebastian.huber@embedded-brains.de>
+
+	* gcc-interface/Makefile.in (RTEMS): Define EH_MECHANISM.
+
 2017-12-04  Sebastian Huber  <sebastian.huber@embedded-brains.de>
 
 	* gcc-interface/Makefile.in (RTEMS): Use s-osprim__rtems.adb.
diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
index 133ef8e94c9..99e3bdcb39d 100644
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/gcc/ada/gcc-interface/Makefile.in
@@ -1368,6 +1368,11 @@ ifeq ($(strip $(filter-out rtems%,$(target_os))),)
   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
   s-stchop.adb<libgnat/s-stchop__rtems.adb \
   s-interr.adb<libgnarl/s-interr__hwint.adb
+  ifeq ($(strip $(filter-out arm%, $(target_cpu))),)
+    EH_MECHANISM=-arm
+  else
+    EH_MECHANISM=-gcc
+  endif
 endif
 
 # PikeOS