diff options
| author | Richard Henderson <rth@redhat.com> | 2012-12-04 11:11:33 -0800 |
|---|---|---|
| committer | Richard Henderson <rth@gcc.gnu.org> | 2012-12-04 11:11:33 -0800 |
| commit | 4b9e84cce01b0947b027003929d69888d6d3fbc2 (patch) | |
| tree | 71453da3686ed2fae32004c10e8bc8c0a027c592 /libgcc | |
| parent | c9c840c13dc62faacef97cd48369706e29da36e9 (diff) | |
| download | gcc-4b9e84cce01b0947b027003929d69888d6d3fbc2.zip gcc-4b9e84cce01b0947b027003929d69888d6d3fbc2.tar.gz gcc-4b9e84cce01b0947b027003929d69888d6d3fbc2.tar.bz2 | |
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
Diffstat (limited to 'libgcc')
| -rw-r--r-- | libgcc/ChangeLog | 5 | ||||
| -rw-r--r-- | libgcc/Makefile.in | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 1314669..ea06c2c 100644 --- 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 7e2ab93..b57aeb6 100644 --- 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 \ |