From fa2e6e2570459be86a7a47482ad7bd2a7115982a Mon Sep 17 00:00:00 2001
From: Doug Rupp <rupp@adacore.com>
Date: Fri, 17 Oct 2014 09:18:17 +0000
Subject: [PATCH] Makefile.in: Enable the socket runtime bits for Android.

	* gcc-interface/Makefile.in: Enable the socket runtime bits
	for Android.

From-SVN: r216383
---
 gcc/ada/ChangeLog                 | 5 +++++
 gcc/ada/gcc-interface/Makefile.in | 4 +---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 3dfcd9e8b5c..ba51cc3a931 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-17  Doug Rupp  <rupp@adacore.com>
+
+	* gcc-interface/Makefile.in: Enable the socket runtime bits
+	for Android.
+
 2014-10-17  Ed Schonberg  <schonberg@adacore.com>
 
 	* sem_ch13.adb (Add_Invariants, Replace_Type_References): Do
diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
index 03df9321765..51c817b6b10 100644
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/gcc/ada/gcc-interface/Makefile.in
@@ -1119,14 +1119,12 @@ ifeq ($(strip $(filter-out arm% linux-androideabi,$(target_cpu) $(target_os))),)
   s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
   system.ads<system-linux-armel.ads \
   a-exexpr.adb<a-exexpr-gcc.adb \
-  s-excmac.ads<s-excmac-arm.ads \
-  $(DUMMY_SOCKETS_TARGET_PAIRS)
+  s-excmac.ads<s-excmac-arm.ads
 
   TOOLS_TARGET_PAIRS =  \
     mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb \
     indepsw.adb<indepsw-gnu.adb
 
-  GNATRTL_SOCKETS_OBJS =
   EXTRA_GNATRTL_TASKING_OBJS=s-linux.o
   EXTRA_LIBGNAT_OBJS+=raise-gcc.o sigtramp-armdroid.o
   EXTRA_GNATRTL_NONTASKING_OBJS+=g-cppexc.o s-excmac.o
-- 
2.30.2