From 88c9728dd89909ac377c1850990eaa0acb832bbd Mon Sep 17 00:00:00 2001
From: ebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 24 Nov 2014 09:18:38 +0000
Subject: [PATCH] 	* gcc-interface/Makefile.in (Cygwin/Mingw): Fix
 previous change.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@218003 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ada/ChangeLog                 |  4 ++++
 gcc/ada/gcc-interface/Makefile.in | 31 +++++--------------------------
 2 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 054b28cf6ea..c749b541a2a 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,5 +1,9 @@
 2014-11-24  Eric Botcazou  <ebotcazou@adacore.com>
 
+	* gcc-interface/Makefile.in (Cygwin/Mingw): Fix previous change.
+
+2014-11-24  Eric Botcazou  <ebotcazou@adacore.com>
+
 	* gcc-interface/trans.c (build_return_expr): Use INIT_EXPR instead of
 	MODIFY_EXPR to assign to the return object.
 	(finalize_nrv_r): Adjust to above change.
diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
index 1e0214d108c..a4079191899 100644
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/gcc/ada/gcc-interface/Makefile.in
@@ -1678,8 +1678,6 @@ ifeq ($(strip $(filter-out cygwin% mingw32% pe,$(target_os))),)
   a-exetim.ads<a-exetim-mingw.ads \
   a-intnam.ads<a-intnam-mingw.ads \
   g-sercom.adb<g-sercom-mingw.adb \
-  s-trasym.adb<s-trasym-dwarf.adb \
-  s-tsmona.adb<s-tsmona-mingw.adb \
   s-interr.adb<s-interr-sigaction.adb \
   s-intman.adb<s-intman-mingw.adb \
   s-mudido.adb<s-mudido-affinity.adb \
@@ -1700,30 +1698,11 @@ ifeq ($(strip $(filter-out cygwin% mingw32% pe,$(target_os))),)
       SO_OPTS = -m64 -Wl,-soname,
     endif
   else
-    LIBGNAT_TARGET_PAIRS += \
-    a-exetim.adb<a-exetim-mingw.adb \
-    a-exetim.ads<a-exetim-mingw.ads \
-    a-intnam.ads<a-intnam-mingw.ads \
-    g-sercom.adb<g-sercom-mingw.adb \
-    s-interr.adb<s-interr-sigaction.adb \
-    s-intman.adb<s-intman-mingw.adb \
-    s-mudido.adb<s-mudido-affinity.adb \
-    s-osinte.ads<s-osinte-mingw.ads \
-    s-osprim.adb<s-osprim-mingw.adb \
-    s-taprop.adb<s-taprop-mingw.adb
-
-    ifeq ($(strip $(filter-out x86_64%,$(target_cpu))),)
-      ifeq ($(strip $(MULTISUBDIR)),/32)
-	LIBGNAT_TARGET_PAIRS += \
-	  $(X86_TARGET_PAIRS) \
-	  system.ads<system-mingw.ads
-	SO_OPTS= -m32 -Wl,-soname,
-      else
-	LIBGNAT_TARGET_PAIRS += \
-	  $(X86_64_TARGET_PAIRS) \
-	  system.ads<system-mingw-x86_64.ads
-	SO_OPTS = -m64 -Wl,-soname,
-      endif
+    ifeq ($(strip $(MULTISUBDIR)),/64)
+      LIBGNAT_TARGET_PAIRS += \
+        $(X86_64_TARGET_PAIRS) \
+        system.ads<system-mingw-x86_64.ads
+      SO_OPTS = -m64 -Wl,-soname,
     else
       LIBGNAT_TARGET_PAIRS += \
         $(X86_TARGET_PAIRS) \
-- 
2.11.4.GIT