From 131a075cc1794f08ebd743dbc13e102bea3d160c Mon Sep 17 00:00:00 2001
From: Eric Botcazou <ebotcazou@adacore.com>
Date: Thu, 13 Sep 2018 17:13:05 +0000
Subject: [PATCH] * Makefile.rtl (arm% linux-gnueabi%): Always set EH_MECHANISM
 to -arm.

From-SVN: r264278
---
 gcc/ada/ChangeLog    | 4 ++++
 gcc/ada/Makefile.rtl | 7 +------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index b3638be4503..9af9fab6135 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2018-09-13  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* Makefile.rtl (arm% linux-gnueabi%): Always set EH_MECHANISM to -arm.
+
 2018-09-13  Eric Botcazou  <ebotcazou@adacore.com>
 
 	PR ada/81103
diff --git a/gcc/ada/Makefile.rtl b/gcc/ada/Makefile.rtl
index 9542fe0c9ad..936a16d32bb 100644
--- a/gcc/ada/Makefile.rtl
+++ b/gcc/ada/Makefile.rtl
@@ -2140,15 +2140,10 @@ ifeq ($(strip $(filter-out arm% linux-gnueabi%,$(target_cpu) $(target_os))),)
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
   system.ads<libgnat/system-linux-arm.ads
 
-  ifeq ($(strip $(filter-out arm%b,$(target_cpu))),)
-    EH_MECHANISM=
-  else
-    EH_MECHANISM=-arm
-  endif
-
   TOOLS_TARGET_PAIRS = indepsw.adb<indepsw-gnu.adb
 
   EXTRA_GNATRTL_TASKING_OBJS=s-linux.o
+  EH_MECHANISM=-arm
   THREADSLIB = -lpthread
   GNATLIB_SHARED = gnatlib-shared-dual
   GMEM_LIB = gmemlib
-- 
2.30.2