From 69416e98ff5d226210fefc00e91451269036f928 Mon Sep 17 00:00:00 2001
From: Arnaud Charlet <charlet@gcc.gnu.org>
Date: Wed, 2 May 2012 14:56:11 +0200
Subject: [PATCH] Revert 2012-02-24 Dave Korn <dave.korn.cygwin@gmail.com>

gcc/ada/

2012-05-02  Pascal Obry  <obry@adacore.com>

	Revert 2012-02-24  Dave Korn  <dave.korn.cygwin@gmail.com>

libada/

2012-05-02  Pascal Obry  <obry@adacore.com>

	Revert 2012-02-24  Dave Korn  <dave.korn.cygwin@gmail.com>

From-SVN: r187047
---
 gcc/ada/ChangeLog                 |  7 ++++++-
 gcc/ada/gcc-interface/Makefile.in | 30 +++++++++---------------------
 libada/ChangeLog                  | 11 ++++++++---
 libada/Makefile.in                |  2 --
 4 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index e733b68f68da..219d437622f1 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-02  Pascal Obry  <obry@adacore.com>
+
+	Revert
+	2012-02-24  Dave Korn  <dave.korn.cygwin@gmail.com>
+
 2012-04-30  Jan Hubicka  <jh@suse.cz>
 
 	* gcc-interface/utils.c (rest_of_subprog_body_compilation): Update
@@ -1599,7 +1604,7 @@
 
 2012-02-22  Hristian Kirtchev  <kirtchev@adacore.com>
 
-	* exp_ch7.adb (Create_Finalizer): Suppress elaboration checks on 
+	* exp_ch7.adb (Create_Finalizer): Suppress elaboration checks on
 	stack-related finalizers.
 
 2012-02-22  Ed Schonberg  <schonberg@adacore.com>
diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
index 5c4acda53882..37e551092d9f 100644
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/gcc/ada/gcc-interface/Makefile.in
@@ -1547,19 +1547,16 @@ ifeq ($(strip $(filter-out cygwin% mingw32% pe,$(osys))),)
   # the Cygwin port has always been a CygMing frankenhybrid and it is
   # a long-term project to disentangle them.
   ifeq ($(strip $(filter-out cygwin%,$(osys))),)
-    WIN_SO_PREFIX=cyg
     LIBGNAT_TARGET_PAIRS = \
     s-memory.adb<s-memory.adb \
     g-socthi.ads<g-socthi.ads \
     g-socthi.adb<g-socthi.adb
   else
-    WIN_SO_PREFIX=lib
     LIBGNAT_TARGET_PAIRS = \
     s-memory.adb<s-memory-mingw.adb \
     g-socthi.ads<g-socthi-mingw.ads \
     g-socthi.adb<g-socthi-mingw.adb
   endif
-  WIN_SO_INSTALL_DIR = $(bindir)
   LIBGNAT_TARGET_PAIRS += \
   a-dirval.adb<a-dirval-mingw.adb \
   a-excpol.adb<a-excpol-abort.adb \
@@ -2500,14 +2497,11 @@ install-gnatlib: ../stamp-gnatlib-$(RTSDIR)
 #     for shared libraries on some targets, e.g. on HP-UX where the x
 #     permission is required.
 #     Also install the .dSYM directories if they exist (these directories
-#     contain the debug information for the shared libraries on darwin),
-#     and the windows import libraries if they exist.
-	libpfx=$(if $(WIN_SO_PREFIX),$(WIN_SO_PREFIX),lib); \
-	librtlobjdir=$(if $(WIN_SO_INSTALL_DIR),$(WIN_SO_INSTALL_DIR),$(ADA_RTL_OBJ_DIR)); \
+#     contain the debug information for the shared libraries on darwin)
 	for file in gnat gnarl; do \
-	   if [ -f $(RTSDIR)/$${libpfx}$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) ]; then \
-	      $(INSTALL) $(RTSDIR)/$${libpfx}$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) \
-			 $(DESTDIR)$${librtlobjdir}; \
+	   if [ -f $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) ]; then \
+	      $(INSTALL) $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) \
+			 $(DESTDIR)$(ADA_RTL_OBJ_DIR); \
 	   fi; \
 	   if [ -f $(RTSDIR)/lib$${file}$(soext) ]; then \
 	      $(LN_S) lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) \
@@ -2517,10 +2511,6 @@ install-gnatlib: ../stamp-gnatlib-$(RTSDIR)
 	      $(CP) -r $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext).dSYM \
 	        $(DESTDIR)$(ADA_RTL_OBJ_DIR); \
 	   fi; \
-	   if [ -f $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext)$(arext) ]; then \
-	      $(INSTALL_DATA) $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext)$(arext) \
-			 $(DESTDIR)$(ADA_RTL_OBJ_DIR); \
-	   fi; \
 	done
 # This copy must be done preserving the date on the original file.
 	for file in $(RTSDIR)/*.ad?; do \
@@ -2726,18 +2716,16 @@ gnatlib-shared-win32:
 	cd $(RTSDIR); `echo "$(GCC_FOR_TARGET)" \
                 | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -shared -shared-libgcc \
 		$(PICFLAG_FOR_TARGET) \
-		-o $(WIN_SO_PREFIX)gnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
-		-Wl,-out-implib,libgnat$(hyphen)$(LIBRARY_VERSION)$(soext)$(arext) \
+		-o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
 		$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \
-		$(SO_OPTS)$(WIN_SO_PREFIX)gnat$(hyphen)$(LIBRARY_VERSION)$(soext) $(MISCLIB)
+		$(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) $(MISCLIB)
 	cd $(RTSDIR); `echo "$(GCC_FOR_TARGET)" \
                 | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -shared -shared-libgcc \
 		$(PICFLAG_FOR_TARGET) \
-		-o $(WIN_SO_PREFIX)gnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
-		-Wl,-out-implib,libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext)$(arext) \
+		-o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
 		$(GNATRTL_TASKING_OBJS) \
-		$(SO_OPTS)$(WIN_SO_PREFIX)gnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
-		$(THREADSLIB) -L. -lgnat$(hyphen)$(LIBRARY_VERSION)
+		$(SO_OPTS)libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
+		$(THREADSLIB) -Wl,libgnat$(hyphen)$(LIBRARY_VERSION)$(soext)
 
 gnatlib-shared-darwin:
 	$(MAKE) $(FLAGS_TO_PASS) \
diff --git a/libada/ChangeLog b/libada/ChangeLog
index 256ccccf016b..9d1c0a7fffc2 100644
--- a/libada/ChangeLog
+++ b/libada/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-02  Pascal Obry  <obry@adacore.com>
+
+	Revert
+	2012-02-24  Dave Korn  <dave.korn.cygwin@gmail.com>
+
 2012-02-24  Dave Korn  <dave.korn.cygwin@gmail.com>
 
 	* Makefile.in (bindir): Import from autoconf and pass down to submake.
@@ -97,7 +102,7 @@
 
 2008-09-21  Laurent Guerby  <laurent@guerby.net>
             Paolo Bonzini  <bonzini@gnu.org>
-	
+
 	PR ada/5911
 	* Makefile.in (all, install, mostlyclean, clean, distclean): Add
 	multilib handling.
@@ -105,7 +110,7 @@
 	* configure: Regenerate.
 
 2008-08-29  Laurent Guerby  <laurent@guerby.net>
-	
+
 	* Makefile.in (FLAGS_TO_PASS): renamed to LIBADA_FLAGS_TO_PASS to
 	avoid conflicts. Factor more flags to pass.
 	(libsubdir): New variable.
@@ -114,7 +119,7 @@
 2008-08-28  Laurent Guerby  <laurent@guerby.net>
 
 	* configure: Regenerate.
-	
+
 2008-08-06  Thomas Quinot  <quinot@adacore.com>
 
 	* Makefile.in: generate s-oscons.ads again, previous change was
diff --git a/libada/Makefile.in b/libada/Makefile.in
index 36cf5ad5e5ab..5389dd005def 100644
--- a/libada/Makefile.in
+++ b/libada/Makefile.in
@@ -33,7 +33,6 @@ MULTICLEAN = true
 SHELL = @SHELL@
 srcdir = @srcdir@
 libdir = @libdir@
-bindir = @bindir@
 build = @build@
 target = @target@
 prefix = @prefix@
@@ -84,7 +83,6 @@ LIBADA_FLAGS_TO_PASS = \
         "TRACE=$(TRACE)" \
         "MULTISUBDIR=$(MULTISUBDIR)" \
         "libsubdir=$(libsubdir)" \
-        "bindir=$(bindir)" \
         "objext=$(objext)" \
         "prefix=$(prefix)" \
         "exeext=.exeext.should.not.be.used " \