OSDN Git Service

gcc/ada/
authorebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4>
Sun, 6 May 2012 09:27:25 +0000 (09:27 +0000)
committerebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4>
Sun, 6 May 2012 09:27:25 +0000 (09:27 +0000)
Revert
2012-02-24  Dave Korn  <dave.korn.cygwin@gmail.com>

* gcc-interface/Makefile.in (WIN_SO_PREFIX [windows targets]): New
Windows-specific make variable.
(WIN_SO_INSTALL_DIR [windows targets]): Likewise.
(install-gnatlib): Respect the above during installation when set,
and also install any windows import library that has been built.
(gnatlib-shared-win32): Use WIN_SO_PREFIX to name output DLL and also
build a corresponding import library.
libada/
Revert
2012-02-24  Dave Korn  <dave.korn.cygwin@gmail.com>

* Makefile.in (bindir): Import from autoconf and pass down to submake.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@187205 138bc75d-0d04-0410-961f-82ee72b054a4

gcc/ada/ChangeLog
gcc/ada/gcc-interface/Makefile.in
libada/ChangeLog
libada/Makefile.in

index 80b2439..ddbaff1 100644 (file)
@@ -1,3 +1,16 @@
+2012-05-06  Pascal Obry  <obry@adacore.com>
+
+       Revert
+       2012-02-24  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+       * gcc-interface/Makefile.in (WIN_SO_PREFIX [windows targets]): New
+       Windows-specific make variable.
+       (WIN_SO_INSTALL_DIR [windows targets]): Likewise.
+       (install-gnatlib): Respect the above during installation when set,
+       and also install any windows import library that has been built.
+       (gnatlib-shared-win32): Use WIN_SO_PREFIX to name output DLL and also
+       build a corresponding import library.
+
 2012-04-30  Eric Botcazou  <ebotcazou@adacore.com>
 
        * gcc-interface/utils.c (finish_record_type): Force the traditional GCC
index 5fa6ffa..7256903 100644 (file)
@@ -1589,19 +1589,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 \
@@ -2452,14 +2449,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) \
@@ -2469,10 +2463,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 \
@@ -2684,18 +2674,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) \
index 5ca01b3..3cb9109 100644 (file)
@@ -1,3 +1,10 @@
+2012-05-06  Pascal Obry  <obry@adacore.com>
+
+       Revert
+       2012-02-24  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+       * Makefile.in (bindir): Import from autoconf and pass down to submake.
+
 2012-03-22  Release Manager
 
        * GCC 4.7.0 released.
index 36cf5ad..5389dd0 100644 (file)
@@ -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 " \