From d71975a62975df539bda67ddb70ccfc094d62ee0 Mon Sep 17 00:00:00 2001 From: ro Date: Thu, 8 May 2014 12:11:14 +0000 Subject: [PATCH] Don't build libgcc-unwind.map with --disable-shared (PR libgcc/61097) 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/trunk@210210 138bc75d-0d04-0410-961f-82ee72b054a4 --- libgcc/ChangeLog | 6 ++++++ libgcc/config/t-slibgcc-sld | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index e562c30235d..0ed5bfa27be 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,9 @@ +2014-05-08 Rainer Orth + + PR libgcc/61097 + * config/t-slibgcc-sld: Only build and install libgcc-unwind.map + if --enable-shared. + 2014-04-30 Bernd Edlinger 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 -- 2.11.4.GIT