From 0571154ad5d7c206b2a46b4995287bdf9bfbb988 Mon Sep 17 00:00:00 2001
From: Eric Botcazou <ebotcazou@adacore.com>
Date: Thu, 30 May 2013 07:15:37 +0000
Subject: [PATCH] * gcc-interface/Makefile.in (arm% androideabi): Robustify.

From-SVN: r199436
---
 gcc/ada/ChangeLog                 | 4 ++++
 gcc/ada/gcc-interface/Makefile.in | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index b9d47e2fa1b..1a37786243a 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-30  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/Makefile.in (arm% androideabi): Robustify.
+
 2013-05-26  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* gcc-interface/decl.c: (gnat_to_gnu_entity): In ASIS mode, do not
diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
index 04b5e55b205..6aa93c4655a 100644
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/gcc/ada/gcc-interface/Makefile.in
@@ -995,7 +995,7 @@ ifeq ($(strip $(filter-out mips% wrs vx%,$(targ))),)
   EXTRA_LIBGNAT_OBJS+=vx_stack_info.o
 endif
 
-ifeq ($(strip $(filter-out arm% linux-androideabi,$(arch) $(osys)-$(word 4,$(targ)))),)
+ifeq ($(strip $(filter-out arm% androideabi,$(arch) $(osys))),)
   LIBGNAT_TARGET_PAIRS = \
   a-intnam.ads<a-intnam-linux.ads \
   s-inmaop.adb<s-inmaop-posix.adb \
-- 
2.30.2