diff options
| author | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-05-15 10:02:04 +0000 |
|---|---|---|
| committer | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-05-15 10:02:04 +0000 |
| commit | 567b0ed2e3267a5a81a8bc9f986f62a86c2af8c9 (patch) | |
| tree | 79423641bc2f211ea27b30aa264deb5ac6cbf58e /libgcc | |
| parent | 3a1e9a2d7c953a4b084f444b2d790d246c582119 (diff) | |
| download | ppe42-gcc-567b0ed2e3267a5a81a8bc9f986f62a86c2af8c9.tar.gz ppe42-gcc-567b0ed2e3267a5a81a8bc9f986f62a86c2af8c9.zip | |
Don't build libgcc-unwind.map with --disable-shared (PR libgcc/61097)
Backport from mainline
2014-05-08 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
PR libgcc/61097
* config/t-slibgcc-sld: Only build and install libgcc-unwind.map
if --enable-shared.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_9-branch@210468 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgcc')
| -rw-r--r-- | libgcc/ChangeLog | 9 | ||||
| -rw-r--r-- | libgcc/config/t-slibgcc-sld | 4 |
2 files changed, 13 insertions, 0 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 57a83718ac1..7b3c637a774 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,12 @@ +2014-05-15 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + Backport from mainline + 2014-05-08 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + PR libgcc/61097 + * config/t-slibgcc-sld: Only build and install libgcc-unwind.map + if --enable-shared. + 2014-04-30 Bernd Edlinger <bernd.edlinger@hotmail.de> Work around for current cygwin32 build problems. diff --git a/libgcc/config/t-slibgcc-sld b/libgcc/config/t-slibgcc-sld index ec6e5db0a3b..0b9539114e4 100644 --- a/libgcc/config/t-slibgcc-sld +++ b/libgcc/config/t-slibgcc-sld @@ -4,6 +4,8 @@ SHLIB_LDFLAGS = -Wl,-h,$(SHLIB_SONAME) -Wl,-z,text -Wl,-z,defs \ -Wl,-M,$(SHLIB_MAP) +ifeq ($(enable_shared),yes) + # Linker mapfile to enforce direct binding to libgcc_s unwinder # (PR target/59788). libgcc-unwind.map: libgcc-std.ver @@ -26,3 +28,5 @@ install-libgcc-unwind-map: libgcc-unwind.map $(INSTALL_DATA) $< $(DESTDIR)$(slibdir) install: install-libgcc-unwind-map + +endif |
