diff options
| author | Richard Henderson <rth@redhat.com> | 2012-12-04 11:08:18 -0800 |
|---|---|---|
| committer | Richard Henderson <rth@gcc.gnu.org> | 2012-12-04 11:08:18 -0800 |
| commit | 066161a2aa7eb57d9b285a6a16396dcb2c8b25bb (patch) | |
| tree | d0f044fc16d0fe7a1a3ee09cc81188ca27a62a04 /libgcc | |
| parent | 2c895bd193cceed49da1d4a876459178dcc0a4b8 (diff) | |
| download | gcc-066161a2aa7eb57d9b285a6a16396dcb2c8b25bb.zip gcc-066161a2aa7eb57d9b285a6a16396dcb2c8b25bb.tar.gz gcc-066161a2aa7eb57d9b285a6a16396dcb2c8b25bb.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: r194159
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 8e030f9..adb7422 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-12-04 Marcus Shawcroft <marcus.shawcroft@arm.com> * config/aarch64/sfp-machine.h (FP_EX_ALL): Define. diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in index 43b14a0..cfddfed 100644 --- a/libgcc/Makefile.in +++ b/libgcc/Makefile.in @@ -917,7 +917,7 @@ libgcc-std.ver: $(srcdir)/libgcc-std.ver.in sed -e 's/__PFX__/$(LIBGCC_VER_GNU_PREFIX)/g' \ -e 's/__FIXPTPFX__/$(LIBGCC_VER_FIXEDPOINT_GNU_PREFIX)/g' < $< > $@ -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 @@ -925,7 +925,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 \ |