re PR bootstrap/55571 (PR48076 fix broke bootstrap on armv5tel-linux-gnueabi)

PR bootstrap/55571

        * Makefile.in (libgcc_s.so): Depend on and link with libgcc.a.

From-SVN: r194161

diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 1314669099a1a9ca1fbe465ba92814d2c427920c..ea06c2cc00d668fc5b44047dc80d66d4affbfe4f 100644 (file)
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-04  Richard Henderson  <rth@redhat.com>
+
+       PR bootstrap/55571
+       * Makefile.in (libgcc_s.so): Depend on and link with libgcc.a.
+
 2012-03-01  Release Manager
 
        * GCC 4.6.3 released.

diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in
index 7e2ab93fc42f6771d3d448099632807f69b32cd9..b57aeb657c08acb15e7541f1f1511371fe077476 100644 (file)
--- a/libgcc/Makefile.in
+++ b/libgcc/Makefile.in
@@ -795,7 +795,7 @@ libgcc_s$(SHLIB_EXT): libgcc.map
 mapfile = libgcc.map
 endif
 
-libgcc_s$(SHLIB_EXT): $(libgcc-s-objects) $(extra-parts)
+libgcc_s$(SHLIB_EXT): $(libgcc-s-objects) $(extra-parts) libgcc.a
        # @multilib_flags@ is still needed because this may use
        # $(GCC_FOR_TARGET) and $(LIBGCC2_CFLAGS) directly.
        # @multilib_dir@ is not really necessary, but sometimes it has
@@ -803,7 +803,7 @@ libgcc_s$(SHLIB_EXT): $(libgcc-s-objects) $(extra-parts)
        $(mkinstalldirs) $(MULTIDIR)
        $(subst @multilib_flags@,$(CFLAGS) -B./,$(subst \
                @multilib_dir@,$(MULTIDIR),$(subst \
-               @shlib_objs@,$(objects),$(subst \
+               @shlib_objs@,$(objects) libgcc.a,$(subst \
                @shlib_base_name@,libgcc_s,$(subst \
                @shlib_map_file@,$(mapfile),$(subst \
                @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(subst \